Sending updated security credentials to your ESP32-S3...
' + + 'Press the RST button on your device if the progress stalls.
' + + 'Sending updated security credentials
'; + }; + flashRenderer(); + expect(content.innerHTML).toContain('Re-provision'); + }); +}); diff --git a/mothership/cmd/mothership/main.go b/mothership/cmd/mothership/main.go index 8323235..3648bdb 100644 --- a/mothership/cmd/mothership/main.go +++ b/mothership/cmd/mothership/main.go @@ -2537,6 +2537,7 @@ func main() { // Fleet REST API fleetHandler := fleet.NewHandler(fleetMgr) fleetHandler.SetNodeIdentifier(ingestSrv) + fleetHandler.SetMigrationDeadlineProvider(ingestSrv) fleetHandler.RegisterRoutes(r) // Floorplan REST API @@ -3926,22 +3927,6 @@ func main() { http.NotFound(w, r) }) - // Serve simple mode page - r.Get("/simple", func(w http.ResponseWriter, r *http.Request) { - staticDir := cfg.StaticDir - if staticDir == "" { - staticDir = findDashboardDir() - } - if staticDir != "" { - simplePath := filepath.Join(staticDir, "simple.html") - if _, err := os.Stat(simplePath); err == nil { - http.ServeFile(w, r, simplePath) - return - } - } - http.NotFound(w, r) - }) - // Serve fleet status page r.Get("/fleet", func(w http.ResponseWriter, r *http.Request) { staticDir := cfg.StaticDir diff --git a/mothership/internal/dashboard/hub.go b/mothership/internal/dashboard/hub.go index d740779..ef3e21d 100644 --- a/mothership/internal/dashboard/hub.go +++ b/mothership/internal/dashboard/hub.go @@ -424,12 +424,13 @@ func (h *Hub) BroadcastCSI(nodeMAC, peerMAC string, data []byte) { } // BroadcastNodeConnected notifies dashboards of a new node -func (h *Hub) BroadcastNodeConnected(mac, firmware, chip string) { +func (h *Hub) BroadcastNodeConnected(mac, firmware, chip string, unpaired bool) { msg := map[string]interface{}{ "type": "node_connected", "mac": mac, "firmware_version": firmware, "chip": chip, + "unpaired": unpaired, } data, _ := json.Marshal(msg) h.Broadcast(data) diff --git a/mothership/internal/dashboard/hub_test.go b/mothership/internal/dashboard/hub_test.go index 2d9657e..8fd78c6 100644 --- a/mothership/internal/dashboard/hub_test.go +++ b/mothership/internal/dashboard/hub_test.go @@ -117,10 +117,10 @@ func TestHub_NodeEvents(t *testing.T) { drainSnapshot(t, client.send) // Test node connected event - hub.BroadcastNodeConnected("AA:BB:CC:DD:EE:FF", "1.0.0", "ESP32-S3") + hub.BroadcastNodeConnected("AA:BB:CC:DD:EE:FF", "1.0.0", "ESP32-S3", false) msg := <-client.send - expected := `{"chip":"ESP32-S3","firmware_version":"1.0.0","mac":"AA:BB:CC:DD:EE:FF","type":"node_connected"}` + expected := `{"chip":"ESP32-S3","firmware_version":"1.0.0","mac":"AA:BB:CC:DD:EE:FF","type":"node_connected","unpaired":false}` if string(msg) != expected { t.Errorf("expected %s, got %s", expected, msg) } diff --git a/mothership/internal/fleet/handler.go b/mothership/internal/fleet/handler.go index 0bc3cd8..7bdee20 100644 --- a/mothership/internal/fleet/handler.go +++ b/mothership/internal/fleet/handler.go @@ -20,13 +20,20 @@ type NodeIdentifier interface { SendIdentifyToMAC(mac string, durationMS int) bool SendRebootToMAC(mac string, delayMS int) bool GetConnectedMACs() []string + GetUnpairedMACs() []string +} + +// MigrationDeadlineProvider returns the migration window deadline (zero = strict mode). +type MigrationDeadlineProvider interface { + GetMigrationDeadline() time.Time } // Handler serves the fleet REST API. type Handler struct { - mgr *Manager - nodeID NodeIdentifier - otaMgr *ota.Manager + mgr *Manager + nodeID NodeIdentifier + otaMgr *ota.Manager + migProvider MigrationDeadlineProvider } // NewHandler creates a new fleet REST handler backed by mgr. @@ -44,6 +51,11 @@ func (h *Handler) SetNodeIdentifier(ni NodeIdentifier) { h.nodeID = ni } +// SetMigrationDeadlineProvider wires in the source of the migration window deadline. +func (h *Handler) SetMigrationDeadlineProvider(p MigrationDeadlineProvider) { + h.migProvider = p +} + // RegisterRoutes mounts fleet endpoints on r. // // GET /api/nodes — list all nodes @@ -105,7 +117,7 @@ type FleetNode struct { Name string `json:"name"` Label string `json:"label"` Role string `json:"role"` - Status string `json:"status"` // "online", "offline", "updating" + Status string `json:"status"` // "online", "offline", "updating", "unpaired" FirmwareVersion string `json:"firmware_version"` ChipModel string `json:"chip_model"` PosX float64 `json:"pos_x"` @@ -113,6 +125,7 @@ type FleetNode struct { PosZ float64 `json:"pos_z"` Virtual bool `json:"virtual"` HealthScore float64 `json:"health_score"` + Unpaired bool `json:"unpaired,omitempty"` // Computed fields LastSeenMS int64 `json:"last_seen_ms"` UptimeSeconds int64 `json:"uptime_seconds"` @@ -122,6 +135,14 @@ type FleetNode struct { OTAInProgress bool `json:"ota_in_progress"` } +// fleetListResponse wraps the fleet list with migration window metadata. +type fleetListResponse struct { + Nodes []FleetNode `json:"nodes"` + MigrationWindowActive bool `json:"migration_window_active"` + MigrationDeadlineMS int64 `json:"migration_deadline_ms,omitempty"` + MigrationRemainingSecs float64 `json:"migration_remaining_secs,omitempty"` +} + // listFleet returns extended node data with computed fields for the fleet page. func (h *Handler) listFleet(w http.ResponseWriter, r *http.Request) { nodes, err := h.mgr.registry.GetAllNodes() @@ -143,6 +164,14 @@ func (h *Handler) listFleet(w http.ResponseWriter, r *http.Request) { connectedSet[mac] = true } + // Get unpaired MACs (nodes connected without valid tokens) + unpairedSet := make(map[string]bool) + if h.nodeID != nil { + for _, mac := range h.nodeID.GetUnpairedMACs() { + unpairedSet[mac] = true + } + } + // Get OTA progress if OTA manager is available var otaProgress map[string]ota.NodeOTAProgress if h.otaMgr != nil { @@ -170,8 +199,14 @@ func (h *Handler) listFleet(w http.ResponseWriter, r *http.Request) { Temperature: 0, // Not currently tracked } - // Determine status - check OTA progress first - if otaProgress != nil { + // Check unpaired status first (highest priority visual indicator) + if unpairedSet[node.MAC] { + fleetNode.Unpaired = true + fleetNode.Status = "unpaired" + } + + // Determine status - check OTA progress first (skip if already unpaired) + if !fleetNode.Unpaired && otaProgress != nil { if progress, ok := otaProgress[node.MAC]; ok { // Node has OTA progress - determine status from OTA state switch progress.State { @@ -211,7 +246,7 @@ func (h *Handler) listFleet(w http.ResponseWriter, r *http.Request) { } fleetNode.OTAInProgress = false } - } else { + } else if !fleetNode.Unpaired { // No OTA manager - check connection status if connectedSet[node.MAC] { fleetNode.Status = "online" @@ -239,7 +274,40 @@ func (h *Handler) listFleet(w http.ResponseWriter, r *http.Request) { fleetNodes = append(fleetNodes, fleetNode) } - writeJSON(w, fleetNodes) + // Append unpaired nodes that are connected but not in the registry. + registeredMACs := make(map[string]bool, len(fleetNodes)) + for _, n := range fleetNodes { + registeredMACs[n.MAC] = true + } + for mac := range unpairedSet { + if !registeredMACs[mac] { + fleetNodes = append(fleetNodes, FleetNode{ + MAC: mac, + Status: "unpaired", + Unpaired: true, + Role: "rx", + LastSeenMS: now.UnixMilli(), + }) + } + } + + // Build response with migration window metadata. + resp := fleetListResponse{ + Nodes: fleetNodes, + } + if h.migProvider != nil { + deadline := h.migProvider.GetMigrationDeadline() + if !deadline.IsZero() { + resp.MigrationDeadlineMS = deadline.UnixMilli() + remaining := time.Until(deadline).Seconds() + if remaining > 0 { + resp.MigrationWindowActive = true + resp.MigrationRemainingSecs = remaining + } + } + } + + writeJSON(w, resp) } func (h *Handler) getNode(w http.ResponseWriter, r *http.Request) { diff --git a/mothership/internal/ingestion/server.go b/mothership/internal/ingestion/server.go index a3fd014..74b7cfc 100644 --- a/mothership/internal/ingestion/server.go +++ b/mothership/internal/ingestion/server.go @@ -18,7 +18,7 @@ import ( // CSIBroadcaster is a callback for broadcasting CSI frames to dashboard type CSIBroadcaster interface { BroadcastCSI(nodeMAC, peerMAC string, data []byte) - BroadcastNodeConnected(mac, firmware, chip string) + BroadcastNodeConnected(mac, firmware, chip string, unpaired bool) BroadcastNodeDisconnected(mac string) BroadcastLinkActive(linkID, nodeMAC, peerMAC string) } @@ -274,6 +274,14 @@ func (s *Server) SetMigrationDeadline(t time.Time) { s.mu.Unlock() } +// GetMigrationDeadline returns the current migration window deadline. +// Zero value means strict mode (no migration window). +func (s *Server) GetMigrationDeadline() time.Time { + s.mu.RLock() + defer s.mu.RUnlock() + return s.migrationDeadline +} + // SetTokenValidator sets the function used to validate node tokens in hello messages. // If set, nodes with missing or invalid tokens are rejected via sendReject and disconnected. func (s *Server) SetTokenValidator(fn func(mac, token string) bool) { @@ -506,7 +514,7 @@ func (s *Server) HandleNodeWS(w http.ResponseWriter, r *http.Request) { } if broadcaster != nil { - broadcaster.BroadcastNodeConnected(hello.MAC, hello.FirmwareVersion, hello.Chip) + broadcaster.BroadcastNodeConnected(hello.MAC, hello.FirmwareVersion, hello.Chip, nc.Unpaired) } if fleetFn != nil {