🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Assign event ids in the main loop, to avoid out-of-order events
Deluan0c2ca2a5e48f
diff --git a/server/events/sse.go b/server/events/sse.goindex 30c5d404d..96429ad67 100644--- a/server/events/sse.go+++ b/server/events/sse.go@@ -95,7 +95,6 @@ func (b *broker) SendMessage(ctx context.Context, evt Event) {func (b *broker) prepareMessage(ctx context.Context, event Event) message {msg := message{}- msg.id = atomic.AddUint32(&eventId, 1)msg.data = event.Data(event)msg.event = event.Name(event)msg.senderCtx = ctx@@ -212,8 +211,9 @@ func (b *broker) listen() {log.Debug("Client added to event broker", "numClients", len(clients), "newClient", c.String())// Send a serverStart event to new client- c.diode.put(b.prepareMessage(context.Background(),- &ServerStart{StartTime: consts.ServerStart, Version: consts.Version()}))+ msg := b.prepareMessage(context.Background(),+ &ServerStart{StartTime: consts.ServerStart, Version: consts.Version()})+ c.diode.put(msg)case c := <-b.unsubscribing:// A client has detached and we want to@@ -221,14 +221,15 @@ func (b *broker) listen() {delete(clients, c)log.Debug("Removed client from event broker", "numClients", len(clients), "client", c.String())- case event := <-b.publish:- log.Trace("Got new published event", "event", event)+ case msg := <-b.publish:+ msg.id = atomic.AddUint32(&eventId, 1)+ log.Trace("Got new published event", "event", msg)// We got a new event from the outside!// Send event to all connected clientsfor c := range clients {- if b.shouldSend(event, c) {- log.Trace("Putting event on client's queue", "client", c.String(), "event", event)- c.diode.put(event)+ if b.shouldSend(msg, c) {+ log.Trace("Putting event on client's queue", "client", c.String(), "event", msg)+ c.diode.put(msg)}}