make document wait for its initialization

yorkie-team · May 28, 2024 · 286eca6 · 286eca6
1 parent 9f86bbf
commit 286eca6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/yorkie/src/androidTest/kotlin/dev/yorkie/core/TestUtils.kt b/yorkie/src/androidTest/kotlin/dev/yorkie/core/TestUtils.kt
@@ -12,7 +12,7 @@ const val GENERAL_TIMEOUT = 3_000L
 fun createClient() = Client(
     "http://10.0.2.2:8080",
     unaryClient = OkHttpClient.Builder()
-        .protocols(listOf(Protocol.H2_PRIOR_KNOWLEDGE))
+        .protocols(listOf(Protocol.HTTP_1_1))
         .build(),
 )
 

diff --git a/yorkie/src/main/kotlin/dev/yorkie/core/Client.kt b/yorkie/src/main/kotlin/dev/yorkie/core/Client.kt
@@ -597,9 +597,10 @@ public class Client @VisibleForTesting internal constructor(
     }
 
     private suspend fun waitForInitialization(documentKey: Document.Key) {
-        val attachment = attachments.value[documentKey] ?: return
-        if (attachment.syncMode == SyncMode.Realtime) {
-            attachment.document.presences.first { it != UninitializedPresences }
+        val attachment = attachments.first { documentKey in it.keys }[documentKey] ?: return
+        attachment.document.presences.first { it != UninitializedPresences }
+        if (attachment.syncMode != SyncMode.Manual) {
+            attachment.document.events.first { it is Initialized }
         }
     }