@splitsoftware/splitio-commons 2.0.1 → 2.0.2

package/CHANGES.txt

@@ -1,3 +1,7 @@
+2.0.2 (December 3, 2024)
+ - Updated the factory `init` and `destroy` methods to support re-initialization after destruction. This update ensures compatibility of the React SDK with React Strict Mode, where the factory's `init` and `destroy` effects are executed an extra time to validate proper resource cleanup.
+ - Bugfixing - Sanitize the `SplitSDKMachineName` header value to avoid exceptions on HTTP/S requests when it contains non ISO-8859-1 characters (Related to issue https://github.com/splitio/javascript-client/issues/847).
+
 2.0.1 (November 25, 2024)
  - Bugfixing - Fixed an issue with the SDK_UPDATE event on server-side, where it was not being emitted if there was an empty segment and the SDK received a feature flag update notification.
 

package/cjs/readiness/readinessManager.js

@@ -28,7 +28,7 @@ function segmentsEventEmitterFactory(EventEmitter) {
 /**
  * Factory of readiness manager, which handles the ready / update event propagation.
  */
-function readinessManagerFactory(EventEmitter, settings, splits) {
+function readinessManagerFactory(EventEmitter, settings, splits, isShared) {
     if (splits === void 0) { splits = splitsEventEmitterFactory(EventEmitter); }
     var readyTimeout = settings.startup.readyTimeout;
     var segments = segmentsEventEmitterFactory(EventEmitter);
@@ -54,22 +54,24 @@ function readinessManagerFactory(EventEmitter, settings, splits) {
         syncLastUpdate();
         gate.emit(constants_1.SDK_READY_TIMED_OUT, 'Split SDK emitted SDK_READY_TIMED_OUT event.');
     }
-    var readyTimeoutId;
-    if (readyTimeout > 0) {
-        if (splits.hasInit)
-            readyTimeoutId = setTimeout(timeout, readyTimeout);
-        else
-            splits.initCallbacks.push(function () { readyTimeoutId = setTimeout(timeout, readyTimeout); });
-    }
     // emit SDK_READY and SDK_UPDATE
     var isReady = false;
     splits.on(constants_1.SDK_SPLITS_ARRIVED, checkIsReadyOrUpdate);
     segments.on(constants_1.SDK_SEGMENTS_ARRIVED, checkIsReadyOrUpdate);
     var isDestroyed = false;
+    var readyTimeoutId;
+    function __init() {
+        isDestroyed = false;
+        if (readyTimeout > 0 && !isReady)
+            readyTimeoutId = setTimeout(timeout, readyTimeout);
+    }
+    splits.initCallbacks.push(__init);
+    if (splits.hasInit)
+        __init();
     function checkIsReadyFromCache() {
         isReadyFromCache = true;
         // Don't emit SDK_READY_FROM_CACHE if SDK_READY has been emitted
-        if (!isReady) {
+        if (!isReady && !isDestroyed) {
             try {
                 syncLastUpdate();
                 gate.emit(constants_1.SDK_READY_FROM_CACHE);
@@ -81,6 +83,8 @@ function readinessManagerFactory(EventEmitter, settings, splits) {
         }
     }
     function checkIsReadyOrUpdate(diff) {
+        if (isDestroyed)
+            return;
         if (isReady) {
             try {
                 syncLastUpdate();
@@ -106,14 +110,12 @@ function readinessManagerFactory(EventEmitter, settings, splits) {
             }
         }
     }
-    var refCount = 1;
     return {
         splits: splits,
         segments: segments,
         gate: gate,
         shared: function () {
-            refCount++;
-            return readinessManagerFactory(EventEmitter, settings, splits);
+            return readinessManagerFactory(EventEmitter, settings, splits, true);
         },
         // @TODO review/remove next methods when non-recoverable errors are reworked
         // Called on consumer mode, when storage fails to connect
@@ -130,13 +132,9 @@ function readinessManagerFactory(EventEmitter, settings, splits) {
         destroy: function () {
             isDestroyed = true;
             syncLastUpdate();
-            segments.removeAllListeners();
-            gate.removeAllListeners();
             clearTimeout(readyTimeoutId);
-            if (refCount > 0)
-                refCount--;
-            if (refCount === 0)
-                splits.removeAllListeners();
+            if (!isShared)
+                splits.hasInit = false;
         },
         isReady: function () { return isReady; },
         isReadyFromCache: function () { return isReadyFromCache; },

package/cjs/sdkFactory/index.js

@@ -102,6 +102,7 @@ function sdkFactory(params) {
         Logger: (0, sdkLogger_1.createLoggerAPI)(log),
         settings: settings,
         destroy: function () {
+            hasInit = false;
             return Promise.all(Object.keys(clients).map(function (key) { return clients[key].destroy(); })).then(function () { });
         }
     }, extraProps && extraProps(ctx), lazyInit ? { init: init } : init());

package/cjs/services/decorateHeaders.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateHeaders = void 0;
+exports.removeNonISO88591 = exports.decorateHeaders = void 0;
 var objectAssign_1 = require("../utils/lang/objectAssign");
 var FORBIDDEN_HEADERS = new Set([
     'splitsdkclientkey',
@@ -33,3 +33,8 @@ function decorateHeaders(settings, headers) {
     return headers;
 }
 exports.decorateHeaders = decorateHeaders;
+function removeNonISO88591(input) {
+    // eslint-disable-next-line no-control-regex
+    return input.replace(/[^\x00-\xFF]/g, '');
+}
+exports.removeNonISO88591 = removeNonISO88591;

package/cjs/services/splitHttpClient.js

@@ -28,7 +28,7 @@ function splitHttpClientFactory(settings, _a) {
     if (ip)
         commonHeaders['SplitSDKMachineIP'] = ip;
     if (hostname)
-        commonHeaders['SplitSDKMachineName'] = hostname;
+        commonHeaders['SplitSDKMachineName'] = (0, decorateHeaders_1.removeNonISO88591)(hostname);
     return function httpClient(url, reqOpts, latencyTracker, logErrorsAsInfo) {
         if (reqOpts === void 0) { reqOpts = {}; }
         if (latencyTracker === void 0) { latencyTracker = function () { }; }

package/cjs/storages/inLocalStorage/index.js

@@ -9,8 +9,6 @@ var KeyBuilderCS_1 = require("../KeyBuilderCS");
 var isLocalStorageAvailable_1 = require("../../utils/env/isLocalStorageAvailable");
 var SplitsCacheInLocal_1 = require("./SplitsCacheInLocal");
 var MySegmentsCacheInLocal_1 = require("./MySegmentsCacheInLocal");
-var MySegmentsCacheInMemory_1 = require("../inMemory/MySegmentsCacheInMemory");
-var SplitsCacheInMemory_1 = require("../inMemory/SplitsCacheInMemory");
 var browser_1 = require("../../utils/constants/browser");
 var InMemoryStorageCS_1 = require("../inMemory/InMemoryStorageCS");
 var constants_1 = require("./constants");
@@ -30,7 +28,7 @@ function InLocalStorage(options) {
             params.settings.log.warn(constants_1.LOG_PREFIX + 'LocalStorage API is unavailable. Falling back to default MEMORY storage');
             return (0, InMemoryStorageCS_1.InMemoryStorageCSFactory)(params);
         }
-        var settings = params.settings, _a = params.settings, log = _a.log, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, _c = _a.sync, impressionsMode = _c.impressionsMode, __splitFiltersValidation = _c.__splitFiltersValidation;
+        var settings = params.settings, _a = params.settings, log = _a.log, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, impressionsMode = _a.sync.impressionsMode;
         var matchingKey = (0, key_1.getMatching)(settings.core.key);
         var keys = new KeyBuilderCS_1.KeyBuilderCS(prefix, matchingKey);
         var expirationTimestamp = Date.now() - browser_1.DEFAULT_CACHE_EXPIRATION_IN_MILLIS;
@@ -46,16 +44,7 @@ function InLocalStorage(options) {
             events: new EventsCacheInMemory_1.EventsCacheInMemory(eventsQueueSize),
             telemetry: (0, TelemetryCacheInMemory_1.shouldRecordTelemetry)(params) ? new TelemetryCacheInMemory_1.TelemetryCacheInMemory(splits, segments) : undefined,
             uniqueKeys: impressionsMode === constants_2.NONE ? new UniqueKeysCacheInMemoryCS_1.UniqueKeysCacheInMemoryCS() : undefined,
-            destroy: function () {
-                var _a;
-                this.splits = new SplitsCacheInMemory_1.SplitsCacheInMemory(__splitFiltersValidation);
-                this.segments = new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory();
-                this.largeSegments = new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory();
-                this.impressions.clear();
-                this.impressionCounts && this.impressionCounts.clear();
-                this.events.clear();
-                (_a = this.uniqueKeys) === null || _a === void 0 ? void 0 : _a.clear();
-            },
+            destroy: function () { },
             // When using shared instantiation with MEMORY we reuse everything but segments (they are customer per key).
             shared: function (matchingKey) {
                 return {
@@ -66,11 +55,7 @@ function InLocalStorage(options) {
                     impressionCounts: this.impressionCounts,
                     events: this.events,
                     telemetry: this.telemetry,
-                    destroy: function () {
-                        this.splits = new SplitsCacheInMemory_1.SplitsCacheInMemory(__splitFiltersValidation);
-                        this.segments = new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory();
-                        this.largeSegments = new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory();
-                    }
+                    destroy: function () { }
                 };
             },
         };

package/cjs/storages/inMemory/InMemoryStorage.js

@@ -26,15 +26,7 @@ function InMemoryStorageFactory(params) {
         events: new EventsCacheInMemory_1.EventsCacheInMemory(eventsQueueSize),
         telemetry: (0, TelemetryCacheInMemory_1.shouldRecordTelemetry)(params) ? new TelemetryCacheInMemory_1.TelemetryCacheInMemory(splits, segments) : undefined,
         uniqueKeys: impressionsMode === constants_1.NONE ? new UniqueKeysCacheInMemory_1.UniqueKeysCacheInMemory() : undefined,
-        // When using MEMORY we should clean all the caches to leave them empty
-        destroy: function () {
-            this.splits.clear();
-            this.segments.clear();
-            this.impressions.clear();
-            this.impressionCounts && this.impressionCounts.clear();
-            this.events.clear();
-            this.uniqueKeys && this.uniqueKeys.clear();
-        }
+        destroy: function () { }
     };
     // @TODO revisit storage logic in localhost mode
     // No tracking data in localhost mode to avoid memory leaks

package/cjs/storages/inMemory/InMemoryStorageCS.js

@@ -28,16 +28,7 @@ function InMemoryStorageCSFactory(params) {
         events: new EventsCacheInMemory_1.EventsCacheInMemory(eventsQueueSize),
         telemetry: (0, TelemetryCacheInMemory_1.shouldRecordTelemetry)(params) ? new TelemetryCacheInMemory_1.TelemetryCacheInMemory(splits, segments) : undefined,
         uniqueKeys: impressionsMode === constants_1.NONE ? new UniqueKeysCacheInMemoryCS_1.UniqueKeysCacheInMemoryCS() : undefined,
-        // When using MEMORY we should clean all the caches to leave them empty
-        destroy: function () {
-            this.splits.clear();
-            this.segments.clear();
-            this.largeSegments.clear();
-            this.impressions.clear();
-            this.impressionCounts && this.impressionCounts.clear();
-            this.events.clear();
-            this.uniqueKeys && this.uniqueKeys.clear();
-        },
+        destroy: function () { },
         // When using shared instantiation with MEMORY we reuse everything but segments (they are unique per key)
         shared: function () {
             return {
@@ -48,12 +39,7 @@ function InMemoryStorageCSFactory(params) {
                 impressionCounts: this.impressionCounts,
                 events: this.events,
                 telemetry: this.telemetry,
-                // Set a new splits cache to clean it for the client without affecting other clients
-                destroy: function () {
-                    this.splits = new SplitsCacheInMemory_1.SplitsCacheInMemory(__splitFiltersValidation);
-                    this.segments.clear();
-                    this.largeSegments.clear();
-                }
+                destroy: function () { }
             };
         },
     };

package/esm/readiness/readinessManager.js

@@ -25,7 +25,7 @@ function segmentsEventEmitterFactory(EventEmitter) {
 /**
  * Factory of readiness manager, which handles the ready / update event propagation.
  */
-export function readinessManagerFactory(EventEmitter, settings, splits) {
+export function readinessManagerFactory(EventEmitter, settings, splits, isShared) {
     if (splits === void 0) { splits = splitsEventEmitterFactory(EventEmitter); }
     var readyTimeout = settings.startup.readyTimeout;
     var segments = segmentsEventEmitterFactory(EventEmitter);
@@ -51,22 +51,24 @@ export function readinessManagerFactory(EventEmitter, settings, splits) {
         syncLastUpdate();
         gate.emit(SDK_READY_TIMED_OUT, 'Split SDK emitted SDK_READY_TIMED_OUT event.');
     }
-    var readyTimeoutId;
-    if (readyTimeout > 0) {
-        if (splits.hasInit)
-            readyTimeoutId = setTimeout(timeout, readyTimeout);
-        else
-            splits.initCallbacks.push(function () { readyTimeoutId = setTimeout(timeout, readyTimeout); });
-    }
     // emit SDK_READY and SDK_UPDATE
     var isReady = false;
     splits.on(SDK_SPLITS_ARRIVED, checkIsReadyOrUpdate);
     segments.on(SDK_SEGMENTS_ARRIVED, checkIsReadyOrUpdate);
     var isDestroyed = false;
+    var readyTimeoutId;
+    function __init() {
+        isDestroyed = false;
+        if (readyTimeout > 0 && !isReady)
+            readyTimeoutId = setTimeout(timeout, readyTimeout);
+    }
+    splits.initCallbacks.push(__init);
+    if (splits.hasInit)
+        __init();
     function checkIsReadyFromCache() {
         isReadyFromCache = true;
         // Don't emit SDK_READY_FROM_CACHE if SDK_READY has been emitted
-        if (!isReady) {
+        if (!isReady && !isDestroyed) {
             try {
                 syncLastUpdate();
                 gate.emit(SDK_READY_FROM_CACHE);
@@ -78,6 +80,8 @@ export function readinessManagerFactory(EventEmitter, settings, splits) {
         }
     }
     function checkIsReadyOrUpdate(diff) {
+        if (isDestroyed)
+            return;
         if (isReady) {
             try {
                 syncLastUpdate();
@@ -103,14 +107,12 @@ export function readinessManagerFactory(EventEmitter, settings, splits) {
             }
         }
     }
-    var refCount = 1;
     return {
         splits: splits,
         segments: segments,
         gate: gate,
         shared: function () {
-            refCount++;
-            return readinessManagerFactory(EventEmitter, settings, splits);
+            return readinessManagerFactory(EventEmitter, settings, splits, true);
         },
         // @TODO review/remove next methods when non-recoverable errors are reworked
         // Called on consumer mode, when storage fails to connect
@@ -127,13 +129,9 @@ export function readinessManagerFactory(EventEmitter, settings, splits) {
         destroy: function () {
             isDestroyed = true;
             syncLastUpdate();
-            segments.removeAllListeners();
-            gate.removeAllListeners();
             clearTimeout(readyTimeoutId);
-            if (refCount > 0)
-                refCount--;
-            if (refCount === 0)
-                splits.removeAllListeners();
+            if (!isShared)
+                splits.hasInit = false;
         },
         isReady: function () { return isReady; },
         isReadyFromCache: function () { return isReadyFromCache; },

package/esm/sdkFactory/index.js

@@ -99,6 +99,7 @@ export function sdkFactory(params) {
         Logger: createLoggerAPI(log),
         settings: settings,
         destroy: function () {
+            hasInit = false;
             return Promise.all(Object.keys(clients).map(function (key) { return clients[key].destroy(); })).then(function () { });
         }
     }, extraProps && extraProps(ctx), lazyInit ? { init: init } : init());

package/esm/services/decorateHeaders.js

@@ -29,3 +29,7 @@ export function decorateHeaders(settings, headers) {
     }
     return headers;
 }
+export function removeNonISO88591(input) {
+    // eslint-disable-next-line no-control-regex
+    return input.replace(/[^\x00-\xFF]/g, '');
+}

package/esm/services/splitHttpClient.js

@@ -1,6 +1,6 @@
 import { objectAssign } from '../utils/lang/objectAssign';
 import { ERROR_HTTP, ERROR_CLIENT_CANNOT_GET_READY } from '../logger/constants';
-import { decorateHeaders } from './decorateHeaders';
+import { decorateHeaders, removeNonISO88591 } from './decorateHeaders';
 var messageNoFetch = 'Global fetch API is not available.';
 /**
  * Factory of Split HTTP clients, which are HTTP clients with predefined headers for Split endpoints.
@@ -25,7 +25,7 @@ export function splitHttpClientFactory(settings, _a) {
     if (ip)
         commonHeaders['SplitSDKMachineIP'] = ip;
     if (hostname)
-        commonHeaders['SplitSDKMachineName'] = hostname;
+        commonHeaders['SplitSDKMachineName'] = removeNonISO88591(hostname);
     return function httpClient(url, reqOpts, latencyTracker, logErrorsAsInfo) {
         if (reqOpts === void 0) { reqOpts = {}; }
         if (latencyTracker === void 0) { latencyTracker = function () { }; }

package/esm/storages/inLocalStorage/index.js

@@ -6,8 +6,6 @@ import { KeyBuilderCS, myLargeSegmentsKeyBuilder } from '../KeyBuilderCS';
 import { isLocalStorageAvailable } from '../../utils/env/isLocalStorageAvailable';
 import { SplitsCacheInLocal } from './SplitsCacheInLocal';
 import { MySegmentsCacheInLocal } from './MySegmentsCacheInLocal';
-import { MySegmentsCacheInMemory } from '../inMemory/MySegmentsCacheInMemory';
-import { SplitsCacheInMemory } from '../inMemory/SplitsCacheInMemory';
 import { DEFAULT_CACHE_EXPIRATION_IN_MILLIS } from '../../utils/constants/browser';
 import { InMemoryStorageCSFactory } from '../inMemory/InMemoryStorageCS';
 import { LOG_PREFIX } from './constants';
@@ -27,7 +25,7 @@ export function InLocalStorage(options) {
             params.settings.log.warn(LOG_PREFIX + 'LocalStorage API is unavailable. Falling back to default MEMORY storage');
             return InMemoryStorageCSFactory(params);
         }
-        var settings = params.settings, _a = params.settings, log = _a.log, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, _c = _a.sync, impressionsMode = _c.impressionsMode, __splitFiltersValidation = _c.__splitFiltersValidation;
+        var settings = params.settings, _a = params.settings, log = _a.log, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, impressionsMode = _a.sync.impressionsMode;
         var matchingKey = getMatching(settings.core.key);
         var keys = new KeyBuilderCS(prefix, matchingKey);
         var expirationTimestamp = Date.now() - DEFAULT_CACHE_EXPIRATION_IN_MILLIS;
@@ -43,16 +41,7 @@ export function InLocalStorage(options) {
             events: new EventsCacheInMemory(eventsQueueSize),
             telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
             uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemoryCS() : undefined,
-            destroy: function () {
-                var _a;
-                this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-                this.segments = new MySegmentsCacheInMemory();
-                this.largeSegments = new MySegmentsCacheInMemory();
-                this.impressions.clear();
-                this.impressionCounts && this.impressionCounts.clear();
-                this.events.clear();
-                (_a = this.uniqueKeys) === null || _a === void 0 ? void 0 : _a.clear();
-            },
+            destroy: function () { },
             // When using shared instantiation with MEMORY we reuse everything but segments (they are customer per key).
             shared: function (matchingKey) {
                 return {
@@ -63,11 +52,7 @@ export function InLocalStorage(options) {
                     impressionCounts: this.impressionCounts,
                     events: this.events,
                     telemetry: this.telemetry,
-                    destroy: function () {
-                        this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-                        this.segments = new MySegmentsCacheInMemory();
-                        this.largeSegments = new MySegmentsCacheInMemory();
-                    }
+                    destroy: function () { }
                 };
             },
         };

package/esm/storages/inMemory/InMemoryStorage.js

@@ -23,15 +23,7 @@ export function InMemoryStorageFactory(params) {
         events: new EventsCacheInMemory(eventsQueueSize),
         telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
         uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemory() : undefined,
-        // When using MEMORY we should clean all the caches to leave them empty
-        destroy: function () {
-            this.splits.clear();
-            this.segments.clear();
-            this.impressions.clear();
-            this.impressionCounts && this.impressionCounts.clear();
-            this.events.clear();
-            this.uniqueKeys && this.uniqueKeys.clear();
-        }
+        destroy: function () { }
     };
     // @TODO revisit storage logic in localhost mode
     // No tracking data in localhost mode to avoid memory leaks

package/esm/storages/inMemory/InMemoryStorageCS.js

@@ -25,16 +25,7 @@ export function InMemoryStorageCSFactory(params) {
         events: new EventsCacheInMemory(eventsQueueSize),
         telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
         uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemoryCS() : undefined,
-        // When using MEMORY we should clean all the caches to leave them empty
-        destroy: function () {
-            this.splits.clear();
-            this.segments.clear();
-            this.largeSegments.clear();
-            this.impressions.clear();
-            this.impressionCounts && this.impressionCounts.clear();
-            this.events.clear();
-            this.uniqueKeys && this.uniqueKeys.clear();
-        },
+        destroy: function () { },
         // When using shared instantiation with MEMORY we reuse everything but segments (they are unique per key)
         shared: function () {
             return {
@@ -45,12 +36,7 @@ export function InMemoryStorageCSFactory(params) {
                 impressionCounts: this.impressionCounts,
                 events: this.events,
                 telemetry: this.telemetry,
-                // Set a new splits cache to clean it for the client without affecting other clients
-                destroy: function () {
-                    this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-                    this.segments.clear();
-                    this.largeSegments.clear();
-                }
+                destroy: function () { }
             };
         },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@splitsoftware/splitio-commons",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Split JavaScript SDK common components",
   "main": "cjs/index.js",
   "module": "esm/index.js",

package/src/readiness/readinessManager.ts

@@ -37,7 +37,9 @@ function segmentsEventEmitterFactory(EventEmitter: new () => SplitIO.IEventEmitt
 export function readinessManagerFactory(
   EventEmitter: new () => SplitIO.IEventEmitter,
   settings: ISettings,
-  splits: ISplitsEventEmitter = splitsEventEmitterFactory(EventEmitter)): IReadinessManager {
+  splits: ISplitsEventEmitter = splitsEventEmitterFactory(EventEmitter),
+  isShared?: boolean
+): IReadinessManager {
 
   const readyTimeout = settings.startup.readyTimeout;
 
@@ -66,11 +68,6 @@ export function readinessManagerFactory(
     gate.emit(SDK_READY_TIMED_OUT, 'Split SDK emitted SDK_READY_TIMED_OUT event.');
   }
 
-  let readyTimeoutId: ReturnType<typeof setTimeout>;
-  if (readyTimeout > 0) {
-    if (splits.hasInit) readyTimeoutId = setTimeout(timeout, readyTimeout);
-    else splits.initCallbacks.push(() => { readyTimeoutId = setTimeout(timeout, readyTimeout); });
-  }
 
   // emit SDK_READY and SDK_UPDATE
   let isReady = false;
@@ -78,11 +75,19 @@ export function readinessManagerFactory(
   segments.on(SDK_SEGMENTS_ARRIVED, checkIsReadyOrUpdate);
 
   let isDestroyed = false;
+  let readyTimeoutId: ReturnType<typeof setTimeout>;
+  function __init() {
+    isDestroyed = false;
+    if (readyTimeout > 0 && !isReady) readyTimeoutId = setTimeout(timeout, readyTimeout);
+  }
+
+  splits.initCallbacks.push(__init);
+  if (splits.hasInit) __init();
 
   function checkIsReadyFromCache() {
     isReadyFromCache = true;
     // Don't emit SDK_READY_FROM_CACHE if SDK_READY has been emitted
-    if (!isReady) {
+    if (!isReady && !isDestroyed) {
       try {
         syncLastUpdate();
         gate.emit(SDK_READY_FROM_CACHE);
@@ -94,6 +99,7 @@ export function readinessManagerFactory(
   }
 
   function checkIsReadyOrUpdate(diff: any) {
+    if (isDestroyed) return;
     if (isReady) {
       try {
         syncLastUpdate();
@@ -117,16 +123,13 @@ export function readinessManagerFactory(
     }
   }
 
-  let refCount = 1;
-
   return {
     splits,
     segments,
     gate,
 
     shared() {
-      refCount++;
-      return readinessManagerFactory(EventEmitter, settings, splits);
+      return readinessManagerFactory(EventEmitter, settings, splits, true);
     },
 
     // @TODO review/remove next methods when non-recoverable errors are reworked
@@ -145,13 +148,9 @@ export function readinessManagerFactory(
     destroy() {
       isDestroyed = true;
       syncLastUpdate();
-
-      segments.removeAllListeners();
-      gate.removeAllListeners();
       clearTimeout(readyTimeoutId);
 
-      if (refCount > 0) refCount--;
-      if (refCount === 0) splits.removeAllListeners();
+      if (!isShared) splits.hasInit = false;
     },
 
     isReady() { return isReady; },

package/src/sdkFactory/index.ts

@@ -126,6 +126,7 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ISDK | SplitIO.IA
     settings,
 
     destroy() {
+      hasInit = false;
       return Promise.all(Object.keys(clients).map(key => clients[key].destroy())).then(() => { });
     }
   }, extraProps && extraProps(ctx), lazyInit ? { init } : init());

package/src/services/decorateHeaders.ts

@@ -30,3 +30,8 @@ export function decorateHeaders(settings: ISettings, headers: Record<string, str
   }
   return headers;
 }
+
+export function removeNonISO88591(input: string) {
+  // eslint-disable-next-line no-control-regex
+  return input.replace(/[^\x00-\xFF]/g, '');
+}

package/src/services/splitHttpClient.ts

@@ -3,7 +3,7 @@ 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';
-import { decorateHeaders } from './decorateHeaders';
+import { decorateHeaders, removeNonISO88591 } from './decorateHeaders';
 
 const messageNoFetch = 'Global fetch API is not available.';
 
@@ -30,7 +30,7 @@ export function splitHttpClientFactory(settings: ISettings, { getOptions, getFet
   };
 
   if (ip) commonHeaders['SplitSDKMachineIP'] = ip;
-  if (hostname) commonHeaders['SplitSDKMachineName'] = hostname;
+  if (hostname) commonHeaders['SplitSDKMachineName'] = removeNonISO88591(hostname);
 
   return function httpClient(url: string, reqOpts: IRequestOptions = {}, latencyTracker: (error?: NetworkError) => void = () => { }, logErrorsAsInfo: boolean = false): Promise<IResponse> {
 

package/src/storages/inLocalStorage/index.ts

@@ -7,8 +7,6 @@ import { KeyBuilderCS, myLargeSegmentsKeyBuilder } from '../KeyBuilderCS';
 import { isLocalStorageAvailable } from '../../utils/env/isLocalStorageAvailable';
 import { SplitsCacheInLocal } from './SplitsCacheInLocal';
 import { MySegmentsCacheInLocal } from './MySegmentsCacheInLocal';
-import { MySegmentsCacheInMemory } from '../inMemory/MySegmentsCacheInMemory';
-import { SplitsCacheInMemory } from '../inMemory/SplitsCacheInMemory';
 import { DEFAULT_CACHE_EXPIRATION_IN_MILLIS } from '../../utils/constants/browser';
 import { InMemoryStorageCSFactory } from '../inMemory/InMemoryStorageCS';
 import { LOG_PREFIX } from './constants';
@@ -36,7 +34,7 @@ export function InLocalStorage(options: InLocalStorageOptions = {}): IStorageSyn
       return InMemoryStorageCSFactory(params);
     }
 
-    const { settings, settings: { log, scheduler: { impressionsQueueSize, eventsQueueSize, }, sync: { impressionsMode, __splitFiltersValidation } } } = params;
+    const { settings, settings: { log, scheduler: { impressionsQueueSize, eventsQueueSize, }, sync: { impressionsMode } } } = params;
     const matchingKey = getMatching(settings.core.key);
     const keys = new KeyBuilderCS(prefix, matchingKey);
     const expirationTimestamp = Date.now() - DEFAULT_CACHE_EXPIRATION_IN_MILLIS;
@@ -55,15 +53,7 @@ export function InLocalStorage(options: InLocalStorageOptions = {}): IStorageSyn
       telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
       uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemoryCS() : undefined,
 
-      destroy() {
-        this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-        this.segments = new MySegmentsCacheInMemory();
-        this.largeSegments = new MySegmentsCacheInMemory();
-        this.impressions.clear();
-        this.impressionCounts && this.impressionCounts.clear();
-        this.events.clear();
-        this.uniqueKeys?.clear();
-      },
+      destroy() { },
 
       // When using shared instantiation with MEMORY we reuse everything but segments (they are customer per key).
       shared(matchingKey: string) {
@@ -77,11 +67,7 @@ export function InLocalStorage(options: InLocalStorageOptions = {}): IStorageSyn
           events: this.events,
           telemetry: this.telemetry,
 
-          destroy() {
-            this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-            this.segments = new MySegmentsCacheInMemory();
-            this.largeSegments = new MySegmentsCacheInMemory();
-          }
+          destroy() { }
         };
       },
     };

package/src/storages/inMemory/InMemoryStorage.ts

@@ -28,15 +28,7 @@ export function InMemoryStorageFactory(params: IStorageFactoryParams): IStorageS
     telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
     uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemory() : undefined,
 
-    // When using MEMORY we should clean all the caches to leave them empty
-    destroy() {
-      this.splits.clear();
-      this.segments.clear();
-      this.impressions.clear();
-      this.impressionCounts && this.impressionCounts.clear();
-      this.events.clear();
-      this.uniqueKeys && this.uniqueKeys.clear();
-    }
+    destroy() { }
   };
 
   // @TODO revisit storage logic in localhost mode

package/src/storages/inMemory/InMemoryStorageCS.ts

@@ -30,16 +30,7 @@ export function InMemoryStorageCSFactory(params: IStorageFactoryParams): IStorag
     telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
     uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemoryCS() : undefined,
 
-    // When using MEMORY we should clean all the caches to leave them empty
-    destroy() {
-      this.splits.clear();
-      this.segments.clear();
-      this.largeSegments.clear();
-      this.impressions.clear();
-      this.impressionCounts && this.impressionCounts.clear();
-      this.events.clear();
-      this.uniqueKeys && this.uniqueKeys.clear();
-    },
+    destroy() { },
 
     // When using shared instantiation with MEMORY we reuse everything but segments (they are unique per key)
     shared() {
@@ -52,12 +43,7 @@ export function InMemoryStorageCSFactory(params: IStorageFactoryParams): IStorag
         events: this.events,
         telemetry: this.telemetry,
 
-        // Set a new splits cache to clean it for the client without affecting other clients
-        destroy() {
-          this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-          this.segments.clear();
-          this.largeSegments.clear();
-        }
+        destroy() { }
       };
     },
   };