Fix cache key eviction

lib/Onyx.ts

@@ -73,7 +73,9 @@ function init({
     OnyxUtils.initStoreValues(keys, initialKeyStates, evictableKeys);
 
     // Initialize all of our keys with data provided then give green light to any pending connections
-    Promise.all([cache.addEvictableKeysToRecentlyAccessedList(OnyxUtils.isCollectionKey), OnyxUtils.initializeWithDefaultKeyStates()]).then(OnyxUtils.getDeferredInitTask().resolve);
+    Promise.all([cache.addEvictableKeysToRecentlyAccessedList(OnyxUtils.isCollectionKey, OnyxUtils.getAllKeys), OnyxUtils.initializeWithDefaultKeyStates()]).then(
+        OnyxUtils.getDeferredInitTask().resolve,
+    );
 }
 
 /**

lib/OnyxCache.ts

@@ -3,7 +3,6 @@ import bindAll from 'lodash/bindAll';
 import type {ValueOf} from 'type-fest';
 import utils from './utils';
 import type {OnyxKey, OnyxValue} from './types';
-import Storage from './storage';
 import * as Str from './Str';
 
 // Task constants
@@ -336,11 +335,13 @@ class OnyxCache {
      * the recently accessed list when initializing the app. This
      * enables keys that have not recently been accessed to be
      * removed.
+     * @param isCollectionKeyFn - Function to determine if a key is a collection key
+     * @param getAllKeysFn - Function to get all keys, defaults to Storage.getAllKeys
      */
-    addEvictableKeysToRecentlyAccessedList(isCollectionKeyFn: (key: OnyxKey) => boolean): Promise<void> {
-        return Storage.getAllKeys().then((keys: string[]) => {
+    addEvictableKeysToRecentlyAccessedList(isCollectionKeyFn: (key: OnyxKey) => boolean, getAllKeysFn: () => Promise<Set<OnyxKey>>): Promise<void> {
+        return getAllKeysFn().then((keys: Set<OnyxKey>) => {
             this.evictionAllowList.forEach((evictableKey) => {
-                keys.forEach((key: string) => {
+                keys.forEach((key: OnyxKey) => {
                     if (!this.isKeyMatch(evictableKey, key)) {
                         return;
                     }

tests/perf-test/OnyxUtils.perf-test.ts

@@ -279,12 +279,19 @@ describe('OnyxUtils', () => {
         };
 
         test('one call adding 1k keys', async () => {
-            await measureAsyncFunction(() => OnyxCache.addEvictableKeysToRecentlyAccessedList(() => false), {
-                beforeEach: async () => {
-                    await Onyx.multiSet(data);
+            await measureAsyncFunction(
+                () =>
+                    OnyxCache.addEvictableKeysToRecentlyAccessedList(
+                        () => false,
+                        () => Promise.resolve(new Set(Object.keys(data))),
+                    ),
+                {
+                    beforeEach: async () => {
+                        await Onyx.multiSet(data);
+                    },
+                    afterEach: clearOnyxAfterEachMeasure,
                 },
-                afterEach: clearOnyxAfterEachMeasure,
-            });
+            );
         });
     });