supports packed streamId, protocol 1

@@ -34,7 +34,6 @@ constructor(
     @Named(InjectionNames.SIGNAL_JSON_ENABLED)
     @Named(InjectionNames.SIGNAL_JSON_ENABLED)
     private val useJson: Boolean,
     private val useJson: Boolean,
 ) : WebSocketListener() {
 ) : WebSocketListener() {
-
     var isConnected = false
     var isConnected = false
         private set
         private set
     private var currentWs: WebSocket? = null
     private var currentWs: WebSocket? = null
@@ -44,7 +43,7 @@ constructor(
         url: String,
         url: String,
         token: String,
         token: String,
     ) {
     ) {
-        val wsUrlString = "$url/rtc?access_token=$token"
+        val wsUrlString = "$url/rtc?access_token=$token&protocol=$PROTOCOL_VERSION"
         Timber.i { "connecting to $wsUrlString" }
         Timber.i { "connecting to $wsUrlString" }
 
 
         val request = Request.Builder()
         val request = Request.Builder()
@@ -304,16 +303,18 @@ constructor(
         const val SD_TYPE_ANSWER = "answer"
         const val SD_TYPE_ANSWER = "answer"
         const val SD_TYPE_OFFER = "offer"
         const val SD_TYPE_OFFER = "offer"
         const val SD_TYPE_PRANSWER = "pranswer"
         const val SD_TYPE_PRANSWER = "pranswer"
+        const val PROTOCOL_VERSION = 1;
 
 
         private fun iceServer(url: String) =
         private fun iceServer(url: String) =
             PeerConnection.IceServer.builder(url).createIceServer()
             PeerConnection.IceServer.builder(url).createIceServer()
 
 
+        // more stun servers might slow it down, WebRTC recommends 3 max
         val DEFAULT_ICE_SERVERS = listOf(
         val DEFAULT_ICE_SERVERS = listOf(
             iceServer("stun:stun.l.google.com:19302"),
             iceServer("stun:stun.l.google.com:19302"),
             iceServer("stun:stun1.l.google.com:19302"),
             iceServer("stun:stun1.l.google.com:19302"),
-            iceServer("stun:stun2.l.google.com:19302"),
-            iceServer("stun:stun3.l.google.com:19302"),
-            iceServer("stun:stun4.l.google.com:19302"),
+//            iceServer("stun:stun2.l.google.com:19302"),
+//            iceServer("stun:stun3.l.google.com:19302"),
+//            iceServer("stun:stun4.l.google.com:19302"),
         )
         )
     }
     }
 }
 }

@@ -202,10 +202,12 @@ constructor(
             return
             return
         }
         }
 
 
-        val participantSid = streams.first().id
-        val trackSid = track.id()
+        var (participantSid, trackSid) = unpackStreamId(streams.first().id)
+        if (trackSid == null) {
+            trackSid = track.id()
+        }
         val participant = getOrCreateRemoteParticipant(participantSid)
         val participant = getOrCreateRemoteParticipant(participantSid)
-        participant.addSubscribedMediaTrack(track, trackSid)
+        participant.addSubscribedMediaTrack(track, trackSid!!)
     }
     }
 
 
     /**
     /**
@@ -447,3 +449,11 @@ sealed class RoomException(message: String? = null, cause: Throwable? = null) :
     class ConnectException(message: String? = null, cause: Throwable? = null) :
     class ConnectException(message: String? = null, cause: Throwable? = null) :
         RoomException(message, cause)
         RoomException(message, cause)
 }
 }
+
+internal fun unpackStreamId(packed: String): Pair<String, String?> {
+    val parts = packed.split('|')
+    if (parts.size != 2) {
+        return Pair(packed, null)
+    }
+    return Pair(parts[0], parts[1])
+}