robot: serve api inside the errgroup

main.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
-	"net/http"
 	"os"
 	"os/signal"
 	"runtime"
@@ -135,12 +134,7 @@ func cliRun(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	if cfg.HTTP.Listen != "" {
-		// TODO(zeph): this should be in the errgroup inside Run
-		go api(ctx, cfg.HTTP.Listen, new(http.ServeMux), robo.Metrics.Collectors())
-	}
-
-	return robo.Run(ctx)
+	return robo.Run(ctx, cfg.HTTP.Listen)
 }
 
 func cliSpeak(ctx context.Context, cmd *cli.Command) error {

robot.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"net/http"
 	"strings"
 	"time"
 
@@ -82,12 +83,15 @@ func New(usersKey []byte, poolSize int) *Robot {
 	}
 }
 
-func (robo *Robot) Run(ctx context.Context) error {
+func (robo *Robot) Run(ctx context.Context, listen string) error {
 	group, ctx := errgroup.WithContext(ctx)
 	// TODO(zeph): stdin?
 	if robo.tmi != nil {
 		group.Go(func() error { return robo.runTwitch(ctx, group) })
 	}
+	if listen != "" {
+		group.Go(func() error { return api(ctx, listen, new(http.ServeMux), robo.Metrics.Collectors()) })
+	}
 	err := group.Wait()
 	if err == context.Canceled {
 		// If the first error is context canceled, then we are shutting down