proxy: work on the proxy actually being functional

streamer: fixed a bug where a icecast connection failure caused it
to skip the playing song.

config/config.go

@@ -67,7 +67,8 @@ var defaultConfig = config{
 		Fallback: "https://relay0.r-a-d.io/main.mp3",
 	},
 	Proxy: proxy{
-		Addr: ":1337",
+		Addr:         ":1337",
+		MasterServer: "http://source:[email protected]:8000",
 	},
 	Telemetry: telemetry{
 		Use:                false,
@@ -109,7 +110,8 @@ type config struct {
 }
 
 type proxy struct {
-	Addr string
+	Addr         string
+	MasterServer string
 }
 
 type telemetry struct {

jobs/listenlog.go

@@ -3,7 +3,6 @@ package jobs
 import (
 	"context"
 
-	radio "github.com/R-a-dio/valkyrie"
 	"github.com/R-a-dio/valkyrie/config"
 	"github.com/R-a-dio/valkyrie/storage"
 	"github.com/R-a-dio/valkyrie/util"
@@ -19,7 +18,7 @@ func ExecuteListenerLog(ctx context.Context, cfg config.Config) error {
 
 	m := cfg.Conf().Manager.Client()
 
-	status, err := util.OneOff[radio.Status](ctx, m.CurrentStatus)
+	status, err := util.OneOff(ctx, m.CurrentStatus)
 	if err != nil {
 		return err
 	}

proxy/main.go

@@ -24,7 +24,7 @@ func Execute(ctx context.Context, cfg config.Config) error {
 	// get our configuration
 	addr := cfg.Conf().Proxy.Addr
 
-	srv, err := NewServer(ctx, m, storage)
+	srv, err := NewServer(ctx, cfg, m, storage)
 	if err != nil {
 		return errors.E(op, err)
 	}

proxy/manager.go

@@ -2,11 +2,21 @@ package proxy
 
 import (
 	"context"
+	"net/url"
 
+	"github.com/R-a-dio/valkyrie/config"
+	"github.com/R-a-dio/valkyrie/errors"
 	"github.com/rs/zerolog"
 )
 
+func createMountURL(master url.URL, mount string) *url.URL {
+	master.Path = mount
+	return &master
+}
+
 type ProxyManager struct {
+	masterServerURL *url.URL
+
 	newSource   chan *SourceClient
 	newMetadata chan *Metadata
 
@@ -15,14 +25,21 @@ type ProxyManager struct {
 	Mounts map[string]*Mount
 }
 
-func NewProxyManager() *ProxyManager {
+func NewProxyManager(cfg config.Config) (*ProxyManager, error) {
+	const op errors.Op = "proxy.NewProxyManager"
+
+	uri, err := url.Parse(cfg.Conf().Proxy.MasterServer)
+	if err != nil {
+		return nil, errors.E(op, err)
+	}
 	m := &ProxyManager{
-		newSource:   make(chan *SourceClient),
-		newMetadata: make(chan *Metadata),
-		metaStore:   make(map[Identifier]*Metadata),
-		Mounts:      make(map[string]*Mount),
+		masterServerURL: uri,
+		newSource:       make(chan *SourceClient),
+		newMetadata:     make(chan *Metadata),
+		metaStore:       make(map[Identifier]*Metadata),
+		Mounts:          make(map[string]*Mount),
 	}
-	return m
+	return m, nil
 }
 
 func (pm *ProxyManager) Run(ctx context.Context) {
@@ -31,11 +48,12 @@ func (pm *ProxyManager) Run(ctx context.Context) {
 	for {
 		select {
 		case source := <-pm.newSource:
+			// TODO: check if all source clients have the same content-type
 			m, ok := pm.Mounts[source.MountName]
 			if !ok {
 				// no mount exists yet, create one
 				logger.Info().Str("mount", source.MountName).Msg("create mount")
-				m = NewMount(ctx, nil)
+				m = NewMount(ctx, createMountURL(*pm.masterServerURL, source.MountName), source.ContentType)
 				pm.Mounts[source.MountName] = m
 			}