Integrated into persistence.

Author: kinyoklion

packages/shared/sdk-client/__tests__/LDClientImpl.storage.test.ts

@@ -9,6 +9,16 @@ import * as mockResponseJson from './evaluation/mockResponse.json';
 import { MockEventSource } from './streaming/LDClientImpl.mocks';
 import { makeTestDataManagerFactory } from './TestDataManager';
 
+/**
+ * Extracts the flags from a stored cache record JSON string.
+ * Handles both the new format `{flags: {...}, freshness: {...}}` and
+ * the old bare `{flagKey: {...}}` format.
+ */
+function parseFlagsFromStorage(json: string): Flags {
+  const parsed = JSON.parse(json);
+  return parsed.flags ?? parsed;
+}
+
 let mockPlatform: ReturnType<typeof createBasicPlatform>;
 let logger: LDLogger;
 
@@ -210,11 +220,9 @@ describe('sdk-client storage', () => {
       expect.stringContaining('index'),
     );
 
-    expect(mockPlatform.storage.set).toHaveBeenNthCalledWith(
-      2,
-      flagStorageKey,
-      JSON.stringify(defaultPutResponse),
-    );
+    const storedRecord = parseFlagsFromStorage(mockPlatform.storage.set.mock.calls[1][1]);
+    expect(mockPlatform.storage.set.mock.calls[1][0]).toBe(flagStorageKey);
+    expect(storedRecord).toEqual(defaultPutResponse);
 
     // this is defaultPutResponse
     expect(ldc.allFlags()).toEqual({
@@ -256,11 +264,8 @@ describe('sdk-client storage', () => {
       indexStorageKey,
       expect.stringContaining('index'),
     );
-    expect(mockPlatform.storage.set).toHaveBeenNthCalledWith(
-      2,
-      flagStorageKey,
-      JSON.stringify(putResponse),
-    );
+    expect(mockPlatform.storage.set.mock.calls[1][0]).toBe(flagStorageKey);
+    expect(parseFlagsFromStorage(mockPlatform.storage.set.mock.calls[1][1])).toEqual(putResponse);
 
     expect(emitter.emit).toHaveBeenCalledWith('change', context, defaultFlagKeys);
     expect(emitter.emit).toHaveBeenCalledWith('change', context, ['dev-test-flag']);
@@ -297,11 +302,8 @@ describe('sdk-client storage', () => {
       indexStorageKey,
       expect.stringContaining('index'),
     );
-    expect(mockPlatform.storage.set).toHaveBeenNthCalledWith(
-      2,
-      flagStorageKey,
-      JSON.stringify(putResponse),
-    );
+    expect(mockPlatform.storage.set.mock.calls[1][0]).toBe(flagStorageKey);
+    expect(parseFlagsFromStorage(mockPlatform.storage.set.mock.calls[1][1])).toEqual(putResponse);
     expect(emitter.emit).toHaveBeenCalledWith('change', context, ['another-dev-test-flag']);
   });
 
@@ -379,10 +381,9 @@ describe('sdk-client storage', () => {
       indexStorageKey,
       expect.stringContaining('index'),
     );
-    expect(mockPlatform.storage.set).toHaveBeenNthCalledWith(
-      2,
-      flagStorageKey,
-      JSON.stringify(defaultPutResponse),
+    expect(mockPlatform.storage.set.mock.calls[1][0]).toBe(flagStorageKey);
+    expect(parseFlagsFromStorage(mockPlatform.storage.set.mock.calls[1][1])).toEqual(
+      defaultPutResponse,
     );
 
     // we expect one change from the local storage init, but no further change from the PUT
@@ -421,7 +422,7 @@ describe('sdk-client storage', () => {
     await changePromise;
     await jest.runAllTimersAsync();
 
-    const flagsInStorage = JSON.parse(mockPlatform.storage.set.mock.lastCall[1]) as Flags;
+    const flagsInStorage = parseFlagsFromStorage(mockPlatform.storage.set.mock.lastCall[1]);
     expect(ldc.allFlags()).toMatchObject({ 'dev-test-flag': true });
     expect(flagsInStorage['dev-test-flag'].reason).toEqual({
       kind: 'RULE_MATCH',
@@ -455,7 +456,7 @@ describe('sdk-client storage', () => {
     await changePromise;
     await jest.runAllTimersAsync();
 
-    const flagsInStorage = JSON.parse(mockPlatform.storage.set.mock.lastCall[1]) as Flags;
+    const flagsInStorage = parseFlagsFromStorage(mockPlatform.storage.set.mock.lastCall[1]);
     expect(ldc.allFlags()).toMatchObject({ 'dev-test-flag': false });
     expect(mockPlatform.storage.set).toHaveBeenCalledTimes(4);
     expect(flagsInStorage['dev-test-flag'].version).toEqual(patchResponse.version);
@@ -482,7 +483,7 @@ describe('sdk-client storage', () => {
     await changePromise;
     await jest.runAllTimersAsync();
 
-    const flagsInStorage = JSON.parse(mockPlatform.storage.set.mock.lastCall[1]) as Flags;
+    const flagsInStorage = parseFlagsFromStorage(mockPlatform.storage.set.mock.lastCall[1]);
     expect(ldc.allFlags()).toHaveProperty('another-dev-test-flag');
     expect(mockPlatform.storage.set).toHaveBeenNthCalledWith(
       4,
@@ -556,7 +557,7 @@ describe('sdk-client storage', () => {
     await changePromise;
     await jest.runAllTimersAsync();
 
-    const flagsInStorage = JSON.parse(mockPlatform.storage.set.mock.lastCall[1]) as Flags;
+    const flagsInStorage = parseFlagsFromStorage(mockPlatform.storage.set.mock.lastCall[1]);
     expect(ldc.allFlags()).not.toHaveProperty('dev-test-flag');
     expect(mockPlatform.storage.set).toHaveBeenNthCalledWith(
       4,
@@ -645,7 +646,7 @@ describe('sdk-client storage', () => {
     await changePromise;
     await jest.runAllTimersAsync();
 
-    const flagsInStorage = JSON.parse(mockPlatform.storage.set.mock.lastCall[1]) as Flags;
+    const flagsInStorage = parseFlagsFromStorage(mockPlatform.storage.set.mock.lastCall[1]);
 
     expect(mockPlatform.storage.set).toHaveBeenCalledTimes(4); // two index saves and two flag saves
     expect(flagsInStorage['does-not-exist']).toMatchObject({ ...deleteResponse, deleted: true });

packages/shared/sdk-client/__tests__/datasource/FreshnessTracker.test.ts

@@ -0,0 +1,25 @@
+import { calculatePollDelay } from '../../../src/datasource/fdv2/calculatePollDelay';
+
+describe('calculatePollDelay', () => {
+  it('returns 0 when freshness is undefined (poll immediately)', () => {
+    expect(calculatePollDelay(undefined, 60000, 1000)).toBe(0);
+  });
+
+  it('returns remaining interval when data was recently received', () => {
+    // Freshness at 1000, now at 1500, interval 2000 → 1500 remaining
+    expect(calculatePollDelay(1000, 2000, 1500)).toBe(1500);
+  });
+
+  it('returns 0 when data is stale beyond poll interval', () => {
+    // Freshness at 1000, now at 5000, interval 2000 → 0 (stale)
+    expect(calculatePollDelay(1000, 2000, 5000)).toBe(0);
+  });
+
+  it('returns 0 when elapsed time exactly matches interval', () => {
+    expect(calculatePollDelay(1000, 2000, 3000)).toBe(0);
+  });
+
+  it('returns full interval when freshness equals now', () => {
+    expect(calculatePollDelay(5000, 60000, 5000)).toBe(60000);
+  });
+});