#3 state change event can be sent before fabric setup

Author: zoonooz

library/src/main/java/io/callstats/interceptor/FabricInterceptor.kt

@@ -64,11 +64,10 @@ internal class FabricInterceptor : Interceptor {
     var events = emptyArray<Event>()
     val newTimestamp = System.currentTimeMillis()
 
-    // [Fabric state change] if connection was setup, send fabric change
-    if (connected
-        && ((event is OnIceConnectionChange && event.state != iceConnectionState)
+    // [Fabric state change] send fabric change
+    if ((event is OnIceConnectionChange && event.state != iceConnectionState)
             || (event is OnIceGatheringChange && event.state != iceGatheringState)
-            || (event is OnSignalingChange && event.state != signalingState)))
+            || (event is OnSignalingChange && event.state != signalingState))
     {
       val prevState: String
       val newState: String
@@ -96,8 +95,8 @@ internal class FabricInterceptor : Interceptor {
       events += FabricStateChangeEvent(
           remoteID = remoteID,
           connectionID = connectionID,
-          prevState = prevState.toLowerCase(),
-          newState = newState.toLowerCase(),
+          prevState = prevState.toLowerCase().replace('_', '-'),
+          newState = newState.toLowerCase().replace('_', '-'),
           changedState = changedState)
     }
 

library/src/test/java/io/callstats/interceptor/FabricInterceptorTest.kt

@@ -34,8 +34,8 @@ class FabricInterceptorTest {
   fun fabricConnectSend() {
     val stats = mapOf<String, RTCStats>()
     val events = interceptor.process(connection, OnIceConnectionChange(IceConnectionState.CONNECTED), "local1", "remote1", "con1", stats)
-    assertEquals(1, events.size)
-    assertTrue(events.first() is FabricSetupEvent)
+    assertEquals(2, events.size) // include state change
+    assertTrue(events.any { it is FabricSetupEvent })
   }
 
   @Test
@@ -63,16 +63,8 @@ class FabricInterceptorTest {
     assertTrue(events.first() is FabricTransportChangeEvent)
   }
 
-  @Test
-  fun fabricStateChangeShouldNotSendIfNotConnected() {
-    val stats = mapOf<String, RTCStats>()
-    val events = interceptor.process(connection, OnIceConnectionChange(IceConnectionState.CHECKING), "local1", "remote1", "con1", stats)
-    assertEquals(0, events.size)
-  }
-
   @Test
   fun fabricStateSend() {
-    connected()
     val stats = mapOf<String, RTCStats>()
     val events = interceptor.process(connection, OnIceConnectionChange(IceConnectionState.CHECKING), "local1", "remote1", "con1", stats)
     assertEquals(1, events.size)