refactor: rename app to bus

core/app/app.go → core/bus/bus.go

@@ -1,4 +1,4 @@
-package app
+package bus
 
 import (
 	"context"
@@ -8,30 +8,30 @@ import (
 	"github.com/ItsNotGoodName/reciva-web-remote/core/state"
 )
 
-type App struct {
+type BusServiceImpl struct {
 	hubService   radio.HubService
 	radioService radio.RadioService
 	statePub     state.Pub
 }
 
-func New(hubService radio.HubService, radioService radio.RadioService, statePub state.Pub) *App {
-	return &App{
+func New(hubService radio.HubService, radioService radio.RadioService, statePub state.Pub) *BusServiceImpl {
+	return &BusServiceImpl{
 		hubService:   hubService,
 		radioService: radioService,
 		statePub:     statePub,
 	}
 }
 
-func (a *App) StateGet(ctx context.Context, uuid string) (*state.State, error) {
-	radio, err := a.hubService.Get(uuid)
+func (bs *BusServiceImpl) stateGet(ctx context.Context, uuid string) (*state.State, error) {
+	radio, err := bs.hubService.Get(uuid)
 	if err != nil {
 		return nil, err
 	}
 
-	return a.radioService.GetState(ctx, radio)
+	return bs.radioService.GetState(ctx, radio)
 }
 
-func (a *App) Bus(ctx context.Context, readC <-chan Command, writeC chan<- Command) {
+func (bs *BusServiceImpl) Handle(ctx context.Context, readC <-chan Command, writeC chan<- Command) {
 	stateUUID := ""
 	stateSub, stateUnsub := make(<-chan state.Message), func() {}
 	defer stateUnsub()
@@ -43,32 +43,32 @@ func (a *App) Bus(ctx context.Context, readC <-chan Command, writeC chan<- Comma
 		case msg := <-stateSub:
 			// Write state or state partial
 			if state.IsChangedAll(msg.Changed) {
-				writeCommand(ctx, writeC, NewStateCommand(&msg.State))
+				writeCommand(ctx, writeC, newStateCommand(&msg.State))
 			} else {
-				writeCommand(ctx, writeC, NewStatePartialCommand(state.GetPartial(&msg.State, msg.Changed)))
+				writeCommand(ctx, writeC, newStatePartialCommand(state.GetPartial(&msg.State, msg.Changed)))
 			}
 		case dto := <-readC:
 			switch dto.Type {
 			case TypeStateSubscribe:
 				stateUUID = fmt.Sprint(dto.Slug)
 				if stateUUID == "" {
-					writeCommand(ctx, writeC, NewErrorCommand(fmt.Errorf("invalid uuid")))
+					writeCommand(ctx, writeC, newErrorCommand(fmt.Errorf("invalid uuid")))
 					continue
 				}
 
 				// Subscribe to state
 				stateUnsub()
-				stateSub, stateUnsub = a.statePub.Subscribe(stateUUID)
+				stateSub, stateUnsub = bs.statePub.Subscribe(stateUUID)
 
 				// Get state
-				state, err := a.StateGet(ctx, stateUUID)
+				state, err := bs.stateGet(ctx, stateUUID)
 				if err != nil {
-					writeCommand(ctx, writeC, NewErrorCommand(err))
+					writeCommand(ctx, writeC, newErrorCommand(err))
 					continue
 				}
 
 				// Write state
-				writeCommand(ctx, writeC, NewStateCommand(state))
+				writeCommand(ctx, writeC, newStateCommand(state))
 			case TypeStateUnsubscribe:
 				// Unsubscribe from radio
 				stateUnsub()

core/app/dto.go → core/bus/type.go

@@ -1,15 +1,23 @@
-package app
+package bus
 
 import (
+	"context"
+
 	"github.com/ItsNotGoodName/reciva-web-remote/core/state"
 )
 
-type Command struct {
-	Type Type        `json:"type"`
-	Slug interface{} `json:"slug"`
-}
+type (
+	Type string
+
+	Command struct {
+		Type Type        `json:"type"`
+		Slug interface{} `json:"slug"`
+	}
 
-type Type string
+	Service interface {
+		Handle(ctx context.Context, readC <-chan Command, writeC chan<- Command)
+	}
+)
 
 const (
 	TypeError            = Type("error")
@@ -19,21 +27,21 @@ const (
 	TypeStateUnsubscribe = Type("state.unsubscribe")
 )
 
-func NewErrorCommand(err error) Command {
+func newErrorCommand(err error) Command {
 	return Command{
 		Type: TypeError,
 		Slug: err.Error(),
 	}
 }
 
-func NewStateCommand(state *state.State) Command {
+func newStateCommand(state *state.State) Command {
 	return Command{
 		Type: TypeState,
 		Slug: state,
 	}
 }
 
-func NewStatePartialCommand(partial state.Partial) Command {
+func newStatePartialCommand(partial state.Partial) Command {
 	return Command{
 		Type: TypeStatePartial,
 		Slug: partial,

core/app/util.go → core/bus/util.go

@@ -1,4 +1,4 @@
-package app
+package bus
 
 import "context"
 

left/api/ws.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/ItsNotGoodName/reciva-web-remote/core/app"
+	"github.com/ItsNotGoodName/reciva-web-remote/core/bus"
 	"github.com/gorilla/websocket"
 )
 
@@ -22,11 +22,11 @@ func GetWS(upgrader *websocket.Upgrader, handleWS func(*websocket.Conn)) http.Ha
 	}
 }
 
-func HandleWS(application *app.App) func(conn *websocket.Conn) {
+func HandleWS(busService bus.Service) func(conn *websocket.Conn) {
 	return func(conn *websocket.Conn) {
 		ctx, cancel := context.WithCancel(context.Background())
 
-		application.Bus(
+		busService.Handle(
 			ctx,
 			wsHandleRead(ctx, cancel, conn),
 			wsHandleWrite(ctx, cancel, conn),
@@ -48,8 +48,8 @@ const (
 	wsMaxMessageSize = 512
 )
 
-func wsHandleWrite(ctx context.Context, cancel context.CancelFunc, conn *websocket.Conn) chan<- app.Command {
-	writeC := make(chan app.Command)
+func wsHandleWrite(ctx context.Context, cancel context.CancelFunc, conn *websocket.Conn) chan<- bus.Command {
+	writeC := make(chan bus.Command)
 	go func() {
 		ticker := time.NewTicker(wsPingPeriod)
 		defer func() {
@@ -85,8 +85,8 @@ func wsHandleWrite(ctx context.Context, cancel context.CancelFunc, conn *websock
 	return writeC
 }
 
-func wsHandleRead(ctx context.Context, cancel context.CancelFunc, conn *websocket.Conn) <-chan app.Command {
-	readC := make(chan app.Command)
+func wsHandleRead(ctx context.Context, cancel context.CancelFunc, conn *websocket.Conn) <-chan bus.Command {
+	readC := make(chan bus.Command)
 	go func() {
 		defer cancel()
 
@@ -96,7 +96,7 @@ func wsHandleRead(ctx context.Context, cancel context.CancelFunc, conn *websocke
 
 		for {
 			// Read msg or end on error
-			var msg app.Command
+			var msg bus.Command
 			err := conn.ReadJSON(&msg)
 			if err != nil {
 				if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {

left/router/router.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/ItsNotGoodName/reciva-web-remote/core/app"
+	"github.com/ItsNotGoodName/reciva-web-remote/core/bus"
 	"github.com/ItsNotGoodName/reciva-web-remote/core/preset"
 	"github.com/ItsNotGoodName/reciva-web-remote/core/radio"
 	"github.com/ItsNotGoodName/reciva-web-remote/left/api"
@@ -26,7 +26,7 @@ type Router struct {
 	r    chi.Router
 }
 
-func New(port string, p presenter.Presenter, fs fs.FS, hub radio.HubService, radioService radio.RadioService, application *app.App, presetStore preset.PresetStore) *Router {
+func New(port string, p presenter.Presenter, fs fs.FS, hub radio.HubService, radioService radio.RadioService, busService bus.Service, presetStore preset.PresetStore) *Router {
 	r := newRouter()
 	upgrader := newUpgrader()
 
@@ -42,7 +42,7 @@ func New(port string, p presenter.Presenter, fs fs.FS, hub radio.HubService, rad
 
 	// API routes
 	r.Route("/api", func(r chi.Router) {
-		r.Get("/ws", api.GetWS(upgrader, api.HandleWS(application)))
+		r.Get("/ws", api.GetWS(upgrader, api.HandleWS(busService)))
 
 		r.Get("/radios", p(api.GetRadios(hub, radioService)))
 		r.Post("/radios", p(api.PostRadios(hub)))

main.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/ItsNotGoodName/go-upnpsub"
 	"github.com/ItsNotGoodName/reciva-web-remote/config"
-	"github.com/ItsNotGoodName/reciva-web-remote/core/app"
 	"github.com/ItsNotGoodName/reciva-web-remote/core/background"
+	"github.com/ItsNotGoodName/reciva-web-remote/core/bus"
 	"github.com/ItsNotGoodName/reciva-web-remote/core/middleware"
 	"github.com/ItsNotGoodName/reciva-web-remote/core/pubsub"
 	"github.com/ItsNotGoodName/reciva-web-remote/core/radio"
@@ -61,10 +61,10 @@ func main() {
 	backgrounds = append(backgrounds, createService)
 	hubService := radio.NewHubService(createService)
 	backgrounds = append(backgrounds, hubService)
-	application := app.New(hubService, radioService, statePub)
+	busService := bus.New(hubService, radioService, statePub)
 
 	// Left
-	router := router.New(cfg.PortStr, presenter.New(json.Render), web.FS(), hubService, radioService, application, middlewareAndPresetStore)
+	router := router.New(cfg.PortStr, presenter.New(json.Render), web.FS(), hubService, radioService, busService, middlewareAndPresetStore)
 	backgrounds = append(backgrounds, router)
 
 	// Run backgrounds