dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-05-29 14:04:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename Participant.name to Participant.identity

Browse Source
This commit is contained in:
David Zhao
2021-01-30 14:00:37 -08:00
parent 1a8e26031f
commit 28e73bd109
9 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/rtc/helper_test.go
+2 -2
View File
@@ -6,10 +6,10 @@ import (
"github.com/livekit/livekit-server/proto/livekit"
)
func newMockParticipant(name string) *typesfakes.FakeParticipant {
func newMockParticipant(identity string) *typesfakes.FakeParticipant {
p := &typesfakes.FakeParticipant{}
p.IDReturns(utils.NewGuid(utils.ParticipantPrefix))
p.NameReturns(name)
p.IdentityReturns(identity)
p.StateReturns(livekit.ParticipantInfo_JOINED)
return p
pkg/rtc/participant.go
+9 -9
View File
@@ -40,7 +40,7 @@ type ParticipantImpl struct {
ctx context.Context
cancel context.CancelFunc
mediaEngine *webrtc.MediaEngine
name string
identity string
state atomic.Value // livekit.ParticipantInfo_State
rtcpCh *utils.CalmChannel
subscribedTracks map[string][]*sfu.DownTrack
@@ -75,15 +75,15 @@ func NewPeerConnection(conf *WebRTCConfig) (*webrtc.PeerConnection, error) {
return pc, err
}
func NewParticipant(participantId, name string, pc types.PeerConnection, rs routing.MessageSink, receiverConfig ReceiverConfig) (*ParticipantImpl, error) {
// TODO: check to ensure params are valid, id and name can't be empty
func NewParticipant(participantId, identity string, pc types.PeerConnection, rs routing.MessageSink, receiverConfig ReceiverConfig) (*ParticipantImpl, error) {
// TODO: check to ensure params are valid, id and identity can't be empty
me := &webrtc.MediaEngine{}
me.RegisterDefaultCodecs()
ctx, cancel := context.WithCancel(context.Background())
participant := &ParticipantImpl{
id: participantId,
name: name,
identity: identity,
peerConn: pc,
responseSink: rs,
receiverConfig: receiverConfig,
@@ -152,8 +152,8 @@ func (p *ParticipantImpl) ID() string {
return p.id
}
func (p *ParticipantImpl) Name() string {
return p.name
func (p *ParticipantImpl) Identity() string {
return p.identity
}
func (p *ParticipantImpl) State() livekit.ParticipantInfo_State {
@@ -171,9 +171,9 @@ func (p *ParticipantImpl) RTCPChan() *utils.CalmChannel {
func (p *ParticipantImpl) ToProto() *livekit.ParticipantInfo {
info := &livekit.ParticipantInfo{
Sid: p.id,
Name: p.name,
State: p.State(),
Sid: p.id,
Identity: p.identity,
State: p.State(),
}
p.lock.RLock()
pkg/rtc/room.go
+1 -1
View File
@@ -90,7 +90,7 @@ func (r *Room) Join(participant types.Participant) error {
logger.Infow("new participant joined",
"id", participant.ID(),
"name", participant.Name(),
"identity", participant.Identity(),
"roomId", r.Sid)
r.participants[participant.ID()] = participant
pkg/rtc/room_test.go
+1 -1
View File
@@ -156,7 +156,7 @@ func TestNewTrack(t *testing.T) {
func newRoomWithParticipants(t *testing.T, num int) *rtc.Room {
rm := rtc.NewRoom(
&livekit.Room{Name: "name"},
&livekit.Room{Name: "identity"},
rtc.WebRTCConfig{},
)
for i := 0; i < num; i++ {
pkg/rtc/types/interfaces.go
+1 -1
View File
@@ -48,7 +48,7 @@ type PeerConnection interface {
//counterfeiter:generate . Participant
type Participant interface {
ID() string
Name() string
Identity() string
State() livekit.ParticipantInfo_State
IsReady() bool
ToProto() *livekit.ParticipantInfo
pkg/rtc/types/typesfakes/fake_participant.go
+65 -65
View File
@@ -95,6 +95,16 @@ type FakeParticipant struct {
iDReturnsOnCall map[int]struct {
result1 string
}
IdentityStub func() string
identityMutex sync.RWMutex
identityArgsForCall []struct {
}
identityReturns struct {
result1 string
}
identityReturnsOnCall map[int]struct {
result1 string
}
IsReadyStub func() bool
isReadyMutex sync.RWMutex
isReadyArgsForCall []struct {
@@ -105,16 +115,6 @@ type FakeParticipant struct {
isReadyReturnsOnCall map[int]struct {
result1 bool
}
NameStub func() string
nameMutex sync.RWMutex
nameArgsForCall []struct {
}
nameReturns struct {
result1 string
}
nameReturnsOnCall map[int]struct {
result1 string
}
OnCloseStub func(func(types.Participant))
onCloseMutex sync.RWMutex
onCloseArgsForCall []struct {
@@ -672,6 +672,59 @@ func (fake *FakeParticipant) IDReturnsOnCall(i int, result1 string) {
}{result1}
}
func (fake *FakeParticipant) Identity() string {
fake.identityMutex.Lock()
ret, specificReturn := fake.identityReturnsOnCall[len(fake.identityArgsForCall)]
fake.identityArgsForCall = append(fake.identityArgsForCall, struct {
}{})
stub := fake.IdentityStub
fakeReturns := fake.identityReturns
fake.recordInvocation("Identity", []interface{}{})
fake.identityMutex.Unlock()
if stub != nil {
return stub()
}
if specificReturn {
return ret.result1
}
return fakeReturns.result1
}
func (fake *FakeParticipant) IdentityCallCount() int {
fake.identityMutex.RLock()
defer fake.identityMutex.RUnlock()
return len(fake.identityArgsForCall)
}
func (fake *FakeParticipant) IdentityCalls(stub func() string) {
fake.identityMutex.Lock()
defer fake.identityMutex.Unlock()
fake.IdentityStub = stub
}
func (fake *FakeParticipant) IdentityReturns(result1 string) {
fake.identityMutex.Lock()
defer fake.identityMutex.Unlock()
fake.IdentityStub = nil
fake.identityReturns = struct {
result1 string
}{result1}
}
func (fake *FakeParticipant) IdentityReturnsOnCall(i int, result1 string) {
fake.identityMutex.Lock()
defer fake.identityMutex.Unlock()
fake.IdentityStub = nil
if fake.identityReturnsOnCall == nil {
fake.identityReturnsOnCall = make(map[int]struct {
result1 string
})
}
fake.identityReturnsOnCall[i] = struct {
result1 string
}{result1}
}
func (fake *FakeParticipant) IsReady() bool {
fake.isReadyMutex.Lock()
ret, specificReturn := fake.isReadyReturnsOnCall[len(fake.isReadyArgsForCall)]
@@ -725,59 +778,6 @@ func (fake *FakeParticipant) IsReadyReturnsOnCall(i int, result1 bool) {
}{result1}
}
func (fake *FakeParticipant) Name() string {
fake.nameMutex.Lock()
ret, specificReturn := fake.nameReturnsOnCall[len(fake.nameArgsForCall)]
fake.nameArgsForCall = append(fake.nameArgsForCall, struct {
}{})
stub := fake.NameStub
fakeReturns := fake.nameReturns
fake.recordInvocation("Name", []interface{}{})
fake.nameMutex.Unlock()
if stub != nil {
return stub()
}
if specificReturn {
return ret.result1
}
return fakeReturns.result1
}
func (fake *FakeParticipant) NameCallCount() int {
fake.nameMutex.RLock()
defer fake.nameMutex.RUnlock()
return len(fake.nameArgsForCall)
}
func (fake *FakeParticipant) NameCalls(stub func() string) {
fake.nameMutex.Lock()
defer fake.nameMutex.Unlock()
fake.NameStub = stub
}
func (fake *FakeParticipant) NameReturns(result1 string) {
fake.nameMutex.Lock()
defer fake.nameMutex.Unlock()
fake.NameStub = nil
fake.nameReturns = struct {
result1 string
}{result1}
}
func (fake *FakeParticipant) NameReturnsOnCall(i int, result1 string) {
fake.nameMutex.Lock()
defer fake.nameMutex.Unlock()
fake.NameStub = nil
if fake.nameReturnsOnCall == nil {
fake.nameReturnsOnCall = make(map[int]struct {
result1 string
})
}
fake.nameReturnsOnCall[i] = struct {
result1 string
}{result1}
}
func (fake *FakeParticipant) OnClose(arg1 func(types.Participant)) {
fake.onCloseMutex.Lock()
fake.onCloseArgsForCall = append(fake.onCloseArgsForCall, struct {
@@ -1426,10 +1426,10 @@ func (fake *FakeParticipant) Invocations() map[string][][]interface{} {
defer fake.handleClientNegotiationMutex.RUnlock()
fake.iDMutex.RLock()
defer fake.iDMutex.RUnlock()
fake.identityMutex.RLock()
defer fake.identityMutex.RUnlock()
fake.isReadyMutex.RLock()
defer fake.isReadyMutex.RUnlock()
fake.nameMutex.RLock()
defer fake.nameMutex.RUnlock()
fake.onCloseMutex.RLock()
defer fake.onCloseMutex.RUnlock()
fake.onICECandidateMutex.RLock()
pkg/service/roommanager.go
+1 -1
View File
@@ -192,7 +192,7 @@ func (r *RoomManager) getOrCreateRoom(roomName string) (*rtc.Room, error) {
func (r *RoomManager) rtcSessionWorker(room *rtc.Room, participant types.Participant, requestSource routing.MessageSource) {
defer func() {
logger.Debugw("RTC session finishing",
"participant", participant.Name(),
"participant", participant.Identity(),
"room", room.Name,
)
}()