feat(model-client): list branches with version hashes

Author: abstraktor

model-client/src/commonMain/kotlin/org/modelix/model/client2/IModelClientV2.kt

@@ -11,6 +11,7 @@ import org.modelix.model.api.INode
 import org.modelix.model.async.IAsyncObjectStore
 import org.modelix.model.lazy.BranchReference
 import org.modelix.model.lazy.RepositoryId
+import org.modelix.model.server.api.BranchInfo
 import org.modelix.model.server.api.RepositoryConfig
 import org.modelix.modelql.core.IMonoStep
 
@@ -54,6 +55,7 @@ interface IModelClientV2 {
     suspend fun listRepositories(): List<RepositoryId>
     suspend fun deleteRepository(repository: RepositoryId): Boolean
     suspend fun listBranches(repository: RepositoryId): List<BranchReference>
+    suspend fun listBranchesWithHashes(repository: RepositoryId): List<BranchInfo>
 
     /**
      * Deletes a branch from a repository if it exists.

model-client/src/commonMain/kotlin/org/modelix/model/client2/ModelClientV2.kt

@@ -8,8 +8,10 @@ import io.ktor.client.plugins.HttpRequestRetry
 import io.ktor.client.plugins.HttpTimeout
 import io.ktor.client.plugins.ResponseException
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.contentnegotiation.exclude
 import io.ktor.client.plugins.expectSuccess
 import io.ktor.client.request.HttpRequestBuilder
+import io.ktor.client.request.accept
 import io.ktor.client.request.delete
 import io.ktor.client.request.get
 import io.ktor.client.request.post
@@ -84,6 +86,7 @@ import org.modelix.model.oauth.TokenProviderAuthConfig
 import org.modelix.model.operations.OTBranch
 import org.modelix.model.persistent.CPVersion
 import org.modelix.model.persistent.HashUtil
+import org.modelix.model.server.api.BranchInfo
 import org.modelix.model.server.api.RepositoryConfig
 import org.modelix.model.server.api.v2.ImmutableObjectsStream
 import org.modelix.model.server.api.v2.ObjectHashAndSerializedObject
@@ -284,13 +287,25 @@ class ModelClientV2(
 
     override suspend fun listBranches(repository: RepositoryId): List<BranchReference> {
         return httpClient.get {
+            // only accept text/plain, not application/json
+            accept(ContentType.Text.Plain)
+            exclude(ContentType.Application.Json)
             url {
                 takeFrom(baseUrl)
                 appendPathSegmentsEncodingSlash("repositories", repository.id, "branches")
             }
         }.bodyAsText().lines().filter { it.isNotEmpty() }.map { repository.getBranchReference(it) }
     }
 
+    override suspend fun listBranchesWithHashes(repository: RepositoryId): List<BranchInfo> {
+        return httpClient.get {
+            url {
+                takeFrom(baseUrl)
+                appendPathSegmentsEncodingSlash("repositories", repository.id, "branches")
+            }
+        }.body()
+    }
+
     override suspend fun deleteBranch(branch: BranchReference): Boolean {
         try {
             return httpClient.delete {

model-client/src/jsMain/kotlin/org/modelix/model/client2/ClientJS.kt

@@ -29,6 +29,7 @@ import org.modelix.model.mutable.asMutableThreadSafe
 import org.modelix.model.mutable.load
 import org.modelix.model.mutable.withAutoTransactions
 import org.modelix.model.persistent.MapBasedStore
+import org.modelix.model.server.api.BranchInfo
 import org.modelix.mps.multiplatform.model.MPSIdGenerator
 import kotlin.js.Date
 import kotlin.js.Promise
@@ -140,6 +141,15 @@ interface ClientJS {
      */
     fun fetchBranches(repositoryId: String): Promise<Array<String>>
 
+    /**
+     * Fetch existing branches for a given repository from the model server.
+     *
+     * @param repositoryId Repository ID to fetch branches from.
+     */
+    fun fetchBranchesWithHashes(
+        repositoryId: String,
+    ): Promise<Array<BranchInfo>>
+
     fun createBranch(repositoryId: String, branchId: String, versionHash: String, failIfExists: Boolean = false): Promise<Boolean>
 
     /**
@@ -192,6 +202,12 @@ internal class ClientJSImpl(private val modelClient: ModelClientV2) : ClientJS {
         }
     }
 
+    override fun fetchBranchesWithHashes(
+        repositoryId: String,
+    ): Promise<Array<BranchInfo>> = GlobalScope.promise {
+        return@promise modelClient.listBranchesWithHashes(RepositoryId(repositoryId)).toTypedArray()
+    }
+
     override fun createBranch(
         repositoryId: String,
         branchId: String,