Add Kotlin WebSocket schema message sugar

This commit is contained in:
Meta Vens 2026-06-16 11:41:32 +01:00
commit 49a5a2ae30
3 changed files with 34 additions and 10 deletions

View file

@ -181,7 +181,9 @@ Current progress:
- Kotlin now has a `websocket` transport profile helper plus
`CultNetWebSocketTransportConnection`, which wraps the older binary
WebSocket client behind the same `CultNetTransportFrame` and stats shape for
reliable ordered `schema` frames.
reliable ordered `schema` frames. The adapter now also has `sendSchemaMessage`
and `receiveSchemaMessage` sugar so JVM callers can exchange schema-v0
MessagePack messages without hand-parsing transport frames.
- TypeScript, C#, Rust, Python, and Kotlin now share the first
`cultnet.transport.rudp.v0` packet codec fixture: the same reliable ordered
fragmented data packet encodes to the same bytes in every runtime. This is not

View file

@ -82,11 +82,18 @@ val transport = CultMesh.startNode().connectTransport(URI("ws://127.0.0.1:3075/m
transport.sendSchema(cultNetSchemaCatalogRequest(messageId = "schemas").toBytes())
val frame = transport.receive()
check(frame?.channelId == "schema")
// Or stay at the schema-message level.
transport.sendSchemaMessage(cultNetSchemaCatalogRequest(messageId = "schemas"))
val message = transport.receiveSchemaMessage()
check(message?.schemaVersion == "cultnet.schema_catalog_response.v0")
```
The WebSocket adapter advertises a `websocket` transport profile with one
reliable ordered `schema` channel and exposes transfer stats. It is the stream
adapter; RUDP remains the portable realtime UDP path.
reliable ordered `schema` channel and exposes transfer stats. `sendSchema`,
`sendSchemaMessage`, `receiveSchema`, and `receiveSchemaMessage` keep the
schema lane at the same ergonomic level as RUDP. It is the stream adapter; RUDP
remains the portable realtime UDP path.
Schema catalogs are also first-class, so Kotlin peers can publish and consume
descriptor responses instead of hand-assembling maps:

View file

@ -2918,9 +2918,17 @@ private fun cultNetWebSocketTransportCarriesSchemaFramesWithStats() {
).toByteArray(StandardCharsets.US_ASCII),
)
output.flush()
val request = readMaskedWebSocketBinaryPayload(input)
check(String(request, StandardCharsets.UTF_8) == "client-state")
writeUnmaskedWebSocketBinaryPayload(output, "server-state".toByteArray(StandardCharsets.UTF_8))
val request = parseCultNetMessage(readMaskedWebSocketBinaryPayload(input))
check(request.schemaVersion == "cultnet.schema_catalog_request.v0")
writeUnmaskedWebSocketBinaryPayload(
output,
cultNetHello(
runtimeId = "kotlin-websocket-server",
runtimeKind = "kotlin",
displayName = "Kotlin WebSocket Server",
supportedMessageVersions = listOf("cultnet.hello.v0"),
).toBytes(),
)
}
} catch (error: Throwable) {
serverError = error
@ -2937,10 +2945,11 @@ private fun cultNetWebSocketTransportCarriesSchemaFramesWithStats() {
check(descriptor.protocol == "websocket")
check(descriptor.channels == listOf(CultNetTransportChannel("schema", "reliable", "ordered")))
transport.sendSchema("client-state")
val response = transport.receive() ?: error("WebSocket transport did not receive schema frame")
check(response.channelId == "schema")
check(String(response.payload, StandardCharsets.UTF_8) == "server-state")
transport.sendSchemaMessage(cultNetSchemaCatalogRequest(messageId = "websocket-schema"))
val response = transport.receiveSchemaMessage()
?: error("WebSocket transport did not receive schema message")
check(response.schemaVersion == "cultnet.hello.v0")
check(response.body["runtimeId"] == "kotlin-websocket-server")
check(transport.stats.framesSent == 1L)
check(transport.stats.framesReceived == 1L)
}
@ -3960,6 +3969,8 @@ class CultNetWebSocketTransportConnection(
fun sendSchema(payload: String) = sendSchema(payload.toByteArray(StandardCharsets.UTF_8))
fun sendSchemaMessage(message: CultNetMessage) = sendSchema(message.toBytes())
fun receive(): CultNetTransportFrame? {
val frame = client.readFrame()
if (frame.opcode != 2) return null
@ -3967,6 +3978,10 @@ class CultNetWebSocketTransportConnection(
return CultNetTransportFrame("schema", frame.payload)
}
fun receiveSchema(): ByteArray? = receive()?.takeIf { it.channelId == "schema" }?.payload
fun receiveSchemaMessage(): CultNetMessage? = receiveSchema()?.let { parseCultNetMessage(it) }
override fun close() {
client.close()
}