Await Depednecy Resolve process until ChatClient is properly initialized

GetStream · Dec 12, 2024 · bbeee84 · bbeee84
1 parent 9cf8391
commit bbeee84
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt
@@ -147,6 +147,7 @@ import io.getstream.chat.android.client.utils.observable.Disposable
 import io.getstream.chat.android.client.utils.retry.NoRetryPolicy
 import io.getstream.chat.android.client.utils.stringify
 import io.getstream.chat.android.core.internal.InternalStreamChatApi
+import io.getstream.chat.android.core.internal.StreamHandsOff
 import io.getstream.chat.android.models.AppSettings
 import io.getstream.chat.android.models.Attachment
 import io.getstream.chat.android.models.BannedUser
@@ -355,7 +356,7 @@ internal constructor(
     @Suppress("ThrowsCount")
     internal inline fun <reified P : DependencyResolver, reified T : Any> resolvePluginDependency(): T {
         StreamLog.v(TAG) { "[resolvePluginDependency] P: ${P::class.simpleName}, T: ${T::class.simpleName}" }
-        val initState = clientState.initializationState.value
+        val initState = awaitInitializationState(RESOLVE_DEPENDENCY_TIMEOUT)
         if (initState != InitializationState.COMPLETE) {
             StreamLog.e(TAG) { "[resolvePluginDependency] failed (initializationState is not COMPLETE): $initState " }
             throw IllegalStateException("ChatClient::connectUser() must be called before resolving any dependency")
@@ -371,6 +372,26 @@ internal constructor(
             )
     }
 
+    @PublishedApi
+    @InternalStreamChatApi
+    @StreamHandsOff(
+        "This method is used to avoid race-condition between plugin initialization and dependency resolution."
+    )
+    internal fun awaitInitializationState(timeoutMilliseconds: Long): InitializationState? {
+        var initState: InitializationState? = clientState.initializationState.value
+        var spendTime = 0L
+        inheritScope { Job(it) }.launch {
+            initState = withTimeoutOrNull(timeoutMilliseconds) {
+                clientState.initializationState.first { it == InitializationState.COMPLETE }
+            }
+        }
+        while (initState == InitializationState.INITIALIZING && spendTime < timeoutMilliseconds) {
+            java.lang.Thread.sleep(INITIALIZATION_DELAY)
+            spendTime += INITIALIZATION_DELAY
+        }
+        return initState
+    }
+
     /**
      * Error handlers for API calls.
      */
@@ -3888,6 +3909,7 @@ internal constructor(
         private const val MESSAGE_ACTION_SHUFFLE = "shuffle"
         private val THIRTY_DAYS_IN_MILLISECONDS = 30.days.inWholeMilliseconds
         private const val INITIALIZATION_DELAY = 100L
+        public const val RESOLVE_DEPENDENCY_TIMEOUT: Long = 10_000L
 
         private const val ARG_TYPING_PARENT_ID = "parent_id"