Batch query

library/build.gradle

@@ -79,7 +79,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
     implementation 'org.web3j:crypto:5.0.0'
     api 'com.google.protobuf:protobuf-kotlin-lite:3.22.3'
-    api 'org.xmtp:proto-kotlin:3.23.2'
+    api 'org.xmtp:proto-kotlin:3.24.1'
 
     testImplementation 'app.cash.turbine:turbine:0.12.1'
     testImplementation 'junit:junit:4.13.2'

library/src/main/java/org/xmtp/android/library/ApiClient.kt

@@ -10,6 +10,8 @@ import org.xmtp.android.library.messages.Pagination
 import org.xmtp.android.library.messages.Topic
 import org.xmtp.proto.message.api.v1.MessageApiGrpcKt
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass
+import org.xmtp.proto.message.api.v1.MessageApiOuterClass.BatchQueryRequest
+import org.xmtp.proto.message.api.v1.MessageApiOuterClass.BatchQueryResponse
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass.Cursor
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass.Envelope
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass.PublishRequest
@@ -29,6 +31,7 @@ interface ApiClient {
     ): QueryResponse
 
     suspend fun queryTopic(topic: Topic, pagination: Pagination? = null): QueryResponse
+    suspend fun batchQuery(topics: List<String>, pagination: Pagination? = null): BatchQueryResponse
     suspend fun envelopes(topic: String, pagination: Pagination? = null): List<Envelope>
     suspend fun publish(envelopes: List<Envelope>): PublishResponse
     suspend fun subscribe(topics: List<String>): Flow<Envelope>
@@ -126,6 +129,46 @@ data class GRPCApiClient(override val environment: XMTPEnvironment, val secure:
         return query(topic.description, pagination)
     }
 
+    override suspend fun batchQuery(
+        topics: List<String>,
+        pagination: Pagination?,
+    ): BatchQueryResponse {
+        val requests = topics.map { topic ->
+            QueryRequest.newBuilder()
+                .addContentTopics(topic).also {
+                    if (pagination != null) {
+                        it.pagingInfo = pagination.pagingInfo
+                    }
+                    if (pagination?.startTime != null) {
+                        it.endTimeNs = pagination.startTime.time * 1_000_000
+                        it.pagingInfo = it.pagingInfo.toBuilder().also { info ->
+                            info.direction =
+                                MessageApiOuterClass.SortDirection.SORT_DIRECTION_DESCENDING
+                        }.build()
+                    }
+                    if (pagination?.endTime != null) {
+                        it.startTimeNs = pagination.endTime.time * 1_000_000
+                        it.pagingInfo = it.pagingInfo.toBuilder().also { info ->
+                            info.direction =
+                                MessageApiOuterClass.SortDirection.SORT_DIRECTION_DESCENDING
+                        }.build()
+                    }
+                }.build()
+        }
+
+        val batchRequest = BatchQueryRequest.newBuilder().addAllRequests(requests).build()
+        val headers = Metadata()
+
+        authToken?.let { token ->
+            headers.put(AUTHORIZATION_HEADER_KEY, "Bearer $token")
+        }
+        headers.put(CLIENT_VERSION_HEADER_KEY, Constants.VERSION)
+        if (appVersion != null) {
+            headers.put(APP_VERSION_HEADER_KEY, appVersion)
+        }
+        return client.batchQuery(batchRequest, headers = headers)
+    }
+
     override suspend fun publish(envelopes: List<Envelope>): PublishResponse {
         val request = PublishRequest.newBuilder().addAllEnvelopes(envelopes).build()
         val headers = Metadata()

library/src/main/java/org/xmtp/android/library/Client.kt

@@ -32,6 +32,7 @@ import org.xmtp.android.library.messages.toPublicKeyBundle
 import org.xmtp.android.library.messages.toV2
 import org.xmtp.android.library.messages.walletAddress
 import org.xmtp.proto.message.api.v1.MessageApiOuterClass
+import org.xmtp.proto.message.api.v1.MessageApiOuterClass.BatchQueryResponse
 import java.nio.charset.StandardCharsets
 import java.text.SimpleDateFormat
 import java.time.Instant
@@ -240,6 +241,10 @@ class Client() {
         return apiClient.queryTopic(topic = topic, pagination = pagination)
     }
 
+    suspend fun batchQuery(topics: List<Topic>, pagination: Pagination? = null): BatchQueryResponse {
+        return apiClient.batchQuery(topics = topics.map { it.description }, pagination = pagination)
+    }
+
     suspend fun subscribe(topics: List<String>): Flow<Envelope> {
         return apiClient.subscribe(topics = topics)
     }