@splitsoftware/splitio-commons 2.4.2-rc.2 → 2.5.0-rc.0

package/src/storages/inLocalStorage/MySegmentsCacheInLocal.ts

@@ -3,19 +3,16 @@ import { isNaNNumber } from '../../utils/lang';
 import { AbstractMySegmentsCacheSync } from '../AbstractMySegmentsCacheSync';
 import type { MySegmentsKeyBuilder } from '../KeyBuilderCS';
 import { LOG_PREFIX, DEFINED } from './constants';
-import { StorageAdapter } from '../types';
 
 export class MySegmentsCacheInLocal extends AbstractMySegmentsCacheSync {
 
   private readonly keys: MySegmentsKeyBuilder;
   private readonly log: ILogger;
-  private readonly storage: StorageAdapter;
 
-  constructor(log: ILogger, keys: MySegmentsKeyBuilder, storage: StorageAdapter) {
+  constructor(log: ILogger, keys: MySegmentsKeyBuilder) {
     super();
     this.log = log;
     this.keys = keys;
-    this.storage = storage;
     // There is not need to flush segments cache like splits cache, since resetSegments receives the up-to-date list of active segments
   }
 
@@ -23,8 +20,8 @@ export class MySegmentsCacheInLocal extends AbstractMySegmentsCacheSync {
     const segmentKey = this.keys.buildSegmentNameKey(name);
 
     try {
-      if (this.storage.getItem(segmentKey) === DEFINED) return false;
-      this.storage.setItem(segmentKey, DEFINED);
+      if (localStorage.getItem(segmentKey) === DEFINED) return false;
+      localStorage.setItem(segmentKey, DEFINED);
       return true;
     } catch (e) {
       this.log.error(LOG_PREFIX + e);
@@ -36,8 +33,8 @@ export class MySegmentsCacheInLocal extends AbstractMySegmentsCacheSync {
     const segmentKey = this.keys.buildSegmentNameKey(name);
 
     try {
-      if (this.storage.getItem(segmentKey) !== DEFINED) return false;
-      this.storage.removeItem(segmentKey);
+      if (localStorage.getItem(segmentKey) !== DEFINED) return false;
+      localStorage.removeItem(segmentKey);
       return true;
     } catch (e) {
       this.log.error(LOG_PREFIX + e);
@@ -46,16 +43,18 @@ export class MySegmentsCacheInLocal extends AbstractMySegmentsCacheSync {
   }
 
   isInSegment(name: string): boolean {
-    return this.storage.getItem(this.keys.buildSegmentNameKey(name)) === DEFINED;
+    return localStorage.getItem(this.keys.buildSegmentNameKey(name)) === DEFINED;
   }
 
   getRegisteredSegments(): string[] {
-    const registeredSegments: string[] = [];
-    for (let i = 0; i < this.storage.length; i++) {
-      const segmentName = this.keys.extractSegmentName(this.storage.key(i)!);
-      if (segmentName) registeredSegments.push(segmentName);
-    }
-    return registeredSegments;
+    // Scan current values from localStorage
+    return Object.keys(localStorage).reduce((accum, key) => {
+      let segmentName = this.keys.extractSegmentName(key);
+
+      if (segmentName) accum.push(segmentName);
+
+      return accum;
+    }, [] as string[]);
   }
 
   getKeysCount() {
@@ -64,8 +63,8 @@ export class MySegmentsCacheInLocal extends AbstractMySegmentsCacheSync {
 
   protected setChangeNumber(changeNumber?: number) {
     try {
-      if (changeNumber) this.storage.setItem(this.keys.buildTillKey(), changeNumber + '');
-      else this.storage.removeItem(this.keys.buildTillKey());
+      if (changeNumber) localStorage.setItem(this.keys.buildTillKey(), changeNumber + '');
+      else localStorage.removeItem(this.keys.buildTillKey());
     } catch (e) {
       this.log.error(e);
     }
@@ -73,7 +72,7 @@ export class MySegmentsCacheInLocal extends AbstractMySegmentsCacheSync {
 
   getChangeNumber() {
     const n = -1;
-    let value: string | number | null = this.storage.getItem(this.keys.buildTillKey());
+    let value: string | number | null = localStorage.getItem(this.keys.buildTillKey());
 
     if (value !== null) {
       value = parseInt(value, 10);

package/src/storages/inLocalStorage/RBSegmentsCacheInLocal.ts

@@ -5,37 +5,34 @@ import { isFiniteNumber, isNaNNumber, toNumber } from '../../utils/lang';
 import { setToArray } from '../../utils/lang/sets';
 import { usesSegments } from '../AbstractSplitsCacheSync';
 import { KeyBuilderCS } from '../KeyBuilderCS';
-import { IRBSegmentsCacheSync, StorageAdapter } from '../types';
+import { IRBSegmentsCacheSync } from '../types';
 import { LOG_PREFIX } from './constants';
 
 export class RBSegmentsCacheInLocal implements IRBSegmentsCacheSync {
 
   private readonly keys: KeyBuilderCS;
   private readonly log: ILogger;
-  private readonly storage: StorageAdapter;
 
-  constructor(settings: ISettings, keys: KeyBuilderCS, storage: StorageAdapter) {
+  constructor(settings: ISettings, keys: KeyBuilderCS) {
     this.keys = keys;
     this.log = settings.log;
-    this.storage = storage;
   }
 
   clear() {
     this.getNames().forEach(name => this.remove(name));
-    this.storage.removeItem(this.keys.buildRBSegmentsTillKey());
+    localStorage.removeItem(this.keys.buildRBSegmentsTillKey());
   }
 
   update(toAdd: IRBSegment[], toRemove: IRBSegment[], changeNumber: number): boolean {
-    let updated = toAdd.map(toAdd => this.add(toAdd)).some(result => result);
-    updated = toRemove.map(toRemove => this.remove(toRemove.name)).some(result => result) || updated;
     this.setChangeNumber(changeNumber);
-    return updated;
+    const updated = toAdd.map(toAdd => this.add(toAdd)).some(result => result);
+    return toRemove.map(toRemove => this.remove(toRemove.name)).some(result => result) || updated;
   }
 
   private setChangeNumber(changeNumber: number) {
     try {
-      this.storage.setItem(this.keys.buildRBSegmentsTillKey(), changeNumber + '');
-      this.storage.setItem(this.keys.buildLastUpdatedKey(), Date.now() + '');
+      localStorage.setItem(this.keys.buildRBSegmentsTillKey(), changeNumber + '');
+      localStorage.setItem(this.keys.buildLastUpdatedKey(), Date.now() + '');
     } catch (e) {
       this.log.error(LOG_PREFIX + e);
     }
@@ -43,19 +40,20 @@ export class RBSegmentsCacheInLocal implements IRBSegmentsCacheSync {
 
   private updateSegmentCount(diff: number) {
     const segmentsCountKey = this.keys.buildSplitsWithSegmentCountKey();
-    const count = toNumber(this.storage.getItem(segmentsCountKey)) + diff;
-    if (count > 0) this.storage.setItem(segmentsCountKey, count + '');
-    else this.storage.removeItem(segmentsCountKey);
+    const count = toNumber(localStorage.getItem(segmentsCountKey)) + diff;
+    // @ts-expect-error
+    if (count > 0) localStorage.setItem(segmentsCountKey, count);
+    else localStorage.removeItem(segmentsCountKey);
   }
 
   private add(rbSegment: IRBSegment): boolean {
     try {
       const name = rbSegment.name;
       const rbSegmentKey = this.keys.buildRBSegmentKey(name);
-      const rbSegmentFromStorage = this.storage.getItem(rbSegmentKey);
-      const previous = rbSegmentFromStorage ? JSON.parse(rbSegmentFromStorage) : null;
+      const rbSegmentFromLocalStorage = localStorage.getItem(rbSegmentKey);
+      const previous = rbSegmentFromLocalStorage ? JSON.parse(rbSegmentFromLocalStorage) : null;
 
-      this.storage.setItem(rbSegmentKey, JSON.stringify(rbSegment));
+      localStorage.setItem(rbSegmentKey, JSON.stringify(rbSegment));
 
       let usesSegmentsDiff = 0;
       if (previous && usesSegments(previous)) usesSegmentsDiff--;
@@ -74,7 +72,7 @@ export class RBSegmentsCacheInLocal implements IRBSegmentsCacheSync {
       const rbSegment = this.get(name);
       if (!rbSegment) return false;
 
-      this.storage.removeItem(this.keys.buildRBSegmentKey(name));
+      localStorage.removeItem(this.keys.buildRBSegmentKey(name));
 
       if (usesSegments(rbSegment)) this.updateSegmentCount(-1);
 
@@ -86,13 +84,13 @@ export class RBSegmentsCacheInLocal implements IRBSegmentsCacheSync {
   }
 
   private getNames(): string[] {
-    const len = this.storage.length;
+    const len = localStorage.length;
     const accum = [];
 
     let cur = 0;
 
     while (cur < len) {
-      const key = this.storage.key(cur);
+      const key = localStorage.key(cur);
 
       if (key != null && this.keys.isRBSegmentKey(key)) accum.push(this.keys.extractKey(key));
 
@@ -103,10 +101,14 @@ export class RBSegmentsCacheInLocal implements IRBSegmentsCacheSync {
   }
 
   get(name: string): IRBSegment | null {
-    const item = this.storage.getItem(this.keys.buildRBSegmentKey(name));
+    const item = localStorage.getItem(this.keys.buildRBSegmentKey(name));
     return item && JSON.parse(item);
   }
 
+  getAll(): IRBSegment[] {
+    return this.getNames().map(key => this.get(key)!);
+  }
+
   contains(names: Set<string>): boolean {
     const namesArray = setToArray(names);
     const namesInStorage = this.getNames();
@@ -115,7 +117,7 @@ export class RBSegmentsCacheInLocal implements IRBSegmentsCacheSync {
 
   getChangeNumber(): number {
     const n = -1;
-    let value: string | number | null = this.storage.getItem(this.keys.buildRBSegmentsTillKey());
+    let value: string | number | null = localStorage.getItem(this.keys.buildRBSegmentsTillKey());
 
     if (value !== null) {
       value = parseInt(value, 10);
@@ -127,7 +129,7 @@ export class RBSegmentsCacheInLocal implements IRBSegmentsCacheSync {
   }
 
   usesSegments(): boolean {
-    const storedCount = this.storage.getItem(this.keys.buildSplitsWithSegmentCountKey());
+    const storedCount = localStorage.getItem(this.keys.buildSplitsWithSegmentCountKey());
     const splitsWithSegmentsCount = storedCount === null ? 0 : toNumber(storedCount);
 
     return isFiniteNumber(splitsWithSegmentsCount) ?

package/src/storages/inLocalStorage/SplitsCacheInLocal.ts

@@ -6,28 +6,29 @@ import { ILogger } from '../../logger/types';
 import { LOG_PREFIX } from './constants';
 import { ISettings } from '../../types';
 import { setToArray } from '../../utils/lang/sets';
-import { StorageAdapter } from '../types';
 
+/**
+ * ISplitsCacheSync implementation that stores split definitions in browser LocalStorage.
+ */
 export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
 
   private readonly keys: KeyBuilderCS;
   private readonly log: ILogger;
   private readonly flagSetsFilter: string[];
   private hasSync?: boolean;
-  private readonly storage: StorageAdapter;
 
-  constructor(settings: ISettings, keys: KeyBuilderCS, storage: StorageAdapter) {
+  constructor(settings: ISettings, keys: KeyBuilderCS) {
     super();
     this.keys = keys;
     this.log = settings.log;
     this.flagSetsFilter = settings.sync.__splitFiltersValidation.groupedFilters.bySet;
-    this.storage = storage;
   }
 
   private _decrementCount(key: string) {
-    const count = toNumber(this.storage.getItem(key)) - 1;
-    if (count > 0) this.storage.setItem(key, count + '');
-    else this.storage.removeItem(key);
+    const count = toNumber(localStorage.getItem(key)) - 1;
+    // @ts-expect-error
+    if (count > 0) localStorage.setItem(key, count);
+    else localStorage.removeItem(key);
   }
 
   private _decrementCounts(split: ISplit) {
@@ -47,11 +48,13 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
   private _incrementCounts(split: ISplit) {
     try {
       const ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
-      this.storage.setItem(ttKey, (toNumber(this.storage.getItem(ttKey)) + 1) + '');
+      // @ts-expect-error
+      localStorage.setItem(ttKey, toNumber(localStorage.getItem(ttKey)) + 1);
 
       if (usesSegments(split)) {
         const segmentsCountKey = this.keys.buildSplitsWithSegmentCountKey();
-        this.storage.setItem(segmentsCountKey, (toNumber(this.storage.getItem(segmentsCountKey)) + 1) + '');
+        // @ts-expect-error
+        localStorage.setItem(segmentsCountKey, toNumber(localStorage.getItem(segmentsCountKey)) + 1);
       }
     } catch (e) {
       this.log.error(LOG_PREFIX + e);
@@ -65,15 +68,15 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
    */
   clear() {
     // collect item keys
-    const len = this.storage.length;
+    const len = localStorage.length;
     const accum = [];
     for (let cur = 0; cur < len; cur++) {
-      const key = this.storage.key(cur);
+      const key = localStorage.key(cur);
       if (key != null && this.keys.isSplitsCacheKey(key)) accum.push(key);
     }
     // remove items
     accum.forEach(key => {
-      this.storage.removeItem(key);
+      localStorage.removeItem(key);
     });
 
     this.hasSync = false;
@@ -83,15 +86,15 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
     try {
       const name = split.name;
       const splitKey = this.keys.buildSplitKey(name);
-      const splitFromStorage = this.storage.getItem(splitKey);
-      const previousSplit = splitFromStorage ? JSON.parse(splitFromStorage) : null;
+      const splitFromLocalStorage = localStorage.getItem(splitKey);
+      const previousSplit = splitFromLocalStorage ? JSON.parse(splitFromLocalStorage) : null;
 
       if (previousSplit) {
         this._decrementCounts(previousSplit);
         this.removeFromFlagSets(previousSplit.name, previousSplit.sets);
       }
 
-      this.storage.setItem(splitKey, JSON.stringify(split));
+      localStorage.setItem(splitKey, JSON.stringify(split));
 
       this._incrementCounts(split);
       this.addToFlagSets(split);
@@ -108,7 +111,7 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
       const split = this.getSplit(name);
       if (!split) return false;
 
-      this.storage.removeItem(this.keys.buildSplitKey(name));
+      localStorage.removeItem(this.keys.buildSplitKey(name));
 
       this._decrementCounts(split);
       this.removeFromFlagSets(split.name, split.sets);
@@ -121,15 +124,15 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
   }
 
   getSplit(name: string): ISplit | null {
-    const item = this.storage.getItem(this.keys.buildSplitKey(name));
+    const item = localStorage.getItem(this.keys.buildSplitKey(name));
     return item && JSON.parse(item);
   }
 
   setChangeNumber(changeNumber: number): boolean {
     try {
-      this.storage.setItem(this.keys.buildSplitsTillKey(), changeNumber + '');
+      localStorage.setItem(this.keys.buildSplitsTillKey(), changeNumber + '');
       // update "last updated" timestamp with current time
-      this.storage.setItem(this.keys.buildLastUpdatedKey(), Date.now() + '');
+      localStorage.setItem(this.keys.buildLastUpdatedKey(), Date.now() + '');
       this.hasSync = true;
       return true;
     } catch (e) {
@@ -140,7 +143,7 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
 
   getChangeNumber(): number {
     const n = -1;
-    let value: string | number | null = this.storage.getItem(this.keys.buildSplitsTillKey());
+    let value: string | number | null = localStorage.getItem(this.keys.buildSplitsTillKey());
 
     if (value !== null) {
       value = parseInt(value, 10);
@@ -152,13 +155,13 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
   }
 
   getSplitNames(): string[] {
-    const len = this.storage.length;
+    const len = localStorage.length;
     const accum = [];
 
     let cur = 0;
 
     while (cur < len) {
-      const key = this.storage.key(cur);
+      const key = localStorage.key(cur);
 
       if (key != null && this.keys.isSplitKey(key)) accum.push(this.keys.extractKey(key));
 
@@ -169,7 +172,7 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
   }
 
   trafficTypeExists(trafficType: string): boolean {
-    const ttCount = toNumber(this.storage.getItem(this.keys.buildTrafficTypeKey(trafficType)));
+    const ttCount = toNumber(localStorage.getItem(this.keys.buildTrafficTypeKey(trafficType)));
     return isFiniteNumber(ttCount) && ttCount > 0;
   }
 
@@ -177,7 +180,7 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
     // If cache hasn't been synchronized with the cloud, assume we need them.
     if (!this.hasSync) return true;
 
-    const storedCount = this.storage.getItem(this.keys.buildSplitsWithSegmentCountKey());
+    const storedCount = localStorage.getItem(this.keys.buildSplitsWithSegmentCountKey());
     const splitsWithSegmentsCount = storedCount === null ? 0 : toNumber(storedCount);
 
     return isFiniteNumber(splitsWithSegmentsCount) ?
@@ -188,9 +191,9 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
   getNamesByFlagSets(flagSets: string[]): Set<string>[] {
     return flagSets.map(flagSet => {
       const flagSetKey = this.keys.buildFlagSetKey(flagSet);
-      const flagSetFromStorage = this.storage.getItem(flagSetKey);
+      const flagSetFromLocalStorage = localStorage.getItem(flagSetKey);
 
-      return new Set(flagSetFromStorage ? JSON.parse(flagSetFromStorage) : []);
+      return new Set(flagSetFromLocalStorage ? JSON.parse(flagSetFromLocalStorage) : []);
     });
   }
 
@@ -203,12 +206,12 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
 
       const flagSetKey = this.keys.buildFlagSetKey(featureFlagSet);
 
-      const flagSetFromStorage = this.storage.getItem(flagSetKey);
+      const flagSetFromLocalStorage = localStorage.getItem(flagSetKey);
 
-      const flagSetCache = new Set(flagSetFromStorage ? JSON.parse(flagSetFromStorage) : []);
+      const flagSetCache = new Set(flagSetFromLocalStorage ? JSON.parse(flagSetFromLocalStorage) : []);
       flagSetCache.add(featureFlag.name);
 
-      this.storage.setItem(flagSetKey, JSON.stringify(setToArray(flagSetCache)));
+      localStorage.setItem(flagSetKey, JSON.stringify(setToArray(flagSetCache)));
     });
   }
 
@@ -223,19 +226,19 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
   private removeNames(flagSetName: string, featureFlagName: string) {
     const flagSetKey = this.keys.buildFlagSetKey(flagSetName);
 
-    const flagSetFromStorage = this.storage.getItem(flagSetKey);
+    const flagSetFromLocalStorage = localStorage.getItem(flagSetKey);
 
-    if (!flagSetFromStorage) return;
+    if (!flagSetFromLocalStorage) return;
 
-    const flagSetCache = new Set(JSON.parse(flagSetFromStorage));
+    const flagSetCache = new Set(JSON.parse(flagSetFromLocalStorage));
     flagSetCache.delete(featureFlagName);
 
     if (flagSetCache.size === 0) {
-      this.storage.removeItem(flagSetKey);
+      localStorage.removeItem(flagSetKey);
       return;
     }
 
-    this.storage.setItem(flagSetKey, JSON.stringify(setToArray(flagSetCache)));
+    localStorage.setItem(flagSetKey, JSON.stringify(setToArray(flagSetCache)));
   }
 
 }

package/src/storages/inLocalStorage/index.ts

@@ -1,10 +1,10 @@
 import { ImpressionsCacheInMemory } from '../inMemory/ImpressionsCacheInMemory';
 import { ImpressionCountsCacheInMemory } from '../inMemory/ImpressionCountsCacheInMemory';
 import { EventsCacheInMemory } from '../inMemory/EventsCacheInMemory';
-import { IStorageFactoryParams, IStorageSync, IStorageSyncFactory, StorageAdapter } from '../types';
+import { IStorageFactoryParams, IStorageSync, IStorageSyncFactory } from '../types';
 import { validatePrefix } from '../KeyBuilder';
 import { KeyBuilderCS, myLargeSegmentsKeyBuilder } from '../KeyBuilderCS';
-import { isLocalStorageAvailable, isValidStorageWrapper, isWebStorage } from '../../utils/env/isLocalStorageAvailable';
+import { isLocalStorageAvailable } from '../../utils/env/isLocalStorageAvailable';
 import { SplitsCacheInLocal } from './SplitsCacheInLocal';
 import { RBSegmentsCacheInLocal } from './RBSegmentsCacheInLocal';
 import { MySegmentsCacheInLocal } from './MySegmentsCacheInLocal';
@@ -15,24 +15,7 @@ import { shouldRecordTelemetry, TelemetryCacheInMemory } from '../inMemory/Telem
 import { UniqueKeysCacheInMemoryCS } from '../inMemory/UniqueKeysCacheInMemoryCS';
 import { getMatching } from '../../utils/key';
 import { validateCache } from './validateCache';
-import { ILogger } from '../../logger/types';
 import SplitIO from '../../../types/splitio';
-import { storageAdapter } from './storageAdapter';
-
-function validateStorage(log: ILogger, prefix: string, wrapper?: SplitIO.StorageWrapper): StorageAdapter | undefined {
-  if (wrapper) {
-    if (isValidStorageWrapper(wrapper)) {
-      return isWebStorage(wrapper) ?
-        wrapper as StorageAdapter: // localStorage and sessionStorage don't need adapter
-        storageAdapter(log, prefix, wrapper);
-    }
-    log.warn(LOG_PREFIX + 'Invalid storage provided. Falling back to LocalStorage API');
-  }
-
-  if (isLocalStorageAvailable()) return localStorage;
-
-  log.warn(LOG_PREFIX + 'LocalStorage API is unavailable. Falling back to default MEMORY storage');
-}
 
 /**
  * InLocal storage factory for standalone client-side SplitFactory
@@ -42,19 +25,21 @@ export function InLocalStorage(options: SplitIO.InLocalStorageOptions = {}): ISt
   const prefix = validatePrefix(options.prefix);
 
   function InLocalStorageCSFactory(params: IStorageFactoryParams): IStorageSync {
-    const { settings, settings: { log, scheduler: { impressionsQueueSize, eventsQueueSize } } } = params;
 
-    const storage = validateStorage(log, prefix, options.wrapper);
-    if (!storage) return InMemoryStorageCSFactory(params);
+    // Fallback to InMemoryStorage if LocalStorage API is not available
+    if (!isLocalStorageAvailable()) {
+      params.settings.log.warn(LOG_PREFIX + 'LocalStorage API is unavailable. Falling back to default MEMORY storage');
+      return InMemoryStorageCSFactory(params);
+    }
 
+    const { settings, settings: { log, scheduler: { impressionsQueueSize, eventsQueueSize } } } = params;
     const matchingKey = getMatching(settings.core.key);
     const keys = new KeyBuilderCS(prefix, matchingKey);
 
-    const splits = new SplitsCacheInLocal(settings, keys, storage);
-    const rbSegments = new RBSegmentsCacheInLocal(settings, keys, storage);
-    const segments = new MySegmentsCacheInLocal(log, keys, storage);
-    const largeSegments = new MySegmentsCacheInLocal(log, myLargeSegmentsKeyBuilder(prefix, matchingKey), storage);
-    let validateCachePromise: Promise<boolean> | undefined;
+    const splits = new SplitsCacheInLocal(settings, keys);
+    const rbSegments = new RBSegmentsCacheInLocal(settings, keys);
+    const segments = new MySegmentsCacheInLocal(log, keys);
+    const largeSegments = new MySegmentsCacheInLocal(log, myLargeSegmentsKeyBuilder(prefix, matchingKey));
 
     return {
       splits,
@@ -68,12 +53,10 @@ export function InLocalStorage(options: SplitIO.InLocalStorageOptions = {}): ISt
       uniqueKeys: new UniqueKeysCacheInMemoryCS(),
 
       validateCache() {
-        return validateCachePromise || (validateCachePromise = validateCache(options, storage, settings, keys, splits, rbSegments, segments, largeSegments));
+        return validateCache(options, settings, keys, splits, rbSegments, segments, largeSegments);
       },
 
-      destroy() {
-        return storage.save && storage.save();
-      },
+      destroy() { },
 
       // When using shared instantiation with MEMORY we reuse everything but segments (they are customer per key).
       shared(matchingKey: string) {
@@ -81,8 +64,8 @@ export function InLocalStorage(options: SplitIO.InLocalStorageOptions = {}): ISt
         return {
           splits: this.splits,
           rbSegments: this.rbSegments,
-          segments: new MySegmentsCacheInLocal(log, new KeyBuilderCS(prefix, matchingKey), storage),
-          largeSegments: new MySegmentsCacheInLocal(log, myLargeSegmentsKeyBuilder(prefix, matchingKey), storage),
+          segments: new MySegmentsCacheInLocal(log, new KeyBuilderCS(prefix, matchingKey)),
+          largeSegments: new MySegmentsCacheInLocal(log, myLargeSegmentsKeyBuilder(prefix, matchingKey)),
           impressions: this.impressions,
           impressionCounts: this.impressionCounts,
           events: this.events,

package/src/storages/inLocalStorage/validateCache.ts

@@ -7,7 +7,6 @@ import type { RBSegmentsCacheInLocal } from './RBSegmentsCacheInLocal';
 import type { MySegmentsCacheInLocal } from './MySegmentsCacheInLocal';
 import { KeyBuilderCS } from '../KeyBuilderCS';
 import SplitIO from '../../../types/splitio';
-import { StorageAdapter } from '../types';
 
 const DEFAULT_CACHE_EXPIRATION_IN_DAYS = 10;
 const MILLIS_IN_A_DAY = 86400000;
@@ -17,11 +16,11 @@ const MILLIS_IN_A_DAY = 86400000;
  *
  * @returns `true` if cache should be cleared, `false` otherwise
  */
-function validateExpiration(options: SplitIO.InLocalStorageOptions, storage: StorageAdapter, settings: ISettings, keys: KeyBuilderCS, currentTimestamp: number, isThereCache: boolean) {
+function validateExpiration(options: SplitIO.InLocalStorageOptions, settings: ISettings, keys: KeyBuilderCS, currentTimestamp: number, isThereCache: boolean) {
   const { log } = settings;
 
   // Check expiration
-  const lastUpdatedTimestamp = parseInt(storage.getItem(keys.buildLastUpdatedKey()) as string, 10);
+  const lastUpdatedTimestamp = parseInt(localStorage.getItem(keys.buildLastUpdatedKey()) as string, 10);
   if (!isNaNNumber(lastUpdatedTimestamp)) {
     const cacheExpirationInDays = isFiniteNumber(options.expirationDays) && options.expirationDays >= 1 ? options.expirationDays : DEFAULT_CACHE_EXPIRATION_IN_DAYS;
     const expirationTimestamp = currentTimestamp - MILLIS_IN_A_DAY * cacheExpirationInDays;
@@ -33,12 +32,12 @@ function validateExpiration(options: SplitIO.InLocalStorageOptions, storage: Sto
 
   // Check hash
   const storageHashKey = keys.buildHashKey();
-  const storageHash = storage.getItem(storageHashKey);
+  const storageHash = localStorage.getItem(storageHashKey);
   const currentStorageHash = getStorageHash(settings);
 
   if (storageHash !== currentStorageHash) {
     try {
-      storage.setItem(storageHashKey, currentStorageHash);
+      localStorage.setItem(storageHashKey, currentStorageHash);
     } catch (e) {
       log.error(LOG_PREFIX + e);
     }
@@ -51,7 +50,7 @@ function validateExpiration(options: SplitIO.InLocalStorageOptions, storage: Sto
 
   // Clear on init
   if (options.clearOnInit) {
-    const lastClearTimestamp = parseInt(storage.getItem(keys.buildLastClear()) as string, 10);
+    const lastClearTimestamp = parseInt(localStorage.getItem(keys.buildLastClear()) as string, 10);
 
     if (isNaNNumber(lastClearTimestamp) || lastClearTimestamp < currentTimestamp - MILLIS_IN_A_DAY) {
       log.info(LOG_PREFIX + 'clearOnInit was set and cache was not cleared in the last 24 hours. Cleaning up cache');
@@ -68,29 +67,27 @@ function validateExpiration(options: SplitIO.InLocalStorageOptions, storage: Sto
  *
  * @returns `true` if cache is ready to be used, `false` otherwise (cache was cleared or there is no cache)
  */
-export function validateCache(options: SplitIO.InLocalStorageOptions, storage: StorageAdapter, settings: ISettings, keys: KeyBuilderCS, splits: SplitsCacheInLocal, rbSegments: RBSegmentsCacheInLocal, segments: MySegmentsCacheInLocal, largeSegments: MySegmentsCacheInLocal): Promise<boolean> {
+export function validateCache(options: SplitIO.InLocalStorageOptions, settings: ISettings, keys: KeyBuilderCS, splits: SplitsCacheInLocal, rbSegments: RBSegmentsCacheInLocal, segments: MySegmentsCacheInLocal, largeSegments: MySegmentsCacheInLocal): boolean {
 
-  return Promise.resolve(storage.load && storage.load()).then(() => {
-    const currentTimestamp = Date.now();
-    const isThereCache = splits.getChangeNumber() > -1;
+  const currentTimestamp = Date.now();
+  const isThereCache = splits.getChangeNumber() > -1;
 
-    if (validateExpiration(options, storage, settings, keys, currentTimestamp, isThereCache)) {
-      splits.clear();
-      rbSegments.clear();
-      segments.clear();
-      largeSegments.clear();
+  if (validateExpiration(options, settings, keys, currentTimestamp, isThereCache)) {
+    splits.clear();
+    rbSegments.clear();
+    segments.clear();
+    largeSegments.clear();
 
-      // Update last clear timestamp
-      try {
-        storage.setItem(keys.buildLastClear(), currentTimestamp + '');
-      } catch (e) {
-        settings.log.error(LOG_PREFIX + e);
-      }
-
-      return false;
+    // Update last clear timestamp
+    try {
+      localStorage.setItem(keys.buildLastClear(), currentTimestamp + '');
+    } catch (e) {
+      settings.log.error(LOG_PREFIX + e);
     }
 
-    // Check if ready from cache
-    return isThereCache;
-  });
+    return false;
+  }
+
+  // Check if ready from cache
+  return isThereCache;
 }