fix: adderss race condition on doanlowd finished -> refresh

Author: mfazekas

android/src/main/java/com/margelo/nitro/rive/HybridRiveFile.kt

@@ -4,13 +4,22 @@ import androidx.annotation.Keep
 import app.rive.runtime.kotlin.core.File
 import com.facebook.proguard.annotations.DoNotStrip
 import com.margelo.nitro.NitroModules
+import java.lang.ref.WeakReference
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
 
 @Keep
 @DoNotStrip
 class HybridRiveFile : HybridRiveFileSpec() {
   var riveFile: File? = null
   var referencedAssetCache: ReferencedAssetCache? = null
   var assetLoader: ReferencedAssetLoader? = null
+  private val weakViews = mutableListOf<WeakReference<HybridRiveView>>()
+  private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
 
   override val viewModelCount: Double?
     get() = riveFile?.viewModelCount?.toDouble()
@@ -40,19 +49,45 @@ class HybridRiveFile : HybridRiveFileSpec() {
     }
   }
 
+  fun registerView(view: HybridRiveView) {
+    weakViews.add(WeakReference(view))
+  }
+
+  fun unregisterView(view: HybridRiveView) {
+    weakViews.removeAll { it.get() == view }
+  }
+
+  private fun refreshAfterAssetChange() {
+    weakViews.removeAll { it.get() == null }
+
+    for (weakView in weakViews) {
+      weakView.get()?.refreshAfterAssetChange()
+    }
+  }
+
   override fun updateReferencedAssets(referencedAssets: ReferencedAssetsType) {
     val assetsData = referencedAssets.data ?: return
     val cache = referencedAssetCache ?: return
     val loader = assetLoader ?: return
     val context = NitroModules.applicationContext ?: return
 
+    val loadJobs = mutableListOf<kotlinx.coroutines.Deferred<Unit>>()
+
     for ((key, assetData) in assetsData) {
       val asset = cache[key] ?: continue
-      loader.updateAsset(assetData, asset, context)
+      loadJobs.add(loader.updateAsset(assetData, asset, context))
+    }
+
+    if (loadJobs.isNotEmpty()) {
+      scope.launch {
+        loadJobs.awaitAll()
+        refreshAfterAssetChange()
+      }
     }
   }
 
   override fun release() {
+    scope.cancel()
     assetLoader?.dispose()
     assetLoader = null
     riveFile?.release()

android/src/main/java/com/margelo/nitro/rive/HybridRiveView.kt

@@ -25,6 +25,7 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
   //region State
   override val view: RiveReactNativeView = RiveReactNativeView(context)
   private var needsReload = false
+  private var registeredFile: HybridRiveFile? = null
   //endregion
 
   //region View Props
@@ -46,6 +47,10 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
     }
   override var file: HybridRiveFileSpec = HybridRiveFile()
     set(value) {
+      if (field != value) {
+        registeredFile?.unregisterView(this)
+        registeredFile = null
+      }
       changed(field, value) { field = it }
     }
   override var alignment: Alignment? = null
@@ -99,8 +104,13 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
   //endregion
 
   //region Update
+  fun refreshAfterAssetChange() {
+    afterUpdate()
+  }
+
   override fun afterUpdate() {
-    val riveFile = (file as? HybridRiveFile)?.riveFile ?: return
+    val hybridFile = file as? HybridRiveFile
+    val riveFile = hybridFile?.riveFile ?: return
 
     val config = ViewConfiguration(
       artboardName = artboardName,
@@ -113,6 +123,12 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
       layoutScaleFactor = layoutScaleFactor?.toFloat() ?: DefaultConfiguration.LAYOUTSCALEFACTOR,
     )
     view.configure(config, needsReload)
+
+    if (needsReload && hybridFile != null) {
+      hybridFile.registerView(this)
+      registeredFile = hybridFile
+    }
+
     needsReload = false
     super.afterUpdate()
   }

android/src/main/java/com/margelo/nitro/rive/ReferencedAssetLoader.kt

@@ -8,6 +8,8 @@ import android.util.Log
 import app.rive.runtime.kotlin.core.*
 import com.margelo.nitro.NitroModules
 import kotlinx.coroutines.*
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Deferred
 import java.io.File as JavaFile
 import java.io.IOException
 import java.net.URI
@@ -61,9 +63,10 @@ class ReferencedAssetLoader {
     }
   }
 
-  private fun downloadUrlAsset(url: String, listener: (ByteArray) -> Unit) {
+  private fun downloadUrlAsset(url: String, listener: (ByteArray?) -> Unit) {
     if (!isValidUrl(url)) {
       logError("Invalid URL: $url")
+      listener(null)
       return
     }
 
@@ -86,6 +89,9 @@ class ReferencedAssetLoader {
           }
           else -> {
             logError("Unsupported URL scheme: ${uri.scheme}")
+            withContext(Dispatchers.Main) {
+              listener(null)
+            }
             return@launch
           }
         }
@@ -95,14 +101,17 @@ class ReferencedAssetLoader {
         }
       } catch (e: Exception) {
         logError("Unable to download asset from URL: $url - ${e.message}")
+        withContext(Dispatchers.Main) {
+          listener(null)
+        }
       }
     }
   }
 
   private fun loadResourceAsset(
     sourceAssetId: String,
     context: Context,
-    listener: (ByteArray) -> Unit
+    listener: (ByteArray?) -> Unit
   ) {
     scope.launch {
       try {
@@ -124,13 +133,25 @@ class ReferencedAssetLoader {
           }
         } else {
           logError("Resource not found: $sourceAssetId")
+          withContext(Dispatchers.Main) {
+            listener(null)
+          }
         }
       } catch (e: IOException) {
         logError("IO Exception while reading resource: $sourceAssetId - ${e.message}")
+        withContext(Dispatchers.Main) {
+          listener(null)
+        }
       } catch (e: Resources.NotFoundException) {
         logError("Resource not found: $sourceAssetId - ${e.message}")
+        withContext(Dispatchers.Main) {
+          listener(null)
+        }
       } catch (e: Exception) {
         logError("Unexpected error while processing resource: $sourceAssetId - ${e.message}")
+        withContext(Dispatchers.Main) {
+          listener(null)
+        }
       }
     }
   }
@@ -139,20 +160,21 @@ class ReferencedAssetLoader {
     sourceAsset: String,
     path: String?,
     context: Context,
-    listener: (ByteArray) -> Unit
+    listener: (ByteArray?) -> Unit
   ) {
     scope.launch {
       try {
         val fullPath = if (path == null) sourceAsset else constructFilePath(sourceAsset, path)
         val bytes = readAssetBytes(context, fullPath)
 
-        if (bytes != null) {
-          withContext(Dispatchers.Main) {
-            listener(bytes)
-          }
+        withContext(Dispatchers.Main) {
+          listener(bytes)
         }
       } catch (e: Exception) {
         logError("Error loading bundled asset: $sourceAsset - ${e.message}")
+        withContext(Dispatchers.Main) {
+          listener(null)
+        }
       }
     }
   }
@@ -165,9 +187,13 @@ class ReferencedAssetLoader {
     }
   }
 
-  private fun loadAsset(assetData: ResolvedReferencedAsset, asset: FileAsset, context: Context) {
-    val listener: (ByteArray) -> Unit = { bytes ->
-      processAssetBytes(bytes, asset)
+  private fun loadAsset(assetData: ResolvedReferencedAsset, asset: FileAsset, context: Context): Deferred<Unit> {
+    val deferred = CompletableDeferred<Unit>()
+    val listener: (ByteArray?) -> Unit = { bytes ->
+      if (bytes != null) {
+        processAssetBytes(bytes, asset)
+      }
+      deferred.complete(Unit)
     }
 
     when {
@@ -180,11 +206,16 @@ class ReferencedAssetLoader {
       assetData.sourceAsset != null -> {
         loadBundledAsset(assetData.sourceAsset, assetData.path, context, listener)
       }
+      else -> {
+        deferred.complete(Unit)
+      }
     }
+
+    return deferred
   }
 
-  fun updateAsset(assetData: ResolvedReferencedAsset, asset: FileAsset, context: Context) {
-    loadAsset(assetData, asset, context)
+  fun updateAsset(assetData: ResolvedReferencedAsset, asset: FileAsset, context: Context): Deferred<Unit> {
+    return loadAsset(assetData, asset, context)
   }
 
   fun createCustomLoader(

rn82-example

@@ -0,0 +1 @@
+Subproject commit 032eeda50ad5a29c0c723babb906d9e0339487a8