mirror of
https://github.com/strukturag/nextcloud-spreed-signaling
synced 2024-06-07 00:12:35 +02:00
Merge pull request #114 from strukturag/janus-remove-nats
Remove NATS notifications for Janus publishers
This commit is contained in:
commit
6fb57c7823
296
mcu_janus.go
296
mcu_janus.go
|
@ -33,7 +33,6 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/dlintw/goconf"
|
"github.com/dlintw/goconf"
|
||||||
"github.com/nats-io/nats.go"
|
|
||||||
"github.com/notedit/janus-go"
|
"github.com/notedit/janus-go"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -135,9 +134,8 @@ type mcuJanus struct {
|
||||||
// 64-bit members that are accessed atomically must be 64-bit aligned.
|
// 64-bit members that are accessed atomically must be 64-bit aligned.
|
||||||
clientId uint64
|
clientId uint64
|
||||||
|
|
||||||
url string
|
url string
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
nats NatsClient
|
|
||||||
|
|
||||||
maxStreamBitrate int
|
maxStreamBitrate int
|
||||||
maxScreenBitrate int
|
maxScreenBitrate int
|
||||||
|
@ -152,7 +150,9 @@ type mcuJanus struct {
|
||||||
muClients sync.Mutex
|
muClients sync.Mutex
|
||||||
clients map[clientInterface]bool
|
clients map[clientInterface]bool
|
||||||
|
|
||||||
publisherRoomIds map[string]uint64
|
publishers map[string]*mcuJanusPublisher
|
||||||
|
publisherCreated Notifier
|
||||||
|
publisherConnected Notifier
|
||||||
|
|
||||||
reconnectTimer *time.Timer
|
reconnectTimer *time.Timer
|
||||||
reconnectInterval time.Duration
|
reconnectInterval time.Duration
|
||||||
|
@ -165,7 +165,7 @@ type mcuJanus struct {
|
||||||
func emptyOnConnected() {}
|
func emptyOnConnected() {}
|
||||||
func emptyOnDisconnected() {}
|
func emptyOnDisconnected() {}
|
||||||
|
|
||||||
func NewMcuJanus(url string, config *goconf.ConfigFile, nats NatsClient) (Mcu, error) {
|
func NewMcuJanus(url string, config *goconf.ConfigFile) (Mcu, error) {
|
||||||
maxStreamBitrate, _ := config.GetInt("mcu", "maxstreambitrate")
|
maxStreamBitrate, _ := config.GetInt("mcu", "maxstreambitrate")
|
||||||
if maxStreamBitrate <= 0 {
|
if maxStreamBitrate <= 0 {
|
||||||
maxStreamBitrate = defaultMaxStreamBitrate
|
maxStreamBitrate = defaultMaxStreamBitrate
|
||||||
|
@ -182,13 +182,13 @@ func NewMcuJanus(url string, config *goconf.ConfigFile, nats NatsClient) (Mcu, e
|
||||||
|
|
||||||
mcu := &mcuJanus{
|
mcu := &mcuJanus{
|
||||||
url: url,
|
url: url,
|
||||||
nats: nats,
|
|
||||||
maxStreamBitrate: maxStreamBitrate,
|
maxStreamBitrate: maxStreamBitrate,
|
||||||
maxScreenBitrate: maxScreenBitrate,
|
maxScreenBitrate: maxScreenBitrate,
|
||||||
mcuTimeout: mcuTimeout,
|
mcuTimeout: mcuTimeout,
|
||||||
closeChan: make(chan bool, 1),
|
closeChan: make(chan bool, 1),
|
||||||
clients: make(map[clientInterface]bool),
|
clients: make(map[clientInterface]bool),
|
||||||
publisherRoomIds: make(map[string]uint64),
|
|
||||||
|
publishers: make(map[string]*mcuJanusPublisher),
|
||||||
|
|
||||||
reconnectInterval: initialReconnectInterval,
|
reconnectInterval: initialReconnectInterval,
|
||||||
}
|
}
|
||||||
|
@ -249,7 +249,9 @@ func (m *mcuJanus) doReconnect() {
|
||||||
|
|
||||||
log.Println("Reconnection to Janus gateway successful")
|
log.Println("Reconnection to Janus gateway successful")
|
||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
m.publisherRoomIds = make(map[string]uint64)
|
m.publishers = make(map[string]*mcuJanusPublisher)
|
||||||
|
m.publisherCreated.Reset()
|
||||||
|
m.publisherConnected.Reset()
|
||||||
m.reconnectInterval = initialReconnectInterval
|
m.reconnectInterval = initialReconnectInterval
|
||||||
m.mu.Unlock()
|
m.mu.Unlock()
|
||||||
|
|
||||||
|
@ -306,7 +308,6 @@ func (m *mcuJanus) Start() error {
|
||||||
} else {
|
} else {
|
||||||
log.Println("Full-Trickle is enabled")
|
log.Println("Full-Trickle is enabled")
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Printf("Maximum bandwidth %d bits/sec per publishing stream", m.maxStreamBitrate)
|
log.Printf("Maximum bandwidth %d bits/sec per publishing stream", m.maxStreamBitrate)
|
||||||
log.Printf("Maximum bandwidth %d bits/sec per screensharing stream", m.maxScreenBitrate)
|
log.Printf("Maximum bandwidth %d bits/sec per screensharing stream", m.maxScreenBitrate)
|
||||||
|
|
||||||
|
@ -407,7 +408,7 @@ func (m *mcuJanus) GetStats() interface{} {
|
||||||
result.Uptime = &m.connectedSince
|
result.Uptime = &m.connectedSince
|
||||||
}
|
}
|
||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
result.Publishers = int64(len(m.publisherRoomIds))
|
result.Publishers = int64(len(m.publishers))
|
||||||
m.mu.Unlock()
|
m.mu.Unlock()
|
||||||
m.muClients.Lock()
|
m.muClients.Lock()
|
||||||
result.Clients = int64(len(m.clients))
|
result.Clients = int64(len(m.clients))
|
||||||
|
@ -597,53 +598,44 @@ func (m *mcuJanus) getOrCreatePublisherHandle(ctx context.Context, id string, st
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Printf("Attached %s as publisher %d to plugin %s in session %d", streamType, handle.Id, pluginVideoRoom, session.Id)
|
log.Printf("Attached %s as publisher %d to plugin %s in session %d", streamType, handle.Id, pluginVideoRoom, session.Id)
|
||||||
roomId, err := m.searchPublisherRoom(ctx, id, streamType)
|
create_msg := map[string]interface{}{
|
||||||
if err != nil {
|
"request": "create",
|
||||||
log.Printf("Could not search for room of publisher %s: %s", id, err)
|
"description": id + "|" + streamType,
|
||||||
|
// We publish every stream in its own Janus room.
|
||||||
|
"publishers": 1,
|
||||||
|
// Do not use the video-orientation RTP extension as it breaks video
|
||||||
|
// orientation changes in Firefox.
|
||||||
|
"videoorient_ext": false,
|
||||||
}
|
}
|
||||||
|
var maxBitrate int
|
||||||
if roomId == 0 {
|
if streamType == streamTypeScreen {
|
||||||
create_msg := map[string]interface{}{
|
maxBitrate = m.maxScreenBitrate
|
||||||
"request": "create",
|
|
||||||
"description": id + "|" + streamType,
|
|
||||||
// We publish every stream in its own Janus room.
|
|
||||||
"publishers": 1,
|
|
||||||
// Do not use the video-orientation RTP extension as it breaks video
|
|
||||||
// orientation changes in Firefox.
|
|
||||||
"videoorient_ext": false,
|
|
||||||
}
|
|
||||||
var maxBitrate int
|
|
||||||
if streamType == streamTypeScreen {
|
|
||||||
maxBitrate = m.maxScreenBitrate
|
|
||||||
} else {
|
|
||||||
maxBitrate = m.maxStreamBitrate
|
|
||||||
}
|
|
||||||
if bitrate <= 0 {
|
|
||||||
bitrate = maxBitrate
|
|
||||||
} else {
|
|
||||||
bitrate = min(bitrate, maxBitrate)
|
|
||||||
}
|
|
||||||
create_msg["bitrate"] = bitrate
|
|
||||||
create_response, err := handle.Request(ctx, create_msg)
|
|
||||||
if err != nil {
|
|
||||||
if _, err2 := handle.Detach(ctx); err2 != nil {
|
|
||||||
log.Printf("Error detaching handle %d: %s", handle.Id, err2)
|
|
||||||
}
|
|
||||||
return nil, 0, 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
roomId = getPluginIntValue(create_response.PluginData, pluginVideoRoom, "room")
|
|
||||||
if roomId == 0 {
|
|
||||||
if _, err := handle.Detach(ctx); err != nil {
|
|
||||||
log.Printf("Error detaching handle %d: %s", handle.Id, err)
|
|
||||||
}
|
|
||||||
return nil, 0, 0, fmt.Errorf("No room id received: %+v", create_response)
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Println("Created room", roomId, create_response.PluginData)
|
|
||||||
} else {
|
} else {
|
||||||
log.Println("Use existing room", roomId)
|
maxBitrate = m.maxStreamBitrate
|
||||||
}
|
}
|
||||||
|
if bitrate <= 0 {
|
||||||
|
bitrate = maxBitrate
|
||||||
|
} else {
|
||||||
|
bitrate = min(bitrate, maxBitrate)
|
||||||
|
}
|
||||||
|
create_msg["bitrate"] = bitrate
|
||||||
|
create_response, err := handle.Request(ctx, create_msg)
|
||||||
|
if err != nil {
|
||||||
|
if _, err2 := handle.Detach(ctx); err2 != nil {
|
||||||
|
log.Printf("Error detaching handle %d: %s", handle.Id, err2)
|
||||||
|
}
|
||||||
|
return nil, 0, 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
roomId := getPluginIntValue(create_response.PluginData, pluginVideoRoom, "room")
|
||||||
|
if roomId == 0 {
|
||||||
|
if _, err := handle.Detach(ctx); err != nil {
|
||||||
|
log.Printf("Error detaching handle %d: %s", handle.Id, err)
|
||||||
|
}
|
||||||
|
return nil, 0, 0, fmt.Errorf("No room id received: %+v", create_response)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Println("Created room", roomId, create_response.PluginData)
|
||||||
|
|
||||||
msg := map[string]interface{}{
|
msg := map[string]interface{}{
|
||||||
"request": "join",
|
"request": "join",
|
||||||
|
@ -696,16 +688,14 @@ func (m *mcuJanus) NewPublisher(ctx context.Context, listener McuListener, id st
|
||||||
client.mcuJanusClient.handleDetached = client.handleDetached
|
client.mcuJanusClient.handleDetached = client.handleDetached
|
||||||
client.mcuJanusClient.handleConnected = client.handleConnected
|
client.mcuJanusClient.handleConnected = client.handleConnected
|
||||||
client.mcuJanusClient.handleSlowLink = client.handleSlowLink
|
client.mcuJanusClient.handleSlowLink = client.handleSlowLink
|
||||||
m.mu.Lock()
|
|
||||||
m.publisherRoomIds[id+"|"+streamType] = roomId
|
|
||||||
m.mu.Unlock()
|
|
||||||
|
|
||||||
m.registerClient(client)
|
m.registerClient(client)
|
||||||
if err := client.publishNats("created"); err != nil {
|
|
||||||
log.Printf("Could not publish \"created\" event for publisher %s: %s\n", id, err)
|
|
||||||
}
|
|
||||||
log.Printf("Publisher %s is using handle %d", client.id, client.handleId)
|
log.Printf("Publisher %s is using handle %d", client.id, client.handleId)
|
||||||
go client.run(handle, client.closeChan)
|
go client.run(handle, client.closeChan)
|
||||||
|
m.mu.Lock()
|
||||||
|
m.publishers[id+"|"+streamType] = client
|
||||||
|
m.publisherCreated.Notify(id + "|" + streamType)
|
||||||
|
m.mu.Unlock()
|
||||||
return client, nil
|
return client, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -738,9 +728,7 @@ func (p *mcuJanusPublisher) handleDetached(event *janus.DetachedMsg) {
|
||||||
|
|
||||||
func (p *mcuJanusPublisher) handleConnected(event *janus.WebRTCUpMsg) {
|
func (p *mcuJanusPublisher) handleConnected(event *janus.WebRTCUpMsg) {
|
||||||
log.Printf("Publisher %d received connected", p.handleId)
|
log.Printf("Publisher %d received connected", p.handleId)
|
||||||
if err := p.publishNats("connected"); err != nil {
|
p.mcu.publisherConnected.Notify(p.id + "|" + p.streamType)
|
||||||
log.Printf("Could not publish \"connected\" event for publisher %s: %s\n", p.id, err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *mcuJanusPublisher) handleSlowLink(event *janus.SlowLinkMsg) {
|
func (p *mcuJanusPublisher) handleSlowLink(event *janus.SlowLinkMsg) {
|
||||||
|
@ -751,10 +739,6 @@ func (p *mcuJanusPublisher) handleSlowLink(event *janus.SlowLinkMsg) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *mcuJanusPublisher) publishNats(messageType string) error {
|
|
||||||
return p.mcu.nats.PublishNats("publisher-"+p.id+"|"+p.streamType, &NatsMessage{Type: messageType})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *mcuJanusPublisher) NotifyReconnected() {
|
func (p *mcuJanusPublisher) NotifyReconnected() {
|
||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
handle, session, roomId, err := p.mcu.getOrCreatePublisherHandle(ctx, p.id, p.streamType, p.bitrate)
|
handle, session, roomId, err := p.mcu.getOrCreatePublisherHandle(ctx, p.id, p.streamType, p.bitrate)
|
||||||
|
@ -769,9 +753,6 @@ func (p *mcuJanusPublisher) NotifyReconnected() {
|
||||||
p.session = session
|
p.session = session
|
||||||
p.roomId = roomId
|
p.roomId = roomId
|
||||||
|
|
||||||
p.mcu.mu.Lock()
|
|
||||||
p.mcu.publisherRoomIds[p.id+"|"+p.streamType] = roomId
|
|
||||||
p.mcu.mu.Unlock()
|
|
||||||
log.Printf("Publisher %s reconnected on handle %d", p.id, p.handleId)
|
log.Printf("Publisher %s reconnected on handle %d", p.id, p.handleId)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -789,7 +770,7 @@ func (p *mcuJanusPublisher) Close(ctx context.Context) {
|
||||||
log.Printf("Room %d destroyed", p.roomId)
|
log.Printf("Room %d destroyed", p.roomId)
|
||||||
}
|
}
|
||||||
p.mcu.mu.Lock()
|
p.mcu.mu.Lock()
|
||||||
delete(p.mcu.publisherRoomIds, p.id+"|"+p.streamType)
|
delete(p.mcu.publishers, p.id+"|"+p.streamType)
|
||||||
p.mcu.mu.Unlock()
|
p.mcu.mu.Unlock()
|
||||||
p.roomId = 0
|
p.roomId = 0
|
||||||
notify = true
|
notify = true
|
||||||
|
@ -833,134 +814,52 @@ type mcuJanusSubscriber struct {
|
||||||
publisher string
|
publisher string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *mcuJanus) lookupPublisherRoom(ctx context.Context, publisher string, streamType string) (uint64, error) {
|
func (m *mcuJanus) getPublisher(ctx context.Context, publisher string, streamType string) (*mcuJanusPublisher, error) {
|
||||||
handle := m.handle
|
|
||||||
if handle == nil {
|
|
||||||
return 0, ErrNotConnected
|
|
||||||
}
|
|
||||||
list_msg := map[string]interface{}{
|
|
||||||
"request": "list",
|
|
||||||
}
|
|
||||||
response_msg, err := handle.Request(ctx, list_msg)
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
list, found := response_msg.PluginData.Data["list"]
|
|
||||||
if !found {
|
|
||||||
return 0, fmt.Errorf("no room list received")
|
|
||||||
}
|
|
||||||
|
|
||||||
entries, ok := list.([]interface{})
|
|
||||||
if !ok {
|
|
||||||
return 0, fmt.Errorf("Unsupported list received: %+v (%s)", list, reflect.TypeOf(list))
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, entry := range entries {
|
|
||||||
if entry, ok := entry.(map[string]interface{}); ok {
|
|
||||||
description, found := entry["description"]
|
|
||||||
if !found {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if description, ok := description.(string); ok {
|
|
||||||
if description != publisher+"|"+streamType {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
roomIdInterface, found := entry["room"]
|
|
||||||
if !found {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
roomId, err := convertIntValue(roomIdInterface)
|
|
||||||
if err != nil {
|
|
||||||
return 0, fmt.Errorf("Invalid room id received: %+v: %s", entry, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return roomId, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mcuJanus) searchPublisherRoom(ctx context.Context, publisher string, streamType string) (uint64, error) {
|
|
||||||
// Check for publishers connected to this signaling server.
|
|
||||||
m.mu.Lock()
|
|
||||||
roomId, found := m.publisherRoomIds[publisher+"|"+streamType]
|
|
||||||
m.mu.Unlock()
|
|
||||||
if found {
|
|
||||||
return roomId, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for publishers connected to a different signaling server.
|
|
||||||
roomId, err := m.lookupPublisherRoom(ctx, publisher, streamType)
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return roomId, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mcuJanus) getPublisherRoomId(ctx context.Context, publisher string, streamType string) (uint64, error) {
|
|
||||||
// Do the direct check immediately as this should be the normal case.
|
// Do the direct check immediately as this should be the normal case.
|
||||||
|
key := publisher + "|" + streamType
|
||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
roomId, found := m.publisherRoomIds[publisher+"|"+streamType]
|
if result, found := m.publishers[key]; found {
|
||||||
if found {
|
|
||||||
m.mu.Unlock()
|
m.mu.Unlock()
|
||||||
return roomId, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
wakeupChan := make(chan *nats.Msg, 1)
|
waiter := m.publisherCreated.NewWaiter(key)
|
||||||
sub, err := m.nats.Subscribe("publisher-"+publisher+"|"+streamType, wakeupChan)
|
|
||||||
m.mu.Unlock()
|
m.mu.Unlock()
|
||||||
if err != nil {
|
defer m.publisherCreated.Release(waiter)
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if err := sub.Unsubscribe(); err != nil {
|
|
||||||
log.Printf("Error unsubscribing channel for %s publisher %s: %s", streamType, publisher, err)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
for roomId == 0 {
|
for {
|
||||||
var err error
|
m.mu.Lock()
|
||||||
if roomId, err = m.searchPublisherRoom(ctx, publisher, streamType); err != nil {
|
result := m.publishers[key]
|
||||||
log.Printf("Could not search for room of publisher %s: %s", publisher, err)
|
m.mu.Unlock()
|
||||||
} else if roomId > 0 {
|
if result != nil {
|
||||||
break
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
select {
|
if err := waiter.Wait(ctx); err != nil {
|
||||||
case <-wakeupChan:
|
return nil, err
|
||||||
// We got the wakeup event through NATS, the publisher should be
|
|
||||||
// ready now.
|
|
||||||
case <-ctx.Done():
|
|
||||||
return 0, ctx.Err()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return roomId, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *mcuJanus) getOrCreateSubscriberHandle(ctx context.Context, publisher string, streamType string) (*JanusHandle, uint64, error) {
|
func (m *mcuJanus) getOrCreateSubscriberHandle(ctx context.Context, publisher string, streamType string) (*JanusHandle, *mcuJanusPublisher, error) {
|
||||||
var roomId uint64
|
var pub *mcuJanusPublisher
|
||||||
var err error
|
var err error
|
||||||
if roomId, err = m.getPublisherRoomId(ctx, publisher, streamType); err != nil {
|
if pub, err = m.getPublisher(ctx, publisher, streamType); err != nil {
|
||||||
return nil, 0, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
session := m.session
|
session := m.session
|
||||||
if session == nil {
|
if session == nil {
|
||||||
return nil, 0, ErrNotConnected
|
return nil, nil, ErrNotConnected
|
||||||
}
|
}
|
||||||
|
|
||||||
handle, err := session.Attach(ctx, pluginVideoRoom)
|
handle, err := session.Attach(ctx, pluginVideoRoom)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Printf("Attached subscriber to room %d of publisher %s in plugin %s in session %d as %d", roomId, publisher, pluginVideoRoom, session.Id, handle.Id)
|
log.Printf("Attached subscriber to room %d of publisher %s in plugin %s in session %d as %d", pub.roomId, publisher, pluginVideoRoom, session.Id, handle.Id)
|
||||||
return handle, roomId, nil
|
return handle, pub, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *mcuJanus) NewSubscriber(ctx context.Context, listener McuListener, publisher string, streamType string) (McuSubscriber, error) {
|
func (m *mcuJanus) NewSubscriber(ctx context.Context, listener McuListener, publisher string, streamType string) (McuSubscriber, error) {
|
||||||
|
@ -968,7 +867,7 @@ func (m *mcuJanus) NewSubscriber(ctx context.Context, listener McuListener, publ
|
||||||
return nil, fmt.Errorf("Unsupported stream type %s", streamType)
|
return nil, fmt.Errorf("Unsupported stream type %s", streamType)
|
||||||
}
|
}
|
||||||
|
|
||||||
handle, roomId, err := m.getOrCreateSubscriberHandle(ctx, publisher, streamType)
|
handle, pub, err := m.getOrCreateSubscriberHandle(ctx, publisher, streamType)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -979,7 +878,7 @@ func (m *mcuJanus) NewSubscriber(ctx context.Context, listener McuListener, publ
|
||||||
listener: listener,
|
listener: listener,
|
||||||
|
|
||||||
id: atomic.AddUint64(&m.clientId, 1),
|
id: atomic.AddUint64(&m.clientId, 1),
|
||||||
roomId: roomId,
|
roomId: pub.roomId,
|
||||||
streamType: streamType,
|
streamType: streamType,
|
||||||
|
|
||||||
handle: handle,
|
handle: handle,
|
||||||
|
@ -1047,7 +946,7 @@ func (p *mcuJanusSubscriber) handleSlowLink(event *janus.SlowLinkMsg) {
|
||||||
func (p *mcuJanusSubscriber) NotifyReconnected() {
|
func (p *mcuJanusSubscriber) NotifyReconnected() {
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), p.mcu.mcuTimeout)
|
ctx, cancel := context.WithTimeout(context.Background(), p.mcu.mcuTimeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
handle, roomId, err := p.mcu.getOrCreateSubscriberHandle(ctx, p.publisher, p.streamType)
|
handle, pub, err := p.mcu.getOrCreateSubscriberHandle(ctx, p.publisher, p.streamType)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// TODO(jojo): Retry?
|
// TODO(jojo): Retry?
|
||||||
log.Printf("Could not reconnect subscriber for publisher %s: %s\n", p.publisher, err)
|
log.Printf("Could not reconnect subscriber for publisher %s: %s\n", p.publisher, err)
|
||||||
|
@ -1057,7 +956,7 @@ func (p *mcuJanusSubscriber) NotifyReconnected() {
|
||||||
|
|
||||||
p.handle = handle
|
p.handle = handle
|
||||||
p.handleId = handle.Id
|
p.handleId = handle.Id
|
||||||
p.roomId = roomId
|
p.roomId = pub.roomId
|
||||||
log.Printf("Subscriber %d for publisher %s reconnected on handle %d", p.id, p.publisher, p.handleId)
|
log.Printf("Subscriber %d for publisher %s reconnected on handle %d", p.id, p.publisher, p.handleId)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1077,17 +976,8 @@ func (p *mcuJanusSubscriber) joinRoom(ctx context.Context, callback func(error,
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
wakeupChan := make(chan *nats.Msg, 1)
|
waiter := p.mcu.publisherConnected.NewWaiter(p.publisher + "|" + p.streamType)
|
||||||
sub, err := p.mcu.nats.Subscribe("publisher-"+p.publisher+"|"+p.streamType, wakeupChan)
|
defer p.mcu.publisherConnected.Release(waiter)
|
||||||
if err != nil {
|
|
||||||
callback(err, nil)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if err := sub.Unsubscribe(); err != nil {
|
|
||||||
log.Printf("Error unsubscribing channel for %s publisher %s: %s", p.streamType, p.publisher, err)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
retry:
|
retry:
|
||||||
join_msg := map[string]interface{}{
|
join_msg := map[string]interface{}{
|
||||||
|
@ -1115,8 +1005,8 @@ retry:
|
||||||
p.closeClient(ctx)
|
p.closeClient(ctx)
|
||||||
p.mu.Unlock()
|
p.mu.Unlock()
|
||||||
|
|
||||||
var roomId uint64
|
var pub *mcuJanusPublisher
|
||||||
handle, roomId, err = p.mcu.getOrCreateSubscriberHandle(ctx, p.publisher, p.streamType)
|
handle, pub, err = p.mcu.getOrCreateSubscriberHandle(ctx, p.publisher, p.streamType)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Reconnection didn't work, need to unregister/remove subscriber
|
// Reconnection didn't work, need to unregister/remove subscriber
|
||||||
// so a new object will be created if the request is retried.
|
// so a new object will be created if the request is retried.
|
||||||
|
@ -1128,7 +1018,7 @@ retry:
|
||||||
|
|
||||||
p.handle = handle
|
p.handle = handle
|
||||||
p.handleId = handle.Id
|
p.handleId = handle.Id
|
||||||
p.roomId = roomId
|
p.roomId = pub.roomId
|
||||||
p.closeChan = make(chan bool, 1)
|
p.closeChan = make(chan bool, 1)
|
||||||
go p.run(p.handle, p.closeChan)
|
go p.run(p.handle, p.closeChan)
|
||||||
log.Printf("Already connected subscriber %d for %s, leaving and re-joining on handle %d", p.id, p.streamType, p.handleId)
|
log.Printf("Already connected subscriber %d for %s, leaving and re-joining on handle %d", p.id, p.streamType, p.handleId)
|
||||||
|
@ -1142,22 +1032,12 @@ retry:
|
||||||
case JANUS_VIDEOROOM_ERROR_NO_SUCH_FEED:
|
case JANUS_VIDEOROOM_ERROR_NO_SUCH_FEED:
|
||||||
log.Printf("Publisher %s not sending yet for %s, wait and retry to join room %d as subscriber", p.publisher, p.streamType, p.roomId)
|
log.Printf("Publisher %s not sending yet for %s, wait and retry to join room %d as subscriber", p.publisher, p.streamType, p.roomId)
|
||||||
}
|
}
|
||||||
wait:
|
|
||||||
select {
|
if err := waiter.Wait(ctx); err != nil {
|
||||||
case msg := <-wakeupChan:
|
callback(err, nil)
|
||||||
var message NatsMessage
|
|
||||||
if err := p.mcu.nats.Decode(msg, &message); err != nil {
|
|
||||||
log.Printf("Error decoding wakeup NATS message %s (%s)\n", string(msg.Data), err)
|
|
||||||
goto wait
|
|
||||||
} else if message.Type != "connected" {
|
|
||||||
log.Printf("Unsupported NATS message waiting for publisher %s: %+v\n", p.publisher, message)
|
|
||||||
goto wait
|
|
||||||
}
|
|
||||||
log.Printf("Retry subscribing %s from %s", p.streamType, p.publisher)
|
|
||||||
case <-ctx.Done():
|
|
||||||
callback(ctx.Err(), nil)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
log.Printf("Retry subscribing %s from %s", p.streamType, p.publisher)
|
||||||
goto retry
|
goto retry
|
||||||
default:
|
default:
|
||||||
// TODO(jojo): Should we handle other errors, too?
|
// TODO(jojo): Should we handle other errors, too?
|
||||||
|
|
100
notifier.go
Normal file
100
notifier.go
Normal file
|
@ -0,0 +1,100 @@
|
||||||
|
/**
|
||||||
|
* Standalone signaling server for the Nextcloud Spreed app.
|
||||||
|
* Copyright (C) 2021 struktur AG
|
||||||
|
*
|
||||||
|
* @author Joachim Bauch <bauch@struktur.de>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package signaling
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Waiter struct {
|
||||||
|
key string
|
||||||
|
ch chan bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *Waiter) Wait(ctx context.Context) error {
|
||||||
|
select {
|
||||||
|
case <-w.ch:
|
||||||
|
return nil
|
||||||
|
case <-ctx.Done():
|
||||||
|
return ctx.Err()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type Notifier struct {
|
||||||
|
sync.Mutex
|
||||||
|
|
||||||
|
waiters map[string]*Waiter
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *Notifier) NewWaiter(key string) *Waiter {
|
||||||
|
n.Lock()
|
||||||
|
defer n.Unlock()
|
||||||
|
|
||||||
|
_, found := n.waiters[key]
|
||||||
|
if found {
|
||||||
|
panic("already waiting")
|
||||||
|
}
|
||||||
|
|
||||||
|
waiter := &Waiter{
|
||||||
|
key: key,
|
||||||
|
ch: make(chan bool, 1),
|
||||||
|
}
|
||||||
|
if n.waiters == nil {
|
||||||
|
n.waiters = make(map[string]*Waiter)
|
||||||
|
}
|
||||||
|
n.waiters[key] = waiter
|
||||||
|
return waiter
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *Notifier) Reset() {
|
||||||
|
n.Lock()
|
||||||
|
defer n.Unlock()
|
||||||
|
|
||||||
|
for _, w := range n.waiters {
|
||||||
|
close(w.ch)
|
||||||
|
}
|
||||||
|
n.waiters = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *Notifier) Release(w *Waiter) {
|
||||||
|
n.Lock()
|
||||||
|
defer n.Unlock()
|
||||||
|
|
||||||
|
if _, found := n.waiters[w.key]; found {
|
||||||
|
delete(n.waiters, w.key)
|
||||||
|
close(w.ch)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *Notifier) Notify(key string) {
|
||||||
|
n.Lock()
|
||||||
|
defer n.Unlock()
|
||||||
|
|
||||||
|
if w, found := n.waiters[key]; found {
|
||||||
|
select {
|
||||||
|
case w.ch <- true:
|
||||||
|
default:
|
||||||
|
// Ignore, already notified
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
120
notifier_test.go
Normal file
120
notifier_test.go
Normal file
|
@ -0,0 +1,120 @@
|
||||||
|
/**
|
||||||
|
* Standalone signaling server for the Nextcloud Spreed app.
|
||||||
|
* Copyright (C) 2021 struktur AG
|
||||||
|
*
|
||||||
|
* @author Joachim Bauch <bauch@struktur.de>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package signaling
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestNotifierNoWaiter(t *testing.T) {
|
||||||
|
var notifier Notifier
|
||||||
|
|
||||||
|
// Notifications can be sent even if no waiter exists.
|
||||||
|
notifier.Notify("foo")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNotifierSimple(t *testing.T) {
|
||||||
|
var notifier Notifier
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
wg.Add(1)
|
||||||
|
|
||||||
|
waiter := notifier.NewWaiter("foo")
|
||||||
|
defer notifier.Release(waiter)
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
|
||||||
|
defer cancel()
|
||||||
|
if err := waiter.Wait(ctx); err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
notifier.Notify("foo")
|
||||||
|
wg.Wait()
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNotifierMultiNotify(t *testing.T) {
|
||||||
|
var notifier Notifier
|
||||||
|
|
||||||
|
waiter := notifier.NewWaiter("foo")
|
||||||
|
defer notifier.Release(waiter)
|
||||||
|
|
||||||
|
notifier.Notify("foo")
|
||||||
|
// The second notification will be ignored while the first is still pending.
|
||||||
|
notifier.Notify("foo")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNotifierWaitClosed(t *testing.T) {
|
||||||
|
var notifier Notifier
|
||||||
|
|
||||||
|
waiter := notifier.NewWaiter("foo")
|
||||||
|
notifier.Release(waiter)
|
||||||
|
|
||||||
|
if err := waiter.Wait(context.Background()); err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNotifierResetWillNotify(t *testing.T) {
|
||||||
|
var notifier Notifier
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
wg.Add(1)
|
||||||
|
|
||||||
|
waiter := notifier.NewWaiter("foo")
|
||||||
|
defer notifier.Release(waiter)
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
|
||||||
|
defer cancel()
|
||||||
|
if err := waiter.Wait(ctx); err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
notifier.Reset()
|
||||||
|
wg.Wait()
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNotifierDuplicate(t *testing.T) {
|
||||||
|
var notifier Notifier
|
||||||
|
|
||||||
|
waiter := notifier.NewWaiter("foo")
|
||||||
|
defer notifier.Release(waiter)
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
if e := recover(); e != nil {
|
||||||
|
if e.(string) != "already waiting" {
|
||||||
|
t.Errorf("Expected error about already waiting, got %+v", e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Creating a waiter for an existing key will panic.
|
||||||
|
notifier.NewWaiter("foo")
|
||||||
|
}
|
|
@ -20,13 +20,6 @@
|
||||||
# - etcd: Token information are retrieved from an etcd cluster (see below).
|
# - etcd: Token information are retrieved from an etcd cluster (see below).
|
||||||
tokentype = static
|
tokentype = static
|
||||||
|
|
||||||
[nats]
|
|
||||||
# Url of NATS backend to use. This can also be a list of URLs to connect to
|
|
||||||
# multiple backends. For local development, this can be set to ":loopback:"
|
|
||||||
# to process NATS messages internally instead of sending them through an
|
|
||||||
# external NATS backend.
|
|
||||||
#url = nats://localhost:4222
|
|
||||||
|
|
||||||
[tokens]
|
[tokens]
|
||||||
# For token type "static": Mapping of <tokenid> = <publickey> of signaling
|
# For token type "static": Mapping of <tokenid> = <publickey> of signaling
|
||||||
# servers allowed to connect.
|
# servers allowed to connect.
|
||||||
|
|
|
@ -36,9 +36,6 @@ import (
|
||||||
|
|
||||||
"github.com/dlintw/goconf"
|
"github.com/dlintw/goconf"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/nats-io/nats.go"
|
|
||||||
|
|
||||||
signaling "github.com/strukturag/nextcloud-spreed-signaling"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -81,19 +78,9 @@ func main() {
|
||||||
runtime.GOMAXPROCS(cpus)
|
runtime.GOMAXPROCS(cpus)
|
||||||
log.Printf("Using a maximum of %d CPUs\n", cpus)
|
log.Printf("Using a maximum of %d CPUs\n", cpus)
|
||||||
|
|
||||||
natsUrl, _ := config.GetString("nats", "url")
|
|
||||||
if natsUrl == "" {
|
|
||||||
natsUrl = nats.DefaultURL
|
|
||||||
}
|
|
||||||
|
|
||||||
nats, err := signaling.NewNatsClient(natsUrl)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Could not create NATS client: ", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
r := mux.NewRouter()
|
r := mux.NewRouter()
|
||||||
|
|
||||||
proxy, err := NewProxyServer(r, version, config, nats)
|
proxy, err := NewProxyServer(r, version, config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,7 +88,6 @@ type ProxyServer struct {
|
||||||
country string
|
country string
|
||||||
|
|
||||||
url string
|
url string
|
||||||
nats signaling.NatsClient
|
|
||||||
mcu signaling.Mcu
|
mcu signaling.Mcu
|
||||||
stopped uint32
|
stopped uint32
|
||||||
|
|
||||||
|
@ -110,7 +109,7 @@ type ProxyServer struct {
|
||||||
clientsLock sync.RWMutex
|
clientsLock sync.RWMutex
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewProxyServer(r *mux.Router, version string, config *goconf.ConfigFile, nats signaling.NatsClient) (*ProxyServer, error) {
|
func NewProxyServer(r *mux.Router, version string, config *goconf.ConfigFile) (*ProxyServer, error) {
|
||||||
hashKey := make([]byte, 64)
|
hashKey := make([]byte, 64)
|
||||||
if _, err := rand.Read(hashKey); err != nil {
|
if _, err := rand.Read(hashKey); err != nil {
|
||||||
return nil, fmt.Errorf("Could not generate random hash key: %s", err)
|
return nil, fmt.Errorf("Could not generate random hash key: %s", err)
|
||||||
|
@ -172,8 +171,6 @@ func NewProxyServer(r *mux.Router, version string, config *goconf.ConfigFile, na
|
||||||
version: version,
|
version: version,
|
||||||
country: country,
|
country: country,
|
||||||
|
|
||||||
nats: nats,
|
|
||||||
|
|
||||||
shutdownChannel: make(chan bool, 1),
|
shutdownChannel: make(chan bool, 1),
|
||||||
|
|
||||||
upgrader: websocket.Upgrader{
|
upgrader: websocket.Upgrader{
|
||||||
|
@ -238,7 +235,7 @@ func (s *ProxyServer) Start(config *goconf.ConfigFile) error {
|
||||||
for {
|
for {
|
||||||
switch mcuType {
|
switch mcuType {
|
||||||
case signaling.McuTypeJanus:
|
case signaling.McuTypeJanus:
|
||||||
mcu, err = signaling.NewMcuJanus(s.url, config, s.nats)
|
mcu, err = signaling.NewMcuJanus(s.url, config)
|
||||||
default:
|
default:
|
||||||
return fmt.Errorf("Unsupported MCU type: %s", mcuType)
|
return fmt.Errorf("Unsupported MCU type: %s", mcuType)
|
||||||
}
|
}
|
||||||
|
|
|
@ -175,7 +175,7 @@ func main() {
|
||||||
for {
|
for {
|
||||||
switch mcuType {
|
switch mcuType {
|
||||||
case signaling.McuTypeJanus:
|
case signaling.McuTypeJanus:
|
||||||
mcu, err = signaling.NewMcuJanus(mcuUrl, config, nats)
|
mcu, err = signaling.NewMcuJanus(mcuUrl, config)
|
||||||
case signaling.McuTypeProxy:
|
case signaling.McuTypeProxy:
|
||||||
mcu, err = signaling.NewMcuProxy(config)
|
mcu, err = signaling.NewMcuProxy(config)
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in a new issue