refactor: clean up PeerSessionManager and CallController integration

- Split PeerSession.kt out of PeerSessionManager.kt (types, interface, manager are now in separate files) - Remove webRtcSessions duplication in CallController — PeerSessionManager is now the single source of truth for session tracking; WebRtcCallSession is retrieved via the adapter cast when WebRTC-specific APIs are needed - Initialize PeerSessionManager eagerly with localPubKey (passed to CallController constructor) instead of lazy suspend init — fixes early ICE candidates being silently dropped before first suspend call - Extract FakePeerSession into its own file for reuse across test files - Remove assertion-only glare tiebreaker tests from NipACStateMachineTest (now properly tested with real logic in PeerSessionManagerTest) https://claude.ai/code/session_01AfRYTRCvtKqqDxeKQujUrx
2026-04-05 15:38:28 +00:00
parent e9f1fcbd2a
commit 6fbbcbbf3b
7 changed files with 207 additions and 212 deletions
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.commons.call
+
+/**
+ * Fake PeerSession that records all operations for test assertions.
+ * Simulates WebRTC PeerConnection signaling state transitions
+ * without native libraries.
+ */
+class FakePeerSession(
+    private var signalingState: SignalingState = SignalingState.STABLE,
+) : PeerSession {
+    val addedCandidates = mutableListOf<IceCandidateData>()
+    var lastRemoteDescription: Pair<SdpType, String>? = null
+    var rolledBack = false
+    var disposed = false
+    var lastCreatedOffer: String? = null
+    var lastCreatedAnswer: String? = null
+
+    override fun getSignalingState(): SignalingState = signalingState
+
+    override fun setRemoteDescription(
+        type: SdpType,
+        sdp: String,
+    ) {
+        lastRemoteDescription = type to sdp
+        signalingState =
+            when (type) {
+                SdpType.ANSWER -> SignalingState.STABLE
+                SdpType.OFFER -> SignalingState.HAVE_REMOTE_OFFER
+            }
+    }
+
+    override fun addIceCandidate(candidate: IceCandidateData) {
+        addedCandidates.add(candidate)
+    }
+
+    override fun createOffer(onSdpCreated: (String) -> Unit) {
+        signalingState = SignalingState.HAVE_LOCAL_OFFER
+        val sdp = "fake-offer-sdp"
+        lastCreatedOffer = sdp
+        onSdpCreated(sdp)
+    }
+
+    override fun createAnswer(onSdpCreated: (String) -> Unit) {
+        val sdp = "fake-answer-sdp"
+        lastCreatedAnswer = sdp
+        signalingState = SignalingState.STABLE
+        onSdpCreated(sdp)
+    }
+
+    override fun rollback(onDone: () -> Unit) {
+        rolledBack = true
+        signalingState = SignalingState.STABLE
+        onDone()
+    }
+
+    override fun dispose() {
+        disposed = true
+        signalingState = SignalingState.CLOSED
+    }
+}
@@ -487,61 +487,3 @@ class PeerSessionManagerTest {
        assertFalse(bobAccepted, "bob should ignore alice's offer")
    }
 }
-
-/**
- * Fake PeerSession that records all operations for test assertions.
- * No real WebRTC involved.
- */
-class FakePeerSession(
-    private var signalingState: SignalingState = SignalingState.STABLE,
-) : PeerSession {
-    val addedCandidates = mutableListOf<IceCandidateData>()
-    var lastRemoteDescription: Pair<SdpType, String>? = null
-    var rolledBack = false
-    var disposed = false
-    var lastCreatedOffer: String? = null
-    var lastCreatedAnswer: String? = null
-
-    override fun getSignalingState(): SignalingState = signalingState
-
-    override fun setRemoteDescription(
-        type: SdpType,
-        sdp: String,
-    ) {
-        lastRemoteDescription = type to sdp
-        if (type == SdpType.ANSWER) {
-            signalingState = SignalingState.STABLE
-        } else if (type == SdpType.OFFER) {
-            signalingState = SignalingState.HAVE_REMOTE_OFFER
-        }
-    }
-
-    override fun addIceCandidate(candidate: IceCandidateData) {
-        addedCandidates.add(candidate)
-    }
-
-    override fun createOffer(onSdpCreated: (String) -> Unit) {
-        signalingState = SignalingState.HAVE_LOCAL_OFFER
-        val sdp = "fake-offer-sdp"
-        lastCreatedOffer = sdp
-        onSdpCreated(sdp)
-    }
-
-    override fun createAnswer(onSdpCreated: (String) -> Unit) {
-        val sdp = "fake-answer-sdp"
-        lastCreatedAnswer = sdp
-        signalingState = SignalingState.STABLE
-        onSdpCreated(sdp)
-    }
-
-    override fun rollback(onDone: () -> Unit) {
-        rolledBack = true
-        signalingState = SignalingState.STABLE
-        onDone()
-    }
-
-    override fun dispose() {
-        disposed = true
-        signalingState = SignalingState.CLOSED
-    }
-}