clean up arch

hardware/hardware.go

@@ -2,9 +2,9 @@ package hardware
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sync"
-	"time"
 
 	"github.com/rs/zerolog/log"
 
@@ -24,16 +24,13 @@ const (
 	// debounceDuration                  = 500 * time.Millisecond
 )
 
-var (
-	debounceTimer *time.Timer
-)
-
 // HardwareManager is the class who manages the hardware
 type HardwareManager struct {
+	wg sync.WaitGroup
+
 	finders                map[string]PeripheralFinder // The map of peripherals finders
 	peripherals            []Peripheral                // The current list of peripherals
 	peripheralsScanTrigger chan struct{}               // Trigger the peripherals scans
-	goWait                 sync.WaitGroup              // Wait for goroutines to terminate
 }
 
 // NewHardwareManager creates a new HardwareManager
@@ -48,6 +45,7 @@ func NewHardwareManager() *HardwareManager {
 
 // Start starts to find new peripheral events
 func (h *HardwareManager) Start(ctx context.Context) error {
+	// Initialize all the finders
 	for finderName, finder := range h.finders {
 		err := finder.Initialize()
 		if err != nil {
@@ -60,9 +58,11 @@ func (h *HardwareManager) Start(ctx context.Context) error {
 			return err
 		}
 	}
-	h.goWait.Add(1)
+
+	// Periodically scan all the finders
+	h.wg.Add(1)
 	go func() {
-		defer h.goWait.Done()
+		defer h.wg.Done()
 		for {
 			select {
 			case <-ctx.Done():
@@ -95,40 +95,14 @@ func (h *HardwareManager) RegisterFinder(finder PeripheralFinder) {
 	log.Info().Str("file", "hardware").Str("finderName", finder.GetName()).Msg("finder registered")
 }
 
-// // GetPeripheral gets the peripheral object from the parent finder
-// func (h *HardwareManager) GetPeripheral(finderName string, peripheralID string) (Peripheral, bool) {
-// 	// Get the finder
-// 	parentFinder, found := h.finders[finderName]
-// 	// If no finder found, return false
-// 	if !found {
-// 		log.Error().Str("file", "hardware").Str("finderName", finderName).Msg("unable to get the finder")
-// 		return nil, false
-// 	}
-// 	log.Trace().Str("file", "hardware").Str("finderName", parentFinder.GetName()).Msg("finder got")
-// 	// Contact the finder to get the peripheral
-// 	return parentFinder.GetPeripheral(peripheralID)
-// }
-
 // Scan scans all the peripherals for the registered finders
 func (h *HardwareManager) Scan() error {
-	h.peripheralsScanTrigger <- struct{}{}
-	return nil
-}
-
-// Stop stops the hardware manager
-func (h *HardwareManager) Stop() error {
-	log.Trace().Str("file", "hardware").Msg("closing the hardware manager")
-	// Stop each finder
-	for finderName, finder := range h.finders {
-		err := finder.Stop()
-		if err != nil {
-			log.Err(err).Str("file", "hardware").Str("finderName", finderName).Msg("unable to stop the finder")
-		}
+	select {
+	case h.peripheralsScanTrigger <- struct{}{}:
+		return nil
+	default:
+		return fmt.Errorf("scan trigger not available (manager stopped?)")
 	}
-	// Wait for goroutines to finish
-	h.goWait.Wait()
-	log.Info().Str("file", "hardware").Msg("hardware manager stopped")
-	return nil
 }
 
 // emitPeripheralsChanges compares the old and new peripherals to determine which ones have been added or removed.
@@ -151,3 +125,30 @@ func emitPeripheralsChanges(ctx context.Context, oldPeripherals map[string]Perip
 		}
 	}
 }
+
+// WaitStop stops the hardware manager
+func (h *HardwareManager) WaitStop() error {
+	log.Trace().Str("file", "hardware").Msg("closing the hardware manager")
+
+	// Closing trigger channel
+	close(h.peripheralsScanTrigger)
+
+	// Stop each finder
+	var errs []error
+	for name, f := range h.finders {
+		if err := f.WaitStop(); err != nil {
+			errs = append(errs, fmt.Errorf("%s: %w", name, err))
+		}
+	}
+
+	// Wait for goroutines to finish
+	h.wg.Wait()
+
+	// Returning errors
+	if len(errs) > 0 {
+		return errors.Join(errs...)
+	}
+	log.Info().Str("file", "hardware").Msg("hardware manager stopped")
+
+	return nil
+}