feat: brownfield integration

Author: krizzu

packages/async-storage/android/src/main/kotlin/org/asyncstorage/storage/PersistentStorage.kt renamed to packages/async-storage/android/src/main/kotlin/org/asyncstorage/storage/RNStorage.kt

@@ -1,6 +1,5 @@
 package org.asyncstorage.storage
 
-import android.content.Context
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableArray
@@ -20,17 +19,12 @@ private val createStorageScope = { name: String ->
     CoroutineScope(SupervisorJob() + CoroutineName(name))
 }
 
-/**
- * todo:
- * - handle exceptions via coroutine exception handler or via try catch
- */
-class PersistentStorage(
-    ctx: Context,
+class RNStorage(
+    private val db: SharedStorage,
     dbName: String,
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
 ) {
     private val scope = createStorageScope(dbName) + coroutineContext
-    private val db = SharedStorage(ctx, dbName)
 
     fun get(rnKeys: ReadableArray, promise: Promise) =
         scope.lunchWithRejection(promise) {
@@ -65,7 +59,7 @@ class PersistentStorage(
         }
 }
 
-private fun <T> CoroutineScope.lunchWithRejection(promise: Promise, block: suspend () -> T): Unit {
+private fun <T> CoroutineScope.lunchWithRejection(promise: Promise, block: suspend () -> T) {
     launch {
         try {
             block()

packages/async-storage/android/src/main/kotlin/org/asyncstorage/storage/StorageRegistry.kt

@@ -1,11 +1,34 @@
 package org.asyncstorage.storage
 
 import android.content.Context
+import org.asyncstorage.shared_storage.SharedStorage
 
+/**
+ * StorageRegistry is a singleton responsible for managing and providing access to SharedStorage and
+ * RNStorage instances in a thread-safe manner.
+ */
 object StorageRegistry {
+    /**
+     * Cache for Shared Storages instances. These instances are shared by native and RN
+     * implementation.
+     */
+    private val storages = mutableMapOf<String, SharedStorage>()
 
-    private val storages = mutableMapOf<String, PersistentStorage>()
+    /**
+     * Cache for PersistentStorage used by RN module. It uses shared storage singleton instances.
+     */
+    private val rnStorages = mutableMapOf<String, RNStorage>()
 
-    fun getOrCreate(ctx: Context, name: String): PersistentStorage =
-        storages.getOrPut(name) { PersistentStorage(ctx, name) }
+    fun getRNStorage(ctx: Context, name: String): RNStorage =
+        synchronized(this) {
+            rnStorages.getOrPut(name) {
+                val storage = storages.getOrPut(name) { SharedStorage(ctx, name) }
+                RNStorage(storage, name)
+            }
+        }
+
+    fun getStorage(ctx: Context, name: String): SharedStorage =
+        synchronized(this) {
+            return storages.getOrPut(name) { SharedStorage(ctx, name) }
+        }
 }

packages/async-storage/android/src/newarch/org/asyncstorage/AsyncStorageModule.kt

@@ -16,23 +16,23 @@ class AsyncStorageModule(private val reactContext: ReactApplicationContext) :
     override fun getName() = NAME
 
     override fun getValues(db: String, keys: ReadableArray, promise: Promise) {
-        StorageRegistry.getOrCreate(reactContext, db).run { get(keys, promise) }
+        StorageRegistry.getRNStorage(reactContext, db).run { get(keys, promise) }
     }
 
     override fun setValues(db: String, values: ReadableArray, promise: Promise) {
-        StorageRegistry.getOrCreate(reactContext, db).run { set(values, promise) }
+        StorageRegistry.getRNStorage(reactContext, db).run { set(values, promise) }
     }
 
     override fun removeValues(db: String, keys: ReadableArray, promise: Promise) {
-        StorageRegistry.getOrCreate(reactContext, db).run { remove(keys, promise) }
+        StorageRegistry.getRNStorage(reactContext, db).run { remove(keys, promise) }
     }
 
     override fun getKeys(db: String, promise: Promise) {
-        StorageRegistry.getOrCreate(reactContext, db).run { allKeys(promise) }
+        StorageRegistry.getRNStorage(reactContext, db).run { allKeys(promise) }
     }
 
     override fun clearStorage(db: String, promise: Promise) {
-        StorageRegistry.getOrCreate(reactContext, db).run { clear(promise) }
+        StorageRegistry.getRNStorage(reactContext, db).run { clear(promise) }
     }
 
     override fun legacy_multiGet(keys: ReadableArray, promise: Promise) {

packages/async-storage/android/src/oldarch/asyncstorage/AsyncStorageModule.kt

@@ -19,27 +19,27 @@ class AsyncStorageModule(private val reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun getValues(db: String, keys: ReadableArray, promise: Promise) {
-        StorageRegistry.getOrCreate(reactContext, db).run { get(keys, promise) }
+        StorageRegistry.getRNStorage(reactContext, db).run { get(keys, promise) }
     }
 
     @ReactMethod
     fun setValues(db: String, values: ReadableArray, promise: Promise) {
-        StorageRegistry.getOrCreate(reactContext, db).run { set(values, promise) }
+        StorageRegistry.getRNStorage(reactContext, db).run { set(values, promise) }
     }
 
     @ReactMethod
     fun removeValues(db: String, keys: ReadableArray, promise: Promise) {
-        StorageRegistry.getOrCreate(reactContext, db).run { remove(keys, promise) }
+        StorageRegistry.getRNStorage(reactContext, db).run { remove(keys, promise) }
     }
 
     @ReactMethod
     fun getKeys(db: String, promise: Promise) {
-        StorageRegistry.getOrCreate(reactContext, db).run { allKeys(promise) }
+        StorageRegistry.getRNStorage(reactContext, db).run { allKeys(promise) }
     }
 
     @ReactMethod
     fun clearStorage(db: String, promise: Promise) {
-        StorageRegistry.getOrCreate(reactContext, db).run { clear(promise) }
+        StorageRegistry.getRNStorage(reactContext, db).run { clear(promise) }
     }
 
     @ReactMethod

packages/async-storage/apple/AsyncStorage.mm

@@ -7,33 +7,33 @@ @implementation AsyncStorage
 
 - (void)getValues:(nonnull NSString *)dbName keys:(nonnull NSArray *)keys resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
 
-    PersistentStorage* db = [StorageRegistry.shared getOrCreateWithDbName:dbName];
+    RNStorage* db = [StorageRegistry.shared getRNStorageWithDbName:dbName];
     [db getWithKeys:keys resolver:resolve rejecter:reject];
 }
 
 - (void)setValues:(nonnull NSString *)dbName values:(nonnull NSArray<NSDictionary *> *)values resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
 
-    PersistentStorage* db = [StorageRegistry.shared getOrCreateWithDbName:dbName];
+    RNStorage* db = [StorageRegistry.shared getRNStorageWithDbName:dbName];
     [db setWithValues:values resolver:resolve rejecter:reject];
 }
 
 
 - (void)removeValues:(nonnull NSString *)dbName keys:(nonnull NSArray *)keys resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
 
-    PersistentStorage* db = [StorageRegistry.shared getOrCreateWithDbName:dbName];
+    RNStorage* db = [StorageRegistry.shared getRNStorageWithDbName:dbName];
     [db removeWithKeys:keys resolver:resolve rejecter:reject];
 }
 
 
 - (void)clearStorage:(nonnull NSString *)dbName resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
 
-    PersistentStorage* db = [StorageRegistry.shared getOrCreateWithDbName:dbName];
+    RNStorage* db = [StorageRegistry.shared getRNStorageWithDbName:dbName];
     [db clearWithResolver:resolve rejecter:reject];
 }
 
 - (void)getKeys:(nonnull NSString *)dbName resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
 
-    PersistentStorage* db = [StorageRegistry.shared getOrCreateWithDbName:dbName];
+    RNStorage* db = [StorageRegistry.shared getRNStorageWithDbName:dbName];
     [db allKeysWithResolver:resolve rejecter:reject];
 }
 

packages/async-storage/apple/storage/PersistentStorage.swift renamed to packages/async-storage/apple/storage/RNStorage.swift

@@ -3,11 +3,11 @@ import SharedAsyncStorage
 
 
 @objc
-public class PersistentStorage: NSObject {
+public class RNStorage: NSObject {
     private let db: SharedStorage
-
-    init(databaseName: String) {
-        db = SharedStorage(context: PlatformContext.Instance(), databaseName: databaseName)
+    
+    init(db: SharedStorage) {
+        self.db = db
     }
 
     @objc

packages/async-storage/apple/storage/StorageRegistry.swift

@@ -1,22 +1,51 @@
+import SharedAsyncStorage
+
+/**
+ * StorageRegistry is a singleton responsible for managing and providing access to SharedStorage and
+ * RNStorage instances in a thread-safe manner.
+ */
 @objc
 public class StorageRegistry: NSObject {
+    @objc
+    public static let shared = StorageRegistry()
+
+    private let lock = NSLock()
+    private var storages: [String: SharedStorage] = [:]
+    private var rnStorages: [String: RNStorage] = [:]
+
     override private init() {
         super.init()
     }
 
     @objc
-    public static let shared = StorageRegistry()
+    public func getRNStorage(dbName: String) -> RNStorage {
+        lock.lock()
+        defer {
+            lock.unlock()
+        }
 
-    private var databases: [String: PersistentStorage] = [:]
+        return rnStorages[dbName] ?? {
+            let storage = storages[dbName] ?? {
+                let s = SharedStorage(context: PlatformContext.Instance(), databaseName: dbName)
+                storages[dbName] = s
+                return s
+            }()
+            let rnStorage = RNStorage(db: storage)
+            rnStorages[dbName] = rnStorage
+            return rnStorage
+        }()
+    }
 
-    @objc
-    public func getOrCreate(dbName: String) -> PersistentStorage {
-        if let storage = databases[dbName] {
-            return storage
+    public func getStorage(dbName: String) -> SharedStorage {
+        lock.lock()
+        defer {
+            lock.unlock()
         }
 
-        let db = PersistentStorage(databaseName: dbName)
-        databases[dbName] = db
-        return db
+        return storages[dbName] ?? {
+            let s = SharedStorage(context: PlatformContext.Instance(), databaseName: dbName)
+            storages[dbName] = s
+            return s
+        }()
     }
 }