Merge pull request #402 from modelix/fix/deprecated-light-model-server-websocket-endpoint

fix(model-server): restore WebSocket endpoint /json/{repositoryId}/ws

Author: Oleksandr Dzhychko

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

@@ -163,7 +163,7 @@ class DeprecatedLightModelServer(val client: LocalModelClient) {
             val oldVersion = CLVersion.loadFromHash(versionHash, getStore())
             respondVersion(version, oldVersion)
         }
-        webSocket("/{repositoryId}/ws") {
+        webSocket("/json/{repositoryId}/ws") {
             val repositoryId = RepositoryId(call.parameters["repositoryId"]!!)
             val userId = call.getUserName()
 

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

@@ -14,6 +14,7 @@
 
 package org.modelix.model.server
 
+import io.ktor.client.plugins.websocket.webSocketSession
 import io.ktor.client.request.get
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
@@ -40,6 +41,7 @@ import org.modelix.model.server.store.LocalModelClient
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
+import kotlin.test.fail
 
 class JsonAPITest {
     private fun runTest(block: suspend ApplicationTestBuilder.() -> Unit) = testApplication {
@@ -61,6 +63,18 @@ class JsonAPITest {
         assertEmptyVersion(JSONObject(response.bodyAsText()))
     }
 
+    @Test
+    fun connectToWebsocket() = runTest {
+        val client = createClient {
+            install(io.ktor.client.plugins.websocket.WebSockets)
+        }
+        try {
+            client.webSocketSession("ws://localhost/json/$repoId/ws")
+        } catch (e: Exception) {
+            fail("Could not connect to WebSocket", e)
+        }
+    }
+
     private fun assertEmptyVersion(json: JSONObject) {
         assertEquals(json.getJSONObject("root").getString("nodeId").toLong(), 1L)
         assertEquals(json.getString("repositoryId"), repoId)