Merge branch 'inlocalstorage_storageAdapter' into inlocalstorage_sessionStorage

Author: EmilianoSanchez

src/storages/inLocalStorage/MySegmentsCacheInLocal.ts

@@ -4,8 +4,6 @@ import { AbstractMySegmentsCacheSync } from '../AbstractMySegmentsCacheSync';
 import type { MySegmentsKeyBuilder } from '../KeyBuilderCS';
 import { LOG_PREFIX, DEFINED } from './constants';
 import { StorageAdapter } from '../types';
-import { IMySegmentsResponse } from '../../dtos/types';
-import { MySegmentsData } from '../../sync/polling/types';
 
 export class MySegmentsCacheInLocal extends AbstractMySegmentsCacheSync {
 
@@ -21,12 +19,6 @@ export class MySegmentsCacheInLocal extends AbstractMySegmentsCacheSync {
     // There is not need to flush segments cache like splits cache, since resetSegments receives the up-to-date list of active segments
   }
 
-  resetSegments(segmentsData: MySegmentsData | IMySegmentsResponse): boolean {
-    const result = super.resetSegments(segmentsData);
-    if (this.storage.save) this.storage.save();
-    return result;
-  }
-
   protected addSegment(name: string): boolean {
     const segmentKey = this.keys.buildSegmentNameKey(name);
 

src/storages/inLocalStorage/RBSegmentsCacheInLocal.ts

@@ -27,10 +27,8 @@ export class RBSegmentsCacheInLocal implements IRBSegmentsCacheSync {
 
   update(toAdd: IRBSegment[], toRemove: IRBSegment[], changeNumber: number): boolean {
     this.setChangeNumber(changeNumber);
-    let updated = toAdd.map(toAdd => this.add(toAdd)).some(result => result);
-    updated = toRemove.map(toRemove => this.remove(toRemove.name)).some(result => result) || updated;
-    if (this.storage.save) this.storage.save();
-    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) {

src/storages/inLocalStorage/SplitsCacheInLocal.ts

@@ -79,12 +79,6 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
     this.hasSync = false;
   }
 
-  update(toAdd: ISplit[], toRemove: ISplit[], changeNumber: number): boolean {
-    const result = super.update(toAdd, toRemove, changeNumber);
-    if (this.storage.save) this.storage.save();
-    return result;
-  }
-
   addSplit(split: ISplit) {
     try {
       const name = split.name;

src/storages/inLocalStorage/__tests__/MySegmentsCacheInLocal.spec.ts

@@ -2,6 +2,7 @@ import { MySegmentsCacheInLocal } from '../MySegmentsCacheInLocal';
 import { KeyBuilderCS, myLargeSegmentsKeyBuilder } from '../../KeyBuilderCS';
 import { loggerMock } from '../../../logger/__tests__/sdkLogger.mock';
 import { storages, PREFIX } from './wrapper.mock';
+import { IMySegmentsResponse } from '../../../dtos/types';
 
 test.each(storages)('SEGMENT CACHE / in LocalStorage', (storage) => {
   const caches = [
@@ -23,11 +24,10 @@ test.each(storages)('SEGMENT CACHE / in LocalStorage', (storage) => {
   });
 
   caches.forEach(cache => {
-    // @ts-expect-error
     cache.resetSegments({
       added: [],
       removed: ['mocked-segment']
-    });
+    } as IMySegmentsResponse);
 
     expect(cache.isInSegment('mocked-segment')).toBe(false);
     expect(cache.getRegisteredSegments()).toEqual(['mocked-segment-2']);

src/storages/inLocalStorage/index.ts

@@ -71,6 +71,10 @@ export function InLocalStorage(options: SplitIO.InLocalStorageOptions = {}): ISt
         return validateCachePromise || (validateCachePromise = validateCache(options, storage, settings, keys, splits, rbSegments, segments, largeSegments));
       },
 
+      save() {
+        return storage.save && storage.save();
+      },
+
       destroy() {
         return storage.whenSaved && storage.whenSaved();
       },

src/storages/types.ts

@@ -483,6 +483,7 @@ export interface IStorageBase<
   uniqueKeys: TUniqueKeysCache,
   destroy(): void | Promise<void>,
   shared?: (matchingKey: string, onReadyCb: (error?: any) => void) => this
+  save?: () => void | Promise<void>,
 }
 
 export interface IStorageSync extends IStorageBase<

src/sync/polling/updaters/mySegmentsUpdater.ts

@@ -51,6 +51,8 @@ export function mySegmentsUpdaterFactory(
       shouldNotifyUpdate = largeSegments!.resetSegments((segmentsData as IMembershipsResponse).ls || {}) || shouldNotifyUpdate;
     }
 
+    if (storage.save) storage.save();
+
     // Notify update if required
     if (usesSegmentsSync(storage) && (shouldNotifyUpdate || readyOnAlreadyExistentState)) {
       readyOnAlreadyExistentState = false;

src/sync/polling/updaters/splitChangesUpdater.ts

@@ -117,7 +117,7 @@ export function computeMutation<T extends ISplit | IRBSegment>(rules: Array<T>,
 export function splitChangesUpdaterFactory(
   log: ILogger,
   splitChangesFetcher: ISplitChangesFetcher,
-  storage: Pick<IStorageBase, 'splits' | 'rbSegments' | 'segments'>,
+  storage: Pick<IStorageBase, 'splits' | 'rbSegments' | 'segments' | 'save'>,
   splitFiltersValidation: ISplitFiltersValidation,
   splitsEventEmitter?: ISplitsEventEmitter,
   requestTimeoutBeforeReady: number = 0,
@@ -185,6 +185,8 @@ export function splitChangesUpdaterFactory(
             // @TODO if at least 1 segment fetch fails due to 404 and other segments are updated in the storage, SDK_UPDATE is not emitted
             segments.registerSegments(setToArray(usedSegments))
           ]).then(([ffChanged, rbsChanged]) => {
+            if (storage.save) storage.save();
+
             if (splitsEventEmitter) {
               // To emit SDK_SPLITS_ARRIVED for server-side SDK, we must check that all registered segments have been fetched
               return Promise.resolve(!splitsEventEmitter.splitsArrived || ((ffChanged || rbsChanged) && (isClientSide || checkAllSegmentsExist(segments))))