Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ type engineHandler interface {
OnSubscribedAudioCodecUpdate(subscribedAudioCodecUpdate *livekit.SubscribedAudioCodecUpdate)
OnMediaSectionsRequirement(mediaSectionsRequirement *livekit.MediaSectionsRequirement)
OnRequestResponse(requestResponse *livekit.RequestResponse)
OnPublishDataTrackResponse(publishDataTrackResponse *livekit.PublishDataTrackResponse)
OnUnpublishDataTrackResponse(unpublishDataTrackResponse *livekit.UnpublishDataTrackResponse)
OnDataTrackSubscriberHandles(dataTrackSubscriberHandles *livekit.DataTrackSubscriberHandles)
}

// -------------------------------------------
Expand Down Expand Up @@ -1403,6 +1406,18 @@ func (e *RTCEngine) SendSyncState(syncState *livekit.SyncState) error {
return e.signalTransport.SendMessage(e.signalling.SignalSyncState(syncState))
}

func (e *RTCEngine) SendPublishDataTrack(publishDataTrack *livekit.PublishDataTrackRequest) error {
return e.signalTransport.SendMessage(e.signalling.SignalPublishDataTrack(publishDataTrack))
}

func (e *RTCEngine) SendUnpublishDataTrack(unpublishDataTrack *livekit.UnpublishDataTrackRequest) error {
return e.signalTransport.SendMessage(e.signalling.SignalUnpublishDataTrack(unpublishDataTrack))
}

func (e *RTCEngine) SendUpdateDataSubscription(updateDataSubscription *livekit.UpdateDataSubscription) error {
return e.signalTransport.SendMessage(e.signalling.SignalUpdateDataSubscription(updateDataSubscription))
}

func (e *RTCEngine) SendLeaveWithReason(reason livekit.DisconnectReason) error {
return e.signalTransport.SendMessage(
e.signalling.SignalLeaveRequest(
Expand Down Expand Up @@ -1765,6 +1780,18 @@ func (e *RTCEngine) OnRequestResponse(res *livekit.RequestResponse) {
e.engineHandler.OnRequestResponse(res)
}

func (e *RTCEngine) OnPublishDataTrackResponse(publishDataTrackResponse *livekit.PublishDataTrackResponse) {
e.engineHandler.OnPublishDataTrackResponse(publishDataTrackResponse)
}

func (e *RTCEngine) OnUnpublishDataTrackResponse(unpublishDataTrackResponse *livekit.UnpublishDataTrackResponse) {
e.engineHandler.OnUnpublishDataTrackResponse(unpublishDataTrackResponse)
}

func (e *RTCEngine) OnDataTrackSubscriberHandles(dataTrackSubscriberHandles *livekit.DataTrackSubscriberHandles) {
e.engineHandler.OnDataTrackSubscriberHandles(dataTrackSubscriberHandles)
}

// ------------------------------------

func setConfiguration(pcTransport *PCTransport, configuration webrtc.Configuration) {
Expand Down
9 changes: 9 additions & 0 deletions room.go
Original file line number Diff line number Diff line change
Expand Up @@ -1411,6 +1411,15 @@ func (r *Room) OnRequestResponse(res *livekit.RequestResponse) {
}
}

func (r *Room) OnPublishDataTrackResponse(publishDataTrackResponse *livekit.PublishDataTrackResponse) {
}

func (r *Room) OnUnpublishDataTrackResponse(unpublishDataTrackResponse *livekit.UnpublishDataTrackResponse) {
}

func (r *Room) OnDataTrackSubscriberHandles(dataTrackSubscriberHandles *livekit.DataTrackSubscriberHandles) {
}

func (r *Room) OnStreamHeader(streamHeader *livekit.DataStream_Header, participantIdentity string) {
switch header := streamHeader.ContentHeader.(type) {
case *livekit.DataStream_Header_TextHeader:
Expand Down
6 changes: 6 additions & 0 deletions signalling/interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ type Signalling interface {
SignalSubscriptionPermission(subscriptionPermission *livekit.SubscriptionPermission) proto.Message
SignalUpdateTrackSettings(settings *livekit.UpdateTrackSettings) proto.Message
SignalUpdateParticipantMetadata(metadata *livekit.UpdateParticipantMetadata) proto.Message
SignalPublishDataTrack(publishDataTrack *livekit.PublishDataTrackRequest) proto.Message
SignalUnpublishDataTrack(unpublishDataTrack *livekit.UnpublishDataTrackRequest) proto.Message
SignalUpdateDataSubscription(updateDataSubscription *livekit.UpdateDataSubscription) proto.Message
}

type ConnectParams struct {
Expand Down Expand Up @@ -182,4 +185,7 @@ type SignalProcessor interface {
OnSubscribedAudioCodecUpdate(subscribedAudioCodecUpdate *livekit.SubscribedAudioCodecUpdate)
OnMediaSectionsRequirement(mediaSectionsRequirement *livekit.MediaSectionsRequirement)
OnRequestResponse(requestResponse *livekit.RequestResponse)
OnPublishDataTrackResponse(publishDataTrackResponse *livekit.PublishDataTrackResponse)
OnUnpublishDataTrackResponse(unpublishDataTrackResponse *livekit.UnpublishDataTrackResponse)
OnDataTrackSubscriberHandles(dataTrackSubscriberHandles *livekit.DataTrackSubscriberHandles)
}
9 changes: 9 additions & 0 deletions signalling/signalhandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,15 @@ func (s *signalhandler) HandleMessage(msg proto.Message) error {

case *livekit.SignalResponse_RequestResponse:
s.params.Processor.OnRequestResponse(payload.RequestResponse)

case *livekit.SignalResponse_PublishDataTrackResponse:
s.params.Processor.OnPublishDataTrackResponse(payload.PublishDataTrackResponse)

case *livekit.SignalResponse_UnpublishDataTrackResponse:
s.params.Processor.OnUnpublishDataTrackResponse(payload.UnpublishDataTrackResponse)

case *livekit.SignalResponse_DataTrackSubscriberHandles:
s.params.Processor.OnDataTrackSubscriberHandles(payload.DataTrackSubscriberHandles)
}

return nil
Expand Down
24 changes: 24 additions & 0 deletions signalling/signallingbase.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,27 @@ func (s *signallingBase) SignalUpdateParticipantMetadata(metadata *livekit.Updat
},
}
}

func (s *signallingBase) SignalPublishDataTrack(publishDataTrack *livekit.PublishDataTrackRequest) proto.Message {
return &livekit.SignalRequest{
Message: &livekit.SignalRequest_PublishDataTrackRequest{
PublishDataTrackRequest: publishDataTrack,
},
}
}

func (s *signallingBase) SignalUnpublishDataTrack(unpublishDataTrack *livekit.UnpublishDataTrackRequest) proto.Message {
return &livekit.SignalRequest{
Message: &livekit.SignalRequest_UnpublishDataTrackRequest{
UnpublishDataTrackRequest: unpublishDataTrack,
},
}
}

func (s *signallingBase) SignalUpdateDataSubscription(updateDataSubscription *livekit.UpdateDataSubscription) proto.Message {
return &livekit.SignalRequest{
Message: &livekit.SignalRequest_UpdateDataSubscription{
UpdateDataSubscription: updateDataSubscription,
},
}
}
12 changes: 12 additions & 0 deletions signalling/signallingunimplemented.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,15 @@ func (s *signallingUnimplemented) SignalUpdateTrackSettings(settings *livekit.Up
func (s *signallingUnimplemented) SignalUpdateParticipantMetadata(metadata *livekit.UpdateParticipantMetadata) proto.Message {
return nil
}

func (s *signallingUnimplemented) SignalPublishDataTrack(publishDataTrack *livekit.PublishDataTrackRequest) proto.Message {
return nil
}

func (s *signallingUnimplemented) SignalUnpublishDataTrack(unpublishDataTrack *livekit.UnpublishDataTrackRequest) proto.Message {
return nil
}

func (s *signallingUnimplemented) SignalUpdateDataSubscription(updateDataSubscription *livekit.UpdateDataSubscription) proto.Message {
return nil
}
Loading