apply settings for OS2L

2025-11-13 16:00:50 +01:00
parent 18a3a716ef
commit c7d9f35080
6 changed files with 124 additions and 72 deletions
--- a/hardware/OS2LPeripheral.go
+++ b/hardware/OS2LPeripheral.go
@@ -5,10 +5,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
+	"strings"
 	"sync"
 	"time"

 	"github.com/rs/zerolog/log"
+	"github.com/wailsapp/wails/v2/pkg/runtime"
 )

 // OS2LMessage represents an OS2L message
@@ -35,14 +37,13 @@ type OS2LPeripheral struct {

 // NewOS2LPeripheral creates a new OS2L peripheral
 func NewOS2LPeripheral(peripheralData PeripheralInfo) (*OS2LPeripheral, error) {
-	log.Trace().Str("file", "OS2LPeripheral").Str("name", peripheralData.Name).Str("s/n", peripheralData.SerialNumber).Msg("OS2L peripheral created")
-	return &OS2LPeripheral{
+	peripheral := &OS2LPeripheral{
 		info:          peripheralData,
-		serverIP:      "127.0.0.1",
-		serverPort:    9995,
 		listener:      nil,
 		eventCallback: nil,
-	}, nil
+	}
+	log.Trace().Str("file", "OS2LPeripheral").Str("name", peripheralData.Name).Str("s/n", peripheralData.SerialNumber).Msg("OS2L peripheral created")
+	return peripheral, peripheral.loadSettings(peripheralData.Settings)
 }

 // SetEventCallback sets the callback for returning events
@@ -50,15 +51,21 @@ func (p *OS2LPeripheral) SetEventCallback(eventCallback func(any)) {
 	p.eventCallback = eventCallback
 }

-// Connect connects the MIDI peripheral
+// Connect connects the OS2L peripheral
 func (p *OS2LPeripheral) Connect(ctx context.Context) error {
+	runtime.EventsEmit(ctx, string(PeripheralStatusUpdated), p.GetInfo(), PeripheralStatusConnecting)
+
 	var err error
 	addr := net.TCPAddr{Port: p.serverPort, IP: net.ParseIP(p.serverIP)}
+
+	log.Debug().Any("addr", addr).Msg("parametres de connexion à la connexion")
 	p.listener, err = net.ListenTCP("tcp", &addr)
 	if err != nil {
+		runtime.EventsEmit(ctx, string(PeripheralStatusUpdated), p.GetInfo(), PeripheralStatusDisconnected)
 		return fmt.Errorf("unable to set the OS2L TCP listener")
 	}

+	runtime.EventsEmit(ctx, string(PeripheralStatusUpdated), p.GetInfo(), PeripheralStatusDeactivated)
 	log.Info().Str("file", "OS2LPeripheral").Msg("OS2L peripheral connected")
 	return nil
 }
@@ -78,14 +85,49 @@ func (p *OS2LPeripheral) handleMessage(raw []byte) error {
 	return nil
 }

+// loadSettings check and load the settings in the peripheral
+func (p *OS2LPeripheral) loadSettings(settings map[string]any) error {
+	// Check if the IP exists
+	serverIP, found := settings["os2lIp"]
+	if !found {
+		// Set default IP address
+		serverIP = "127.0.0.1"
+	}
+	// Check if it is a string
+	ipSetting, ok := serverIP.(string)
+	if ok {
+		p.serverIP = ipSetting
+	} else {
+		return fmt.Errorf("The specified IP is not a string")
+	}
+	// Check if the port exists
+	serverPort, found := settings["os2lPort"]
+	if !found {
+		// Set default port
+		serverPort = 9995
+	}
+	switch v := serverPort.(type) {
+	case int:
+		p.serverPort = v
+	case float64:
+		p.serverPort = int(v) // JSON numbers are float64
+	default:
+		return fmt.Errorf("The specified port is not a number, got %T", serverPort)
+	}
+
+	return nil
+}
+
 // Disconnect disconnects the MIDI peripheral
-func (p *OS2LPeripheral) Disconnect() error {
+func (p *OS2LPeripheral) Disconnect(ctx context.Context) error {

 	// Close the TCP listener if not null
 	if p.listener != nil {
 		p.listener.Close()
 	}

+	runtime.EventsEmit(ctx, string(PeripheralStatusUpdated), p.GetInfo(), PeripheralStatusDisconnected)
+
 	log.Info().Str("file", "OS2LPeripheral").Msg("OS2L peripheral disconnected")
 	return nil
 }
@@ -115,6 +157,9 @@ func (p *OS2LPeripheral) Activate(ctx context.Context) error {
 					if ne, ok := err.(net.Error); ok && ne.Timeout() {
 						continue
 					}
+					if strings.Contains(err.Error(), "use of closed network connection") || strings.Contains(err.Error(), "invalid argument") {
+						return
+					}
 					log.Err(err).Str("file", "OS2LPeripheral").Msg("unable to accept the connection")
 					continue
 				}
@@ -153,6 +198,8 @@ func (p *OS2LPeripheral) Activate(ctx context.Context) error {
 			}
 		}
 	}()
+	runtime.EventsEmit(ctx, string(PeripheralStatusUpdated), p.GetInfo(), PeripheralStatusActivated)
+
 	log.Info().Str("file", "OS2LPeripheral").Msg("OS2L peripheral activated")

 	return nil
@@ -169,37 +216,46 @@ func (p *OS2LPeripheral) Deactivate(ctx context.Context) error {
 		p.listenerCancel()
 	}

+	runtime.EventsEmit(ctx, string(PeripheralStatusUpdated), p.GetInfo(), PeripheralStatusDeactivated)
+
 	log.Info().Str("file", "OS2LPeripheral").Msg("OS2L peripheral deactivated")
 	return nil
 }

 // SetSettings sets a specific setting for this peripheral
-func (p *OS2LPeripheral) SetSettings(settings map[string]interface{}) error {
-	// Check if the IP exists
-	serverIP, found := settings["os2lIp"]
-	if !found {
-		return fmt.Errorf("Unable to find the OS2L server IP")
-	}
-	// Check if it is a string
-	ipSetting, ok := serverIP.(string)
-	if ok {
-		p.serverIP = ipSetting
-
-	} else {
-		return fmt.Errorf("The specified IP is not a string")
-	}
-	// Check if the port exists
-	serverPort, found := settings["os2lPort"]
-	if !found {
-		return fmt.Errorf("Unable to find the OS2L server port")
-	}
-	// Check if it is a float and convert to int
-	portFloat, ok := serverPort.(float64)
-	if ok {
-		p.serverPort = int(portFloat)
-	} else {
-		return fmt.Errorf("The specified port is not an int")
+func (p *OS2LPeripheral) SetSettings(ctx context.Context, settings map[string]any) error {
+	err := p.loadSettings(settings)
+	if err != nil {
+		return fmt.Errorf("unable to load settings: %w", err)
 	}
+	// Reconnect the peripheral
+	p.wg.Add(1)
+	go func() {
+		defer p.wg.Done()
+		err := p.Deactivate(ctx)
+		if err != nil {
+			log.Err(err).Str("sn", p.GetInfo().SerialNumber).Msg("unable to deactivate")
+			return
+		}
+		err = p.Disconnect(ctx)
+		if err != nil {
+			log.Err(err).Str("sn", p.GetInfo().SerialNumber).Msg("unable to disconnect")
+			return
+		}
+		// Add a sleep to view changes
+		time.Sleep(500 * time.Millisecond)
+		err = p.Connect(ctx)
+		if err != nil {
+			log.Err(err).Str("sn", p.GetInfo().SerialNumber).Msg("unable to connect")
+			return
+		}
+		err = p.Activate(ctx)
+		if err != nil {
+			log.Err(err).Str("sn", p.GetInfo().SerialNumber).Msg("unable to activate")
+			return
+		}
+	}()
+	log.Info().Str("sn", p.GetInfo().SerialNumber).Msg("peripheral settings set")
 	return nil
 }

@@ -209,8 +265,8 @@ func (p *OS2LPeripheral) SetDeviceProperty(context.Context, uint32, uint32, byte
 }

 // GetSettings gets the peripheral settings
-func (p *OS2LPeripheral) GetSettings() map[string]interface{} {
-	return map[string]interface{}{
+func (p *OS2LPeripheral) GetSettings() map[string]any {
+	return map[string]any{
 		"os2lIp":   p.serverIP,
 		"os2lPort": p.serverPort,
 	}