refactor: state, bus, main

core/bus/bus.go

@@ -2,7 +2,6 @@ package bus
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/ItsNotGoodName/reciva-web-remote/core/radio"
 	"github.com/ItsNotGoodName/reciva-web-remote/core/state"
@@ -32,7 +31,6 @@ func (bs *BusServiceImpl) stateGet(ctx context.Context, uuid string) (*state.Sta
 }
 
 func (bs *BusServiceImpl) Handle(ctx context.Context, readC <-chan Command, writeC chan<- Command) {
-	stateUUID := ""
 	stateSub, stateUnsub := make(<-chan state.Message), func() {}
 	defer stateUnsub()
 
@@ -50,9 +48,9 @@ func (bs *BusServiceImpl) Handle(ctx context.Context, readC <-chan Command, writ
 		case dto := <-readC:
 			switch dto.Type {
 			case TypeStateSubscribe:
-				stateUUID = fmt.Sprint(dto.Slug)
-				if stateUUID == "" {
-					writeCommand(ctx, writeC, newErrorCommand(fmt.Errorf("invalid uuid")))
+				stateUUID, err := parseStateSubscribe(dto.Slug)
+				if err != nil {
+					writeCommand(ctx, writeC, newErrorCommand(err))
 					continue
 				}
 
@@ -72,10 +70,6 @@ func (bs *BusServiceImpl) Handle(ctx context.Context, readC <-chan Command, writ
 			case TypeStateUnsubscribe:
 				// Unsubscribe from radio
 				stateUnsub()
-				select {
-				case <-stateSub:
-				default:
-				}
 			}
 		}
 	}

core/bus/type.go

@@ -2,6 +2,7 @@ package bus
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/ItsNotGoodName/reciva-web-remote/core/state"
 )
@@ -27,6 +28,15 @@ const (
 	TypeStateUnsubscribe = Type("state.unsubscribe")
 )
 
+func parseStateSubscribe(slug interface{}) (string, error) {
+	uuid := fmt.Sprint(slug)
+	if uuid == "" {
+		return "", fmt.Errorf("invalid uuid")
+	}
+
+	return uuid, nil
+}
+
 func newErrorCommand(err error) Command {
 	return Command{
 		Type: TypeError,

core/pubsub/state.go

@@ -7,8 +7,8 @@ import (
 )
 
 type StatePub struct {
-	subMapMu sync.Mutex
-	subsMap  map[*chan state.Message]string
+	subsMapMu sync.Mutex
+	subsMap   map[*chan state.Message]string
 }
 
 func NewStatePub() *StatePub {
@@ -20,27 +20,32 @@ func NewStatePub() *StatePub {
 func (sp *StatePub) Subscribe(uuid string) (<-chan state.Message, func()) {
 	sub := make(chan state.Message, 1)
 
-	sp.subMapMu.Lock()
+	sp.subsMapMu.Lock()
 
 	sp.subsMap[&sub] = uuid
 
-	sp.subMapMu.Unlock()
+	sp.subsMapMu.Unlock()
 
 	return sub, sp.unsubscribeFunc(&sub)
 }
 
 func (sp *StatePub) unsubscribeFunc(sub *chan state.Message) func() {
 	return func() {
-		sp.subMapMu.Lock()
+		sp.subsMapMu.Lock()
 
 		delete(sp.subsMap, sub)
 
-		sp.subMapMu.Unlock()
+		sp.subsMapMu.Unlock()
+
+		select {
+		case <-*sub:
+		default:
+		}
 	}
 }
 
 func (sp *StatePub) Publish(s state.State, changed int) {
-	sp.subMapMu.Lock()
+	sp.subsMapMu.Lock()
 
 	msg := state.Message{
 		State: s,
@@ -55,13 +60,13 @@ func (sp *StatePub) Publish(s state.State, changed int) {
 			default:
 				select {
 				case old := <-*sub:
-					msg.Changed |= old.Changed
+					msg.Changed = state.MergeChanged(old.Changed, msg.Changed)
 					*sub <- msg
 				case *sub <- msg:
 				}
 			}
 		}
 	}
 
-	sp.subMapMu.Unlock()
+	sp.subsMapMu.Unlock()
 }

core/state/type.go

@@ -144,6 +144,10 @@ func IsChangedAll(changed int) bool {
 	return changed&ChangedAll == ChangedAll
 }
 
+func MergeChanged(changed int, other int) int {
+	return changed | other
+}
+
 func ValidPresetNumber(s *State, preset int) error {
 	if preset < 1 || preset > len(s.Presets) {
 		return fmt.Errorf("invalid preset number: %d", preset)

main.go

@@ -42,13 +42,10 @@ func main() {
 		return
 	}
 
-	// Backgrounds
-	var backgrounds []background.Background
-
 	// Right
 	presetStore, err := file.NewPresetStore(cfg.ConfigFile)
 	if err != nil {
-		log.Fatalln("Failed to create preset store:", err)
+		log.Fatalln("main.main: failed to create preset store:", err)
 	}
 
 	// Core
@@ -58,14 +55,18 @@ func main() {
 	statePub := pubsub.NewStatePub()
 	runService := radio.NewRunService(middlewareAndPresetStore, middlewarePub, radioService, statePub)
 	createService := radio.NewCreateService(upnpsub.NewControlPoint(upnpsub.WithPort(cfg.CPort)), runService)
-	backgrounds = append(backgrounds, createService)
 	hubService := radio.NewHubService(createService)
-	backgrounds = append(backgrounds, hubService)
 	busService := bus.New(hubService, radioService, statePub)
 
 	// Left
 	router := router.New(cfg.PortStr, presenter.New(json.Render), web.FS(), hubService, radioService, busService, middlewareAndPresetStore)
-	backgrounds = append(backgrounds, router)
+
+	// Backgrounds
+	backgrounds := []background.Background{
+		createService,
+		hubService,
+		router,
+	}
 
 	// Run backgrounds
 	background.Run(interrupt.Context(), backgrounds)