refactor(audio-rooms): NestsClient API matches nostrnests reality (phase 2/3)

The Phase-1 interop harness exposed a substantial mismatch between our production HTTP client and what the nostrnests reference server actually exposes. This commit refactors `:nestsClient` and the wiring above it so the production code path can talk to a real moq-auth + moq-relay. | Aspect | Before | After (matches nostrnests/moq-auth/src/index.ts) | |-----------|-------------------------------------------|--------------------------------------------------| | Method | GET | POST | | URL | `<base>/<roomId>` | `<base>/auth` | | Body | none | `{"namespace":"nests/<kind>:<host>:<roomId>","publish":bool}` | | Response | `{endpoint, token, codec, sample_rate}` | `{token}` only | | Endpoint | from response | from event's `endpoint` tag (passed via `NestsRoomConfig.endpoint`) | | NIP-98 | bound to GET URL | bound to POST URL + body hash | Type changes: - New `NestsRoomConfig` data class bundling (authBaseUrl, endpoint, hostPubkey, roomId, kind). Built by the caller (UI / VM) from the NIP-53 kind 30312 event before invoking connectNests*. - `NestsRoomConfig.moqNamespace()` produces the exact format moq-auth's NAMESPACE_REGEX expects: `nests/<kind>:<hex64>:<roomId>`. - `NestsRoomInfo` deleted; replaced with a tiny `NestsTokenResponse(token)` matching the real response shape. - `NestsClient.resolveRoom(serviceBase, roomId, signer): NestsRoomInfo` → `NestsClient.mintToken(room, publish, signer): String`. The publish flag drives the JWT claims (`get` for listeners, `put` for speakers). Wire path: - `OkHttpNestsClient` now POSTs `<authBase>/auth` with a JSON body and a NIP-98 Authorization header bound to (POST, url, body-hash). - `connectNestsListener` / `connectNestsSpeaker` take `room: NestsRoomConfig` instead of split (serviceBase, roomId), pass `publish=false` / `publish=true` respectively, and use the room's `endpoint` (not a server-returned one) for the WebTransport connect. The minted JWT is the bearer token. - `NestsListenerState.Connected` / `NestsSpeakerState.Connected` / `Broadcasting` carry the `room: NestsRoomConfig` instead of the old `roomInfo: NestsRoomInfo`. - MoQ TrackNamespace for the room is now a single segment whose bytes are `room.moqNamespace()` — the simplest mapping to the relay's JWT claim check (`root: "<namespace>"`); Phase-3 round-trip test will confirm and adjust if the relay expects a multi-segment tuple. Wiring above: - `AudioRoomViewModel` constructor: replaces `(serviceBase, roomId)` with `(room: NestsRoomConfig)`. Connector seam interfaces (NestsListenerConnector, NestsSpeakerConnector) follow the same shape. - `AudioRoomViewModelFactory` (Android) takes `room: NestsRoomConfig`. - `AudioRoomActivity` adds `EXTRA_AUTH_BASE_URL`, `EXTRA_ENDPOINT`, `EXTRA_HOST_PUBKEY`, `EXTRA_KIND` Intent extras (was just service + roomId) and reconstructs `NestsRoomConfig` in onCreate. Drops `EXTRA_SERVICE_BASE`. - `AudioRoomJoinCard` reads `event.endpoint()` + `event.pubKey` + `event.kind` in addition to `event.service()`; rooms missing any of those are silently un-joinable (the event author didn't host on a nests-compatible relay). - `AudioRoomActivityContent` takes `room: NestsRoomConfig` in place of (serviceBase, roomId) and threads it down. Phase-1 ping test rewired to use the production `OkHttpNestsClient` end-to-end against the real `/auth`, asserting we get back a 3-segment JWT. Existing in-process tests updated for the new types: NestsConnectTest, NestsSpeakerTest, AudioRoomViewModelTest. NestsRoomInfoTest renamed to NestsRoomConfigTest with new cases for the namespace formatter and the auth-URL helper. All 80 in-process tests still green. Phase 3 (next) will add the full round-trip interop test that runs production `connectNestsListener` + `connectNestsSpeaker` through the real moq-relay — that's where MoQ wire-format assumptions (draft revision, OBJECT_DATAGRAM layout, namespace tuple shape) get verified or get followup audit findings.
2026-04-26 14:42:26 +00:00
parent 3283d302fa
commit beec8204e5
17 changed files with 353 additions and 318 deletions
@@ -28,6 +28,7 @@ import com.vitorpamplona.nestsclient.BroadcastHandle
 import com.vitorpamplona.nestsclient.NestsClient
 import com.vitorpamplona.nestsclient.NestsListener
 import com.vitorpamplona.nestsclient.NestsListenerState
+import com.vitorpamplona.nestsclient.NestsRoomConfig
 import com.vitorpamplona.nestsclient.NestsSpeaker
 import com.vitorpamplona.nestsclient.NestsSpeakerState
 import com.vitorpamplona.nestsclient.audio.AudioCapture
@@ -95,8 +96,7 @@ class AudioRoomViewModel(
    private val decoderFactory: () -> OpusDecoder,
    private val playerFactory: () -> AudioPlayer,
    private val signer: NostrSigner,
-    private val serviceBase: String,
-    private val roomId: String,
+    private val room: NestsRoomConfig,
    // Speaker-side audio capture/encode actuals. Optional — desktop and
    // listener-only callers pass null and the speaker UI hides the talk
    // button. Android passes `{ AudioRecordCapture() }` /
@@ -240,8 +240,7 @@ class AudioRoomViewModel(
                            httpClient = httpClient,
                            transport = transport,
                            scope = viewModelScope,
-                            serviceBase = serviceBase,
-                            roomId = roomId,
+                            room = room,
                            signer = signer,
                            speakerPubkeyHex = speakerPubkeyHex,
                            captureFactory = captureFactory!!,
@@ -486,8 +485,7 @@ class AudioRoomViewModel(
                            httpClient = httpClient,
                            transport = transport,
                            scope = viewModelScope,
-                            serviceBase = serviceBase,
-                            roomId = roomId,
+                            room = room,
                            signer = signer,
                        )
                    if (closed) {
@@ -844,20 +842,18 @@ fun interface NestsListenerConnector {
        httpClient: NestsClient,
        transport: WebTransportFactory,
        scope: CoroutineScope,
-        serviceBase: String,
-        roomId: String,
+        room: NestsRoomConfig,
        signer: NostrSigner,
    ): NestsListener
 }

 private val DefaultNestsListenerConnector =
-    NestsListenerConnector { httpClient, transport, scope, serviceBase, roomId, signer ->
+    NestsListenerConnector { httpClient, transport, scope, room, signer ->
        connectNestsListener(
            httpClient = httpClient,
            transport = transport,
            scope = scope,
-            serviceBase = serviceBase,
-            roomId = roomId,
+            room = room,
            signer = signer,
        )
    }
@@ -868,8 +864,7 @@ fun interface NestsSpeakerConnector {
        httpClient: NestsClient,
        transport: WebTransportFactory,
        scope: CoroutineScope,
-        serviceBase: String,
-        roomId: String,
+        room: NestsRoomConfig,
        signer: NostrSigner,
        speakerPubkeyHex: String,
        captureFactory: () -> AudioCapture,
@@ -878,13 +873,12 @@ fun interface NestsSpeakerConnector {
 }

 private val DefaultNestsSpeakerConnector =
-    NestsSpeakerConnector { httpClient, transport, scope, serviceBase, roomId, signer, pubkey, capF, encF ->
+    NestsSpeakerConnector { httpClient, transport, scope, room, signer, pubkey, capF, encF ->
        connectNestsSpeaker(
            httpClient = httpClient,
            transport = transport,
            scope = scope,
-            serviceBase = serviceBase,
-            roomId = roomId,
+            room = room,
            signer = signer,
            speakerPubkeyHex = pubkey,
            captureFactory = capF,
@@ -24,7 +24,7 @@ import com.vitorpamplona.nestsclient.NestsClient
 import com.vitorpamplona.nestsclient.NestsException
 import com.vitorpamplona.nestsclient.NestsListener
 import com.vitorpamplona.nestsclient.NestsListenerState
-import com.vitorpamplona.nestsclient.NestsRoomInfo
+import com.vitorpamplona.nestsclient.NestsRoomConfig
 import com.vitorpamplona.nestsclient.audio.AudioPlayer
 import com.vitorpamplona.nestsclient.audio.OpusDecoder
 import com.vitorpamplona.nestsclient.moq.SubscribeHandle
@@ -93,7 +93,7 @@ class AudioRoomViewModelTest {

            // Connector resolves with the listener; it's still Idle until we
            // emit something. Drive it Connected directly.
-            fakeListener.emit(NestsListenerState.Connected(roomInfo = ROOM_INFO, negotiatedMoqVersion = 0xff000011))
+            fakeListener.emit(NestsListenerState.Connected(room = ROOM_CONFIG, negotiatedMoqVersion = 0xff000011))

            assertEquals(ConnectionUiState.Connected, vm.uiState.value.connection)
        }
@@ -161,7 +161,7 @@ class AudioRoomViewModelTest {
            val vm = newViewModel { fakeListener }

            vm.connect()
-            fakeListener.emit(NestsListenerState.Connected(ROOM_INFO, 0xff000011))
+            fakeListener.emit(NestsListenerState.Connected(ROOM_CONFIG, 0xff000011))
            assertEquals(ConnectionUiState.Connected, vm.uiState.value.connection)

            vm.disconnect()
@@ -195,7 +195,7 @@ class AudioRoomViewModelTest {
            val vm = newViewModel { fakeListener }

            vm.connect()
-            fakeListener.emit(NestsListenerState.Connected(ROOM_INFO, 0xff000011))
+            fakeListener.emit(NestsListenerState.Connected(ROOM_CONFIG, 0xff000011))
            // Speaking-now is empty until an object arrives — exercising the
            // timeout-based clearing requires a live SubscribeHandle, which is
            // covered in nestsClient's pipe tests. Here we just verify the
@@ -219,10 +219,9 @@ class AudioRoomViewModelTest {
            decoderFactory = { NoopOpusDecoder },
            playerFactory = { NoopAudioPlayer() },
            signer = NoopSigner,
-            serviceBase = "https://example.test/api/v1/nests",
-            roomId = "test-room",
+            room = ROOM_CONFIG,
            connector =
-                NestsListenerConnector { _, _, scope, _, _, _ ->
+                NestsListenerConnector { _, _, scope, _, _ ->
                    connect(scope)
                },
            // Wire to the test's backgroundScope so close calls run during
@@ -249,11 +248,11 @@ class AudioRoomViewModelTest {
    }

    private object NoopNestsClient : NestsClient {
-        override suspend fun resolveRoom(
-            serviceBase: String,
-            roomId: String,
+        override suspend fun mintToken(
+            room: NestsRoomConfig,
+            publish: Boolean,
            signer: NostrSigner,
-        ): NestsRoomInfo = error("resolveRoom not used (connector seam bypasses it)")
+        ): String = error("mintToken not used (connector seam bypasses it)")
    }

    private object NoopWebTransportFactory : WebTransportFactory {
@@ -318,6 +317,12 @@ class AudioRoomViewModelTest {
    }

    companion object {
-        private val ROOM_INFO = NestsRoomInfo(endpoint = "https://relay.example.test/moq")
+        private val ROOM_CONFIG =
+            NestsRoomConfig(
+                authBaseUrl = "https://relay.example.test/api/v1/nests",
+                endpoint = "https://relay.example.test/moq",
+                hostPubkey = "0".repeat(64),
+                roomId = "test-room",
+            )
    }
 }