refactor: radio create and discovery

cmd/test/main.go

@@ -41,7 +41,7 @@ func main() {
 	}
 
 	// Create radio
-	radio, err := createService.Create(ctx, clients[0])
+	radio, err := createService.Create(ctx, ctx, clients[0])
 	if err != nil {
 		log.Fatalln("failed to create radio:", err)
 	}

core/radio/create.go

@@ -34,7 +34,7 @@ func (cs *CreateServiceImpl) Background(ctx context.Context, doneC chan<- struct
 	doneC <- struct{}{}
 }
 
-func (cs *CreateServiceImpl) Create(dctx context.Context, client goupnp.ServiceClient) (Radio, error) {
+func (cs *CreateServiceImpl) Create(ctx context.Context, dctx context.Context, client goupnp.ServiceClient) (Radio, error) {
 	// Get UUID
 	uuid, err := upnp.GetUUID(client)
 	if err != nil {
@@ -45,14 +45,14 @@ func (cs *CreateServiceImpl) Create(dctx context.Context, client goupnp.ServiceC
 	s := state.New(uuid, upnp.GetName(client), upnp.GetModelName(client), upnp.GetModelNumber(client))
 
 	// Get and set volume
-	volume, err := upnp.GetVolume(dctx, client)
+	volume, err := upnp.GetVolume(ctx, client)
 	if err != nil {
 		return Radio{}, err
 	}
 	s.SetVolume(volume)
 
 	// Get and parse presets count
-	presetsCount, err := upnp.GetNumberOfPresets(dctx, client)
+	presetsCount, err := upnp.GetNumberOfPresets(ctx, client)
 	if err != nil {
 		return Radio{}, err
 	}
@@ -63,7 +63,7 @@ func (cs *CreateServiceImpl) Create(dctx context.Context, client goupnp.ServiceC
 	// Get and set presets
 	var presets []state.Preset
 	for i := 1; i <= presetsCount; i++ {
-		p, err := upnp.GetPreset(dctx, client, i)
+		p, err := upnp.GetPreset(ctx, client, i)
 		if err != nil {
 			return Radio{}, err
 		}
@@ -73,7 +73,7 @@ func (cs *CreateServiceImpl) Create(dctx context.Context, client goupnp.ServiceC
 	s.SetPresets(presets)
 
 	// Get audio sources
-	audioSources, err := upnp.GetAudioSources(dctx, client)
+	audioSources, err := upnp.GetAudioSources(ctx, client)
 	if err != nil {
 		return Radio{}, err
 	}

core/radio/hub.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"sync"
+	"time"
 
 	"github.com/ItsNotGoodName/reciva-web-remote/core"
 	"github.com/ItsNotGoodName/reciva-web-remote/core/upnp"
@@ -59,18 +60,39 @@ func (hs *HubServiceImpl) Background(ctx context.Context, doneC chan<- struct{})
 			return 0, err
 		}
 
+		// Radio run context
 		newCtx, newCancel := context.WithCancel(ctx)
 
-		// Create radios
-		var radios []Radio
-		for _, client := range clients {
-			radio, err := hs.radioService.Create(newCtx, client)
-			if err != nil {
-				fmt.Println("radio.HubService.Background:", err)
-				continue
-			}
+		// Create radios concurrently
+		radioC := make(chan Radio)
+		var wg sync.WaitGroup
+		for i := range clients {
+			wg.Add(1)
+			go (func(idx int) {
+				// Timeout for creating radio
+				sctx, cancel := context.WithTimeout(ctx, 45*time.Second)
+				defer cancel()
+
+				// Create radio
+				radio, err := hs.radioService.Create(sctx, newCtx, clients[idx])
+				if err != nil {
+					fmt.Println("radio.HubService.Background:", err)
+				} else {
+					radioC <- radio
+				}
+
+				wg.Done()
+			})(i)
+		}
+		go (func() {
+			wg.Wait()
+			close(radioC)
+		})()
 
-			radios = append(radios, radio)
+		// Collect radios
+		var radios []Radio
+		for r := range radioC {
+			radios = append(radios, r)
 		}
 
 		// Create radios map

core/radio/type.go

@@ -17,7 +17,7 @@ type (
 	}
 
 	CreateService interface {
-		Create(dctx context.Context, client goupnp.ServiceClient) (Radio, error)
+		Create(ctx context.Context, dctx context.Context, client goupnp.ServiceClient) (Radio, error)
 	}
 
 	RunService interface {