Check rid and sessionId in addTrack

Sean-Der · Sean-Der · commit 23ec0becd4a6 · 2025-06-21T16:08:39.000-04:00
Otherwise reconnects would ignore streams with duplicate RIDs
diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go
@@ -163,7 +163,7 @@ func addTrack(stream *stream, rid, sessionId string) (*videoTrack, error) {
 	defer streamMapLock.Unlock()
 
 	for i := range stream.videoTracks {
-		if rid == stream.videoTracks[i].rid {
+		if rid == stream.videoTracks[i].rid && sessionId == stream.videoTracks[i].sessionId {
 			return stream.videoTracks[i], nil
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ func addTrack(stream stream, rid, sessionId string) (videoTrack, error) {`
`163`	`163`	`defer streamMapLock.Unlock()`
`164`	`164`
`165`	`165`	`for i := range stream.videoTracks {`
`166`		`- if rid == stream.videoTracks[i].rid {`
	`166`	`+ if rid == stream.videoTracks[i].rid && sessionId == stream.videoTracks[i].sessionId {`
`167`	`167`	`return stream.videoTracks[i], nil`
`168`	`168`	`}`
`169`	`169`	`}`