#3 connectionID should be the same for one peer connection

Author: zoonooz

library/src/main/java/io/callstats/event/EventManager.kt

@@ -1,15 +1,12 @@
 package io.callstats.event
 
 import io.callstats.CallstatsConfig
-import io.callstats.OnIceConnectionChange
 import io.callstats.OnStats
 import io.callstats.PeerEvent
 import io.callstats.event.fabric.FabricSetupEvent
 import io.callstats.event.fabric.FabricTerminatedEvent
 import io.callstats.interceptor.Interceptor
-import io.callstats.utils.*
 import org.webrtc.PeerConnection
-import org.webrtc.RTCStatsReport
 import java.util.Timer
 import kotlin.concurrent.timerTask
 
@@ -25,8 +22,7 @@ internal interface EventManager {
 }
 
 /**
- * If it is WebRTC events, forward to interceptors and let them create events
- * If it is Application events, convert to event directly
+ * Forward to interceptors and let them create events
  */
 internal class EventManagerImpl(
     private val sender: EventSender,
@@ -36,18 +32,11 @@ internal class EventManagerImpl(
     private val config: CallstatsConfig,
     private val interceptors: Array<Interceptor> = emptyArray()): EventManager
 {
-  internal var connectionID = ""
+  private val connectionID = createConnectionID()
   private var statsTimer: Timer? = null
 
   override fun process(event: PeerEvent) {
     connection.getStats { report ->
-      // every time ice connected, update connection ID
-      if (event is OnIceConnectionChange && event.state == PeerConnection.IceConnectionState.CONNECTED) {
-        connectionID = createConnectionID(report)
-      }
-      // no connection ID, don't send
-      if (connectionID.isEmpty()) return@getStats
-
       // forward event
       interceptors.forEach { interceptor ->
         val events = interceptor.process(
@@ -79,19 +68,7 @@ internal class EventManagerImpl(
     statsTimer = null
   }
 
-  private fun createConnectionID(report: RTCStatsReport): String {
-    // create connection ID from local and remote candidate IP + Port
-    val stats = report.statsMap
-    return stats.selectedCandidatePairId()
-        // find selected pair
-        ?.let { selectId -> stats.candidatePairs().firstOrNull { it.id == selectId } }
-        // find candidates and create ID
-        ?.let { pair ->
-          val local = stats.localCandidates().firstOrNull { it.id == pair.localCandidateId }
-          val remote = stats.remoteCandidates().firstOrNull { it.id == pair.remoteCandidateId }
-          if (local != null && remote != null) {
-            md5("${local.ip}${local.port}${remote.ip}${remote.port}")
-          } else null
-        } ?: ""
+  private fun createConnectionID(): String {
+    return System.currentTimeMillis().toString()
   }
 }

library/src/test/java/io/callstats/event/EventManagerTest.kt

@@ -33,12 +33,10 @@ class EventManagerTest {
         connection,
         CallstatsConfig(),
         arrayOf(mockInterceptor1, mockInterceptor2))
-    manager.connectionID = "con1"
 
     whenever(connection.getStats(any())).thenAnswer {
       (it.arguments[0] as RTCStatsCollectorCallback).onStatsDelivered(RTCStatsReport(0, mapOf()))
     }
-
     whenever(mockInterceptor1.process(any(), any(), any(), any(), any(), any())).thenReturn(emptyArray())
     whenever(mockInterceptor2.process(any(), any(), any(), any(), any(), any())).thenReturn(emptyArray())
   }