dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-03-29 07:09:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Server-side workaround for JS SDK's inability to handle ReconnectResponse (#1367)

Browse Source 
See: https://github.com/livekit/client-sdk-js/pull/568
This commit is contained in:
David Zhao
2023-02-01 15:37:18 -08:00
committed by GitHub
parent ffadb94e3a
commit 8ba6418ab4
3 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
pkg/rtc/clientinfo.go
View File

@@ -36,10 +36,40 @@ func (c ClientInfo) FireTrackByRTPPacket() bool {
return c.isGo()
}
// CompareVersion compares two semver versions
func (c ClientInfo) CanHandleReconnectResponse() bool {
if c.Sdk == livekit.ClientInfo_JS {
// JS handles Reconnect explicitly in 1.6.3, prior to 1.6.4 it could not handle unknown responses
if c.compareVersion("1.6.3") < 0 {
return false
}
}
return true
}
func (c ClientInfo) SupportsICETCP() bool {
if c.ClientInfo == nil {
return false
}
if c.ClientInfo.Sdk == livekit.ClientInfo_GO {
// Go does not support active TCP
return false
}
if c.ClientInfo.Sdk == livekit.ClientInfo_SWIFT {
// ICE/TCP added in 1.0.5
return c.compareVersion("1.0.5") >= 0
}
// most SDKs support ICE/TCP
return true
}
func (c ClientInfo) SupportsChangeRTPSenderEncodingActive() bool {
return !c.isFirefox()
}
// compareVersion compares a semver against the current client SDK version
// returning 1 if current version is greater than version
// 0 if they are the same, and -1 if it's an earlier version
func (c ClientInfo) CompareVersion(version string) int {
func (c ClientInfo) compareVersion(version string) int {
if c.ClientInfo == nil {
return -1
}
@@ -62,22 +92,3 @@ func (c ClientInfo) CompareVersion(version string) int {
}
return 0
}
func (c ClientInfo) SupportsICETCP() bool {
if c.ClientInfo == nil {
return false
}
if c.ClientInfo.Sdk == livekit.ClientInfo_GO {
return false
}
if c.ClientInfo.Sdk == livekit.ClientInfo_SWIFT {
// ICE/TCP added in 1.0.5
return c.CompareVersion("1.0.5") >= 0
}
// most SDKs support ICE/TCP
return true
}
func (c ClientInfo) SupportsChangeRTPSenderEncodingActive() bool {
return !c.isFirefox()
}

6
pkg/rtc/clientinfo_test.go
View File

@@ -30,9 +30,9 @@ func TestClientInfo_CompareVersion(t *testing.T) {
Version: "1",
},
}
require.Equal(t, 1, c.CompareVersion("0.1.0"))
require.Equal(t, 0, c.CompareVersion("1.0.0"))
require.Equal(t, -1, c.CompareVersion("1.0.5"))
require.Equal(t, 1, c.compareVersion("0.1.0"))
require.Equal(t, 0, c.compareVersion("1.0.0"))
require.Equal(t, -1, c.compareVersion("1.0.5"))
}
func TestClientInfo_SupportsICETCP(t *testing.T) {

3
pkg/rtc/participant_signal.go
View File

@@ -175,6 +175,9 @@ func (p *ParticipantImpl) SendRefreshToken(token string) error {
}
func (p *ParticipantImpl) SendReconnectResponse(reconnectResponse *livekit.ReconnectResponse) error {
if !p.params.ClientInfo.CanHandleReconnectResponse() {
return nil
}
return p.writeMessage(&livekit.SignalResponse{
Message: &livekit.SignalResponse_Reconnect{
Reconnect: reconnectResponse,