fix(model-server): the new API at /v2/ wasn't initialized

Author: slisson

model-server/src/main/kotlin/org/modelix/model/server/Main.kt

@@ -42,6 +42,8 @@ import org.modelix.authorization.installAuthentication
 import org.modelix.model.server.handlers.HistoryHandler
 import org.modelix.model.server.handlers.DeprecatedLightModelServer
 import org.modelix.model.server.handlers.KeyValueLikeModelServer
+import org.modelix.model.server.handlers.ModelReplicationServer
+import org.modelix.model.server.handlers.RepositoriesManager
 import org.modelix.model.server.store.IStoreClient
 import org.modelix.model.server.store.IgniteStoreClient
 import org.modelix.model.server.store.InMemoryStoreClient
@@ -132,6 +134,8 @@ object Main {
 
             val historyHandler = HistoryHandler(localModelClient)
             val jsonModelServer = DeprecatedLightModelServer(localModelClient)
+            val repositoriesManager = RepositoriesManager(localModelClient)
+            val modelReplicationServer = ModelReplicationServer(repositoriesManager)
             val ktorServer: NettyApplicationEngine = embeddedServer(Netty, port = port) {
                 install(Routing)
                 installAuthentication(unitTestMode = !KeycloakUtils.isEnabled())
@@ -152,6 +156,7 @@ object Main {
                 modelServer.init(this)
                 historyHandler.init(this)
                 jsonModelServer.init(this)
+                modelReplicationServer.init(this)
                 routing {
                     get("/") {
                         call.respondHtml {

model-server/src/main/kotlin/org/modelix/model/server/handlers/ModelReplicationServer.kt

@@ -53,7 +53,10 @@ private fun toLong(value: String?): Long {
  * client sends. This allows more validations and more responsibilities on the server side.
  */
 @OptIn(ExperimentalSerializationApi::class)
-class ModelReplicationServer(val storeClient: IStoreClient) {
+class ModelReplicationServer(val repositoriesManager: RepositoriesManager) {
+    constructor(modelClient: LocalModelClient) : this(RepositoriesManager(modelClient))
+    constructor(storeClient: IStoreClient) : this(LocalModelClient(storeClient))
+
     companion object {
         private val LOG = LoggerFactory.getLogger(ModelReplicationServer::class.java)
 
@@ -62,13 +65,12 @@ class ModelReplicationServer(val storeClient: IStoreClient) {
         }
     }
 
-    private val modelClient: LocalModelClient = LocalModelClient(storeClient)
-    private val repositoriesManager = RepositoriesManager(modelClient)
+    private val modelClient: LocalModelClient get() = repositoriesManager.client
+    private val storeClient: IStoreClient get() = modelClient.store
 
     fun init(application: Application) {
         KeyValueLikeModelServer.initServerId(storeClient)
         application.apply {
-            install(WebSockets)
             routing {
                 route("v2") {
                     installHandlers()
@@ -85,7 +87,7 @@ class ModelReplicationServer(val storeClient: IStoreClient) {
             call.respondText(KeyValueLikeModelServer.getServerId(storeClient))
         }
         get("user-id") {
-            call.respondText(call.getUserName() ?: "")
+            call.respondText(call.getUserName() ?: call.request.origin.remoteHost)
         }
         route("repositories") {
             get {

model-server/src/test/kotlin/org/modelix/model/server/ModelClientV2_Test.kt

@@ -19,29 +19,20 @@ import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*
 import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.testing.*
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.withTimeout
-import org.junit.Assert
+import io.ktor.server.websocket.*
 import org.junit.Test
 import org.modelix.authorization.installAuthentication
-import org.modelix.model.IKeyListener
 import org.modelix.model.api.IConceptReference
 import org.modelix.model.api.ITree
 import org.modelix.model.api.PBranch
-import org.modelix.model.api.PNodeAdapter
-import org.modelix.model.client.RestWebModelClient
 import org.modelix.model.client2.ModelClientV2
 import org.modelix.model.lazy.CLTree
 import org.modelix.model.lazy.CLVersion
 import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.operations.OTBranch
-import org.modelix.model.server.handlers.KeyValueLikeModelServer
 import org.modelix.model.server.handlers.ModelReplicationServer
 import org.modelix.model.server.store.InMemoryStoreClient
-import java.util.*
 import kotlin.test.assertEquals
-import kotlin.test.fail
-import kotlin.time.Duration.Companion.seconds
 
 class ModelClientV2_Test {
 
@@ -51,6 +42,7 @@ class ModelClientV2_Test {
             install(ContentNegotiation) {
                 json()
             }
+            install(WebSockets)
             ModelReplicationServer(InMemoryStoreClient()).init(this)
         }
         block()

model-server/src/test/kotlin/org/modelix/model/server/ReplicatedRepositoryTest.kt

@@ -19,6 +19,7 @@ import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*
 import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.testing.*
+import io.ktor.server.websocket.*
 import kotlinx.coroutines.delay
 import org.junit.Test
 import org.modelix.authorization.installAuthentication
@@ -47,6 +48,7 @@ class ReplicatedRepositoryTest {
             install(ContentNegotiation) {
                 json()
             }
+            install(WebSockets)
             ModelReplicationServer(InMemoryStoreClient()).init(this)
         }
         block()