[FSSDK-10936] improvement

Author: junaed-optimizely

lib/plugins/key_value_cache/reactNativeAsyncStorageCache.ts

@@ -15,26 +15,28 @@
  */
 
 import PersistentKeyValueCache from './persistentKeyValueCache';
-import { asyncStorage } from '../../utils/import.react_native/@react-native-async-storage/async-storage';
+import { getDefaultAsyncStorage } from '../../utils/import.react_native/@react-native-async-storage/async-storage';
 
 export default class ReactNativeAsyncStorageCache implements PersistentKeyValueCache {
+  private asyncStorage = getDefaultAsyncStorage();
+  
   async contains(key: string): Promise<boolean> {
-    return (await asyncStorage.getItem(key)) !== null;
+    return (await this.asyncStorage.getItem(key)) !== null;
   }
 
   async get(key: string): Promise<string | undefined> {
-    return (await asyncStorage.getItem(key)) || undefined;
+    return (await this.asyncStorage.getItem(key)) || undefined;
   }
 
   async remove(key: string): Promise<boolean> {
     if (await this.contains(key)) {
-      await asyncStorage.removeItem(key);
+      await this.asyncStorage.removeItem(key);
       return true;
     }
     return false;
   }
 
   set(key: string, val: string): Promise<void> {
-    return asyncStorage.setItem(key, val);
+    return this.asyncStorage.setItem(key, val);
   }
 }

lib/utils/cache/async_storage_cache.react_native.ts

@@ -16,34 +16,35 @@
 
 import { Maybe } from "../type";
 import { AsyncCache } from "./cache";
-import { asyncStorage } from "../import.react_native/@react-native-async-storage/async-storage";
+import { getDefaultAsyncStorage } from "../import.react_native/@react-native-async-storage/async-storage";
 
 export class AsyncStorageCache<V> implements AsyncCache<V> {
   public readonly operation = 'async';
+  private asyncStorage = getDefaultAsyncStorage();
 
   async get(key: string): Promise<V | undefined> {
-    const value = await asyncStorage.getItem(key);
+    const value = await this.asyncStorage.getItem(key);
     return value ? JSON.parse(value) : undefined;
   }
 
   async remove(key: string): Promise<unknown> {
-    return asyncStorage.removeItem(key);
+    return this.asyncStorage.removeItem(key);
   }
 
   async set(key: string, val: V): Promise<unknown> {
-    return asyncStorage.setItem(key, JSON.stringify(val));
+    return this.asyncStorage.setItem(key, JSON.stringify(val));
   }
 
   async clear(): Promise<unknown> {
-    return asyncStorage.clear();
+    return this.asyncStorage.clear();
   }
 
   async getKeys(): Promise<string[]> {
-    return [... await asyncStorage.getAllKeys()];
+    return [... await this.asyncStorage.getAllKeys()];
   }
 
   async getBatched(keys: string[]): Promise<Maybe<V>[]> {
-    const items = await asyncStorage.multiGet(keys);
+    const items = await this.asyncStorage.multiGet(keys);
     return items.map(([key, value]) => value ? JSON.parse(value) : undefined);
   }
 }

lib/utils/import.react_native/@react-native-async-storage/async-storage.ts

@@ -16,15 +16,12 @@
 
 import type { AsyncStorageStatic } from '@react-native-async-storage/async-storage'
 
-const requireAsyncStorage = () => {
+export const getDefaultAsyncStorage = (): AsyncStorageStatic => {
 	try {
 		// eslint-disable-next-line @typescript-eslint/no-var-requires
-		return require('@react-native-async-storage/async-storage').default as AsyncStorageStatic;
+		return require('@react-native-async-storage/async-storage').default;
 	} catch (e) {
+		// Better error message than unknown module not found
 		throw new Error('@react-native-async-storage/async-storage is not available');
 	}
 };
-
-const asyncStorage = requireAsyncStorage();
-
-export { asyncStorage }