Skip to content

Commit

Permalink
Avoid replacing track on mute
Browse files Browse the repository at this point in the history
  • Loading branch information
streamer45 committed Apr 25, 2024
1 parent 6b418f9 commit 9d2c18d
Show file tree
Hide file tree
Showing 2 changed files with 118 additions and 6 deletions.
6 changes: 0 additions & 6 deletions client/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ func (c *Client) Mute() error {
c.mut.Lock()
defer c.mut.Unlock()

if c.voiceSender != nil {
if err := c.voiceSender.ReplaceTrack(nil); err != nil {
return fmt.Errorf("failed to replace track: %w", err)
}
}

return c.sendWS(wsEventMute, nil, false)
}

Expand Down
118 changes: 118 additions & 0 deletions client/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,124 @@ func TestAPIMuteUnmute(t *testing.T) {
}
}

func TestAPIMuteUnmuteNegotiation(t *testing.T) {
th := setupTestHelper(t, "calls0")

// Setup
userConnectCh := make(chan struct{})
err := th.userClient.On(RTCConnectEvent, func(_ any) error {
close(userConnectCh)
return nil
})
require.NoError(t, err)

adminConnectCh := make(chan struct{})
err = th.adminClient.On(RTCConnectEvent, func(_ any) error {
close(adminConnectCh)
return nil
})
require.NoError(t, err)

go func() {
err := th.userClient.Connect()
require.NoError(t, err)
}()

go func() {
err := th.adminClient.Connect()
require.NoError(t, err)
}()

select {
case <-userConnectCh:
case <-time.After(waitTimeout):
require.Fail(t, "timed out waiting for user connect event")
}

select {
case <-adminConnectCh:
case <-time.After(waitTimeout):
require.Fail(t, "timed out waiting for admin connect event")
}

userCloseCh := make(chan struct{})
adminCloseCh := make(chan struct{})

userVoiceTrack := th.newVoiceTrack()
err = th.userClient.Unmute(userVoiceTrack)
require.NoError(t, err)
go th.voiceTrackWriter(userVoiceTrack, userCloseCh)

time.Sleep(time.Second)

err = th.userClient.Mute()
require.NoError(t, err)

th.adminClient.pc.OnSignalingStateChange(func(st webrtc.SignalingState) {
if st == webrtc.SignalingStateStable {
th.adminClient.pc.OnNegotiationNeeded(func() {
require.FailNow(t, "negotiation should not be needed")
})
}
})

th.userClient.pc.OnSignalingStateChange(func(st webrtc.SignalingState) {
if st == webrtc.SignalingStateStable {
th.userClient.pc.OnNegotiationNeeded(func() {
require.FailNow(t, "negotiation should not be needed")
})
}
})

adminVoiceTrack := th.newVoiceTrack()
err = th.adminClient.Unmute(adminVoiceTrack)
require.NoError(t, err)
go th.voiceTrackWriter(adminVoiceTrack, adminCloseCh)

time.Sleep(time.Second)

err = th.userClient.Unmute(userVoiceTrack)
require.NoError(t, err)

time.Sleep(time.Second)

// Teardown

err = th.userClient.On(CloseEvent, func(_ any) error {
close(userCloseCh)
return nil
})
require.NoError(t, err)

err = th.adminClient.On(CloseEvent, func(_ any) error {
close(adminCloseCh)
return nil
})
require.NoError(t, err)

go func() {
err := th.userClient.Close()
require.NoError(t, err)
}()

go func() {
err := th.adminClient.Close()
require.NoError(t, err)
}()

select {
case <-userCloseCh:
case <-time.After(waitTimeout):
require.Fail(t, "timed out waiting for close event")
}

select {
case <-adminCloseCh:
case <-time.After(waitTimeout):
require.Fail(t, "timed out waiting for close event")
}
}

func TestAPIRaiseLowerHand(t *testing.T) {
th := setupTestHelper(t, "calls0")

Expand Down

0 comments on commit 9d2c18d

Please sign in to comment.