From a67ef20680591ca3e67e4a259ab6a34860eae7dd Mon Sep 17 00:00:00 2001
From: CarterPerez-dev <cartertechsolution@gmail.com>
Date: Fri, 1 May 2026 13:53:16 -0400
Subject: [PATCH] feat(monitor/main): wire bus + hub + snapshot + heartbeat
 under errgroup; expose /v1/snapshot, /v1/ws, /v1/healthz

---
 .../backend/cmd/api/main.go                   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/PROJECTS/advanced/monitor-the-situation-dashboard/backend/cmd/api/main.go b/PROJECTS/advanced/monitor-the-situation-dashboard/backend/cmd/api/main.go
index 7180e87f..a4eac3f3 100644
--- a/PROJECTS/advanced/monitor-the-situation-dashboard/backend/cmd/api/main.go
+++ b/PROJECTS/advanced/monitor-the-situation-dashboard/backend/cmd/api/main.go
@@ -5,6 +5,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"flag"
 	"log/slog"
 	"os"
@@ -13,15 +14,20 @@ import (
 	"time"
 
 	"github.com/go-chi/chi/v5"
+	"golang.org/x/sync/errgroup"
 
 	"github.com/carterperez-dev/monitor-the-situation/backend/internal/admin"
 	"github.com/carterperez-dev/monitor-the-situation/backend/internal/auth"
+	"github.com/carterperez-dev/monitor-the-situation/backend/internal/bus"
+	"github.com/carterperez-dev/monitor-the-situation/backend/internal/collectors/heartbeat"
 	"github.com/carterperez-dev/monitor-the-situation/backend/internal/config"
 	"github.com/carterperez-dev/monitor-the-situation/backend/internal/core"
 	"github.com/carterperez-dev/monitor-the-situation/backend/internal/health"
 	"github.com/carterperez-dev/monitor-the-situation/backend/internal/middleware"
 	"github.com/carterperez-dev/monitor-the-situation/backend/internal/server"
+	"github.com/carterperez-dev/monitor-the-situation/backend/internal/snapshot"
 	"github.com/carterperez-dev/monitor-the-situation/backend/internal/user"
+	"github.com/carterperez-dev/monitor-the-situation/backend/internal/ws"
 )
 
 const (
@@ -117,6 +123,29 @@ func run(configPath string) error {
 		RedisPing:  redis.Ping,
 	})
 
+	snapStore := snapshot.NewStore(redis.Client)
+	snapHandler := snapshot.NewHandler(snapStore)
+
+	hub := ws.NewHub(ws.HubConfig{Logger: logger})
+	wsHandler := ws.NewHandler(hub)
+
+	eventBus := bus.New(bus.Config{
+		BufferSize:  512,
+		Persister:   snapshot.StorePersister{Store: snapStore},
+		Broadcaster: ws.HubBroadcaster{Hub: hub},
+		Logger:      logger,
+	})
+
+	beat := heartbeat.New(heartbeat.Config{
+		Interval: 5 * time.Second,
+		Emitter:  eventBus,
+	})
+
+	collectorGroup, collectorCtx := errgroup.WithContext(ctx)
+	collectorGroup.Go(func() error { return eventBus.Run(collectorCtx) })
+	collectorGroup.Go(func() error { return beat.Run(collectorCtx) })
+	logger.Info("collectors started", "count", 1)
+
 	srv := server.New(server.Config{
 		ServerConfig:  cfg.Server,
 		HealthHandler: healthHandler,
@@ -147,6 +176,12 @@ func run(configPath string) error {
 	adminOnly := middleware.RequireAdmin
 
 	router.Route("/v1", func(r chi.Router) {
+		r.Get("/healthz", healthHandler.Liveness)
+		r.Get("/readyz", healthHandler.Readiness)
+
+		r.Get("/snapshot", snapHandler.ServeHTTP)
+		r.Get("/ws", wsHandler.ServeHTTP)
+
 		authHandler.RegisterRoutes(r, authenticator)
 
 		r.Post("/users", authHandler.Register)
@@ -184,6 +219,12 @@ func run(configPath string) error {
 		}
 	}
 
+	if err := collectorGroup.Wait(); err != nil &&
+		!errors.Is(err, context.Canceled) &&
+		!errors.Is(err, context.DeadlineExceeded) {
+		logger.Error("collector group exit", "error", err)
+	}
+
 	if err := redis.Close(); err != nil {
 		logger.Error("redis close error", "error", err)
 	}