Merge 336a75812f into 1d1e58f036

feat: add visual feedback for auto-enable microphone toggle
Added success notifications when toggling auto-enable microphone setting. Includes translations for all supported languages.
2025-11-04 09:17:45 +00:00 · 2025-11-04 11:17:29 +02:00 · 2025-11-04 10:40:35 +02:00 · 2025-11-04 08:52:27 +02:00
18 changed files with 223 additions and 165 deletions
--- a/audio.go
+++ b/audio.go
@ -21,7 +21,7 @@ var (
 	activeConnections  atomic.Int32
 	audioLogger        zerolog.Logger
 	currentAudioTrack  *webrtc.TrackLocalStaticSample
-	inputTrackHandling atomic.Bool
+	currentInputTrack  atomic.Pointer[string]
 	audioOutputEnabled atomic.Bool
 	audioInputEnabled  atomic.Bool
 )
@ -29,7 +29,8 @@ var (
 func initAudio() {
 	audioLogger = logging.GetDefaultLogger().With().Str("component", "audio-manager").Logger()

-	audioOutputEnabled.Store(true)
+	ensureConfigLoaded()
+	audioOutputEnabled.Store(config.AudioOutputEnabled)
 	audioInputEnabled.Store(true)

 	audioLogger.Debug().Msg("Audio subsystem initialized")
@ -151,13 +152,9 @@ func setAudioTrack(audioTrack *webrtc.TrackLocalStaticSample) {
 }

 func setPendingInputTrack(track *webrtc.TrackRemote) {
-	audioMutex.Lock()
-	defer audioMutex.Unlock()
-
-	// Start input track handler only once per WebRTC session
-	if inputTrackHandling.CompareAndSwap(false, true) {
-		go handleInputTrackForSession(track)
-	}
+	trackID := track.ID()
+	currentInputTrack.Store(&trackID)
+	go handleInputTrackForSession(track)
 }

 // SetAudioOutputEnabled enables or disables audio output
@ -201,22 +198,32 @@ func SetAudioInputEnabled(enabled bool) error {
 // handleInputTrackForSession runs for the entire WebRTC session lifetime
 // It continuously reads from the track and sends to whatever relay is currently active
 func handleInputTrackForSession(track *webrtc.TrackRemote) {
-	defer inputTrackHandling.Store(false)
+	myTrackID := track.ID()

 	audioLogger.Debug().
 		Str("codec", track.Codec().MimeType).
-		Str("track_id", track.ID()).
+		Str("track_id", myTrackID).
 		Msg("starting session-lifetime track handler")

 	for {
+		// Check if we've been superseded by a new track
+		currentTrackID := currentInputTrack.Load()
+		if currentTrackID != nil && *currentTrackID != myTrackID {
+			audioLogger.Debug().
+				Str("my_track_id", myTrackID).
+				Str("current_track_id", *currentTrackID).
+				Msg("audio track handler exiting - superseded by new track")
+			return
+		}
+
 		// Read RTP packet (must always read to keep track alive)
 		rtpPacket, _, err := track.ReadRTP()
 		if err != nil {
 			if err == io.EOF {
-				audioLogger.Debug().Msg("audio track ended")
+				audioLogger.Debug().Str("track_id", myTrackID).Msg("audio track ended")
 				return
 			}
-			audioLogger.Warn().Err(err).Msg("failed to read RTP packet")
+			audioLogger.Warn().Err(err).Str("track_id", myTrackID).Msg("failed to read RTP packet")
 			continue
 		}

--- a/config.go
+++ b/config.go
@ -107,6 +107,8 @@ type Config struct {
 	DefaultLogLevel      string               `json:"default_log_level"`
 	VideoSleepAfterSec   int                  `json:"video_sleep_after_sec"`
 	VideoQualityFactor   float64              `json:"video_quality_factor"`
+	AudioInputAutoEnable bool                 `json:"audio_input_auto_enable"`
+	AudioOutputEnabled   bool                 `json:"audio_output_enabled"`
 }

 func (c *Config) GetDisplayRotation() uint16 {
@ -178,8 +180,10 @@ func getDefaultConfig() Config {
 			_ = confparser.SetDefaultsAndValidate(c)
 			return c
 		}(),
-		DefaultLogLevel:    "INFO",
-		VideoQualityFactor: 1.0,
+		DefaultLogLevel:      "INFO",
+		VideoQualityFactor:   1.0,
+		AudioInputAutoEnable: false,
+		AudioOutputEnabled:   true,
 	}
 }

--- a/jsonrpc.go
+++ b/jsonrpc.go
@ -946,10 +946,16 @@ func rpcSetUsbDeviceState(device string, enabled bool) error {
 }

 func rpcGetAudioOutputEnabled() (bool, error) {
-	return audioOutputEnabled.Load(), nil
+	ensureConfigLoaded()
+	return config.AudioOutputEnabled, nil
 }

 func rpcSetAudioOutputEnabled(enabled bool) error {
+	ensureConfigLoaded()
+	config.AudioOutputEnabled = enabled
+	if err := SaveConfig(); err != nil {
+		return err
+	}
 	return SetAudioOutputEnabled(enabled)
 }

@ -961,6 +967,17 @@ func rpcSetAudioInputEnabled(enabled bool) error {
 	return SetAudioInputEnabled(enabled)
 }

+func rpcGetAudioInputAutoEnable() (bool, error) {
+	ensureConfigLoaded()
+	return config.AudioInputAutoEnable, nil
+}
+
+func rpcSetAudioInputAutoEnable(enabled bool) error {
+	ensureConfigLoaded()
+	config.AudioInputAutoEnable = enabled
+	return SaveConfig()
+}
+
 func rpcSetCloudUrl(apiUrl string, appUrl string) error {
 	currentCloudURL := config.CloudURL
 	config.CloudURL = apiUrl
@ -1199,95 +1216,97 @@ func rpcDoExecuteKeyboardMacro(ctx context.Context, macro []hidrpc.KeyboardMacro
 }

 var rpcHandlers = map[string]RPCHandler{
-	"ping":                   {Func: rpcPing},
-	"reboot":                 {Func: rpcReboot, Params: []string{"force"}},
-	"getDeviceID":            {Func: rpcGetDeviceID},
-	"deregisterDevice":       {Func: rpcDeregisterDevice},
-	"getCloudState":          {Func: rpcGetCloudState},
-	"getNetworkState":        {Func: rpcGetNetworkState},
-	"getNetworkSettings":     {Func: rpcGetNetworkSettings},
-	"setNetworkSettings":     {Func: rpcSetNetworkSettings, Params: []string{"settings"}},
-	"renewDHCPLease":         {Func: rpcRenewDHCPLease},
-	"getKeyboardLedState":    {Func: rpcGetKeyboardLedState},
-	"getKeyDownState":        {Func: rpcGetKeysDownState},
-	"keyboardReport":         {Func: rpcKeyboardReport, Params: []string{"modifier", "keys"}},
-	"keypressReport":         {Func: rpcKeypressReport, Params: []string{"key", "press"}},
-	"absMouseReport":         {Func: rpcAbsMouseReport, Params: []string{"x", "y", "buttons"}},
-	"relMouseReport":         {Func: rpcRelMouseReport, Params: []string{"dx", "dy", "buttons"}},
-	"wheelReport":            {Func: rpcWheelReport, Params: []string{"wheelY"}},
-	"getVideoState":          {Func: rpcGetVideoState},
-	"getUSBState":            {Func: rpcGetUSBState},
-	"unmountImage":           {Func: rpcUnmountImage},
-	"rpcMountBuiltInImage":   {Func: rpcMountBuiltInImage, Params: []string{"filename"}},
-	"setJigglerState":        {Func: rpcSetJigglerState, Params: []string{"enabled"}},
-	"getJigglerState":        {Func: rpcGetJigglerState},
-	"setJigglerConfig":       {Func: rpcSetJigglerConfig, Params: []string{"jigglerConfig"}},
-	"getJigglerConfig":       {Func: rpcGetJigglerConfig},
-	"getTimezones":           {Func: rpcGetTimezones},
-	"sendWOLMagicPacket":     {Func: rpcSendWOLMagicPacket, Params: []string{"macAddress"}},
-	"getStreamQualityFactor": {Func: rpcGetStreamQualityFactor},
-	"setStreamQualityFactor": {Func: rpcSetStreamQualityFactor, Params: []string{"factor"}},
-	"getAutoUpdateState":     {Func: rpcGetAutoUpdateState},
-	"setAutoUpdateState":     {Func: rpcSetAutoUpdateState, Params: []string{"enabled"}},
-	"getEDID":                {Func: rpcGetEDID},
-	"setEDID":                {Func: rpcSetEDID, Params: []string{"edid"}},
-	"getVideoLogStatus":      {Func: rpcGetVideoLogStatus},
-	"getVideoSleepMode":      {Func: rpcGetVideoSleepMode},
-	"setVideoSleepMode":      {Func: rpcSetVideoSleepMode, Params: []string{"duration"}},
-	"getDevChannelState":     {Func: rpcGetDevChannelState},
-	"setDevChannelState":     {Func: rpcSetDevChannelState, Params: []string{"enabled"}},
-	"getLocalVersion":        {Func: rpcGetLocalVersion},
-	"getUpdateStatus":        {Func: rpcGetUpdateStatus},
-	"tryUpdate":              {Func: rpcTryUpdate},
-	"getDevModeState":        {Func: rpcGetDevModeState},
-	"setDevModeState":        {Func: rpcSetDevModeState, Params: []string{"enabled"}},
-	"getSSHKeyState":         {Func: rpcGetSSHKeyState},
-	"setSSHKeyState":         {Func: rpcSetSSHKeyState, Params: []string{"sshKey"}},
-	"getTLSState":            {Func: rpcGetTLSState},
-	"setTLSState":            {Func: rpcSetTLSState, Params: []string{"state"}},
-	"setMassStorageMode":     {Func: rpcSetMassStorageMode, Params: []string{"mode"}},
-	"getMassStorageMode":     {Func: rpcGetMassStorageMode},
-	"isUpdatePending":        {Func: rpcIsUpdatePending},
-	"getUsbEmulationState":   {Func: rpcGetUsbEmulationState},
-	"setUsbEmulationState":   {Func: rpcSetUsbEmulationState, Params: []string{"enabled"}},
-	"getUsbConfig":           {Func: rpcGetUsbConfig},
-	"setUsbConfig":           {Func: rpcSetUsbConfig, Params: []string{"usbConfig"}},
-	"checkMountUrl":          {Func: rpcCheckMountUrl, Params: []string{"url"}},
-	"getVirtualMediaState":   {Func: rpcGetVirtualMediaState},
-	"getStorageSpace":        {Func: rpcGetStorageSpace},
-	"mountWithHTTP":          {Func: rpcMountWithHTTP, Params: []string{"url", "mode"}},
-	"mountWithStorage":       {Func: rpcMountWithStorage, Params: []string{"filename", "mode"}},
-	"listStorageFiles":       {Func: rpcListStorageFiles},
-	"deleteStorageFile":      {Func: rpcDeleteStorageFile, Params: []string{"filename"}},
-	"startStorageFileUpload": {Func: rpcStartStorageFileUpload, Params: []string{"filename", "size"}},
-	"getWakeOnLanDevices":    {Func: rpcGetWakeOnLanDevices},
-	"setWakeOnLanDevices":    {Func: rpcSetWakeOnLanDevices, Params: []string{"params"}},
-	"resetConfig":            {Func: rpcResetConfig},
-	"setDisplayRotation":     {Func: rpcSetDisplayRotation, Params: []string{"params"}},
-	"getDisplayRotation":     {Func: rpcGetDisplayRotation},
-	"setBacklightSettings":   {Func: rpcSetBacklightSettings, Params: []string{"params"}},
-	"getBacklightSettings":   {Func: rpcGetBacklightSettings},
-	"getDCPowerState":        {Func: rpcGetDCPowerState},
-	"setDCPowerState":        {Func: rpcSetDCPowerState, Params: []string{"enabled"}},
-	"setDCRestoreState":      {Func: rpcSetDCRestoreState, Params: []string{"state"}},
-	"getActiveExtension":     {Func: rpcGetActiveExtension},
-	"setActiveExtension":     {Func: rpcSetActiveExtension, Params: []string{"extensionId"}},
-	"getATXState":            {Func: rpcGetATXState},
-	"setATXPowerAction":      {Func: rpcSetATXPowerAction, Params: []string{"action"}},
-	"getSerialSettings":      {Func: rpcGetSerialSettings},
-	"setSerialSettings":      {Func: rpcSetSerialSettings, Params: []string{"settings"}},
-	"getUsbDevices":          {Func: rpcGetUsbDevices},
-	"setUsbDevices":          {Func: rpcSetUsbDevices, Params: []string{"devices"}},
-	"setUsbDeviceState":      {Func: rpcSetUsbDeviceState, Params: []string{"device", "enabled"}},
-	"getAudioOutputEnabled":  {Func: rpcGetAudioOutputEnabled},
-	"setAudioOutputEnabled":  {Func: rpcSetAudioOutputEnabled, Params: []string{"enabled"}},
-	"getAudioInputEnabled":   {Func: rpcGetAudioInputEnabled},
-	"setAudioInputEnabled":   {Func: rpcSetAudioInputEnabled, Params: []string{"enabled"}},
-	"setCloudUrl":            {Func: rpcSetCloudUrl, Params: []string{"apiUrl", "appUrl"}},
-	"getKeyboardLayout":      {Func: rpcGetKeyboardLayout},
-	"setKeyboardLayout":      {Func: rpcSetKeyboardLayout, Params: []string{"layout"}},
-	"getKeyboardMacros":      {Func: getKeyboardMacros},
-	"setKeyboardMacros":      {Func: setKeyboardMacros, Params: []string{"params"}},
-	"getLocalLoopbackOnly":   {Func: rpcGetLocalLoopbackOnly},
-	"setLocalLoopbackOnly":   {Func: rpcSetLocalLoopbackOnly, Params: []string{"enabled"}},
+	"ping":                    {Func: rpcPing},
+	"reboot":                  {Func: rpcReboot, Params: []string{"force"}},
+	"getDeviceID":             {Func: rpcGetDeviceID},
+	"deregisterDevice":        {Func: rpcDeregisterDevice},
+	"getCloudState":           {Func: rpcGetCloudState},
+	"getNetworkState":         {Func: rpcGetNetworkState},
+	"getNetworkSettings":      {Func: rpcGetNetworkSettings},
+	"setNetworkSettings":      {Func: rpcSetNetworkSettings, Params: []string{"settings"}},
+	"renewDHCPLease":          {Func: rpcRenewDHCPLease},
+	"getKeyboardLedState":     {Func: rpcGetKeyboardLedState},
+	"getKeyDownState":         {Func: rpcGetKeysDownState},
+	"keyboardReport":          {Func: rpcKeyboardReport, Params: []string{"modifier", "keys"}},
+	"keypressReport":          {Func: rpcKeypressReport, Params: []string{"key", "press"}},
+	"absMouseReport":          {Func: rpcAbsMouseReport, Params: []string{"x", "y", "buttons"}},
+	"relMouseReport":          {Func: rpcRelMouseReport, Params: []string{"dx", "dy", "buttons"}},
+	"wheelReport":             {Func: rpcWheelReport, Params: []string{"wheelY"}},
+	"getVideoState":           {Func: rpcGetVideoState},
+	"getUSBState":             {Func: rpcGetUSBState},
+	"unmountImage":            {Func: rpcUnmountImage},
+	"rpcMountBuiltInImage":    {Func: rpcMountBuiltInImage, Params: []string{"filename"}},
+	"setJigglerState":         {Func: rpcSetJigglerState, Params: []string{"enabled"}},
+	"getJigglerState":         {Func: rpcGetJigglerState},
+	"setJigglerConfig":        {Func: rpcSetJigglerConfig, Params: []string{"jigglerConfig"}},
+	"getJigglerConfig":        {Func: rpcGetJigglerConfig},
+	"getTimezones":            {Func: rpcGetTimezones},
+	"sendWOLMagicPacket":      {Func: rpcSendWOLMagicPacket, Params: []string{"macAddress"}},
+	"getStreamQualityFactor":  {Func: rpcGetStreamQualityFactor},
+	"setStreamQualityFactor":  {Func: rpcSetStreamQualityFactor, Params: []string{"factor"}},
+	"getAutoUpdateState":      {Func: rpcGetAutoUpdateState},
+	"setAutoUpdateState":      {Func: rpcSetAutoUpdateState, Params: []string{"enabled"}},
+	"getEDID":                 {Func: rpcGetEDID},
+	"setEDID":                 {Func: rpcSetEDID, Params: []string{"edid"}},
+	"getVideoLogStatus":       {Func: rpcGetVideoLogStatus},
+	"getVideoSleepMode":       {Func: rpcGetVideoSleepMode},
+	"setVideoSleepMode":       {Func: rpcSetVideoSleepMode, Params: []string{"duration"}},
+	"getDevChannelState":      {Func: rpcGetDevChannelState},
+	"setDevChannelState":      {Func: rpcSetDevChannelState, Params: []string{"enabled"}},
+	"getLocalVersion":         {Func: rpcGetLocalVersion},
+	"getUpdateStatus":         {Func: rpcGetUpdateStatus},
+	"tryUpdate":               {Func: rpcTryUpdate},
+	"getDevModeState":         {Func: rpcGetDevModeState},
+	"setDevModeState":         {Func: rpcSetDevModeState, Params: []string{"enabled"}},
+	"getSSHKeyState":          {Func: rpcGetSSHKeyState},
+	"setSSHKeyState":          {Func: rpcSetSSHKeyState, Params: []string{"sshKey"}},
+	"getTLSState":             {Func: rpcGetTLSState},
+	"setTLSState":             {Func: rpcSetTLSState, Params: []string{"state"}},
+	"setMassStorageMode":      {Func: rpcSetMassStorageMode, Params: []string{"mode"}},
+	"getMassStorageMode":      {Func: rpcGetMassStorageMode},
+	"isUpdatePending":         {Func: rpcIsUpdatePending},
+	"getUsbEmulationState":    {Func: rpcGetUsbEmulationState},
+	"setUsbEmulationState":    {Func: rpcSetUsbEmulationState, Params: []string{"enabled"}},
+	"getUsbConfig":            {Func: rpcGetUsbConfig},
+	"setUsbConfig":            {Func: rpcSetUsbConfig, Params: []string{"usbConfig"}},
+	"checkMountUrl":           {Func: rpcCheckMountUrl, Params: []string{"url"}},
+	"getVirtualMediaState":    {Func: rpcGetVirtualMediaState},
+	"getStorageSpace":         {Func: rpcGetStorageSpace},
+	"mountWithHTTP":           {Func: rpcMountWithHTTP, Params: []string{"url", "mode"}},
+	"mountWithStorage":        {Func: rpcMountWithStorage, Params: []string{"filename", "mode"}},
+	"listStorageFiles":        {Func: rpcListStorageFiles},
+	"deleteStorageFile":       {Func: rpcDeleteStorageFile, Params: []string{"filename"}},
+	"startStorageFileUpload":  {Func: rpcStartStorageFileUpload, Params: []string{"filename", "size"}},
+	"getWakeOnLanDevices":     {Func: rpcGetWakeOnLanDevices},
+	"setWakeOnLanDevices":     {Func: rpcSetWakeOnLanDevices, Params: []string{"params"}},
+	"resetConfig":             {Func: rpcResetConfig},
+	"setDisplayRotation":      {Func: rpcSetDisplayRotation, Params: []string{"params"}},
+	"getDisplayRotation":      {Func: rpcGetDisplayRotation},
+	"setBacklightSettings":    {Func: rpcSetBacklightSettings, Params: []string{"params"}},
+	"getBacklightSettings":    {Func: rpcGetBacklightSettings},
+	"getDCPowerState":         {Func: rpcGetDCPowerState},
+	"setDCPowerState":         {Func: rpcSetDCPowerState, Params: []string{"enabled"}},
+	"setDCRestoreState":       {Func: rpcSetDCRestoreState, Params: []string{"state"}},
+	"getActiveExtension":      {Func: rpcGetActiveExtension},
+	"setActiveExtension":      {Func: rpcSetActiveExtension, Params: []string{"extensionId"}},
+	"getATXState":             {Func: rpcGetATXState},
+	"setATXPowerAction":       {Func: rpcSetATXPowerAction, Params: []string{"action"}},
+	"getSerialSettings":       {Func: rpcGetSerialSettings},
+	"setSerialSettings":       {Func: rpcSetSerialSettings, Params: []string{"settings"}},
+	"getUsbDevices":           {Func: rpcGetUsbDevices},
+	"setUsbDevices":           {Func: rpcSetUsbDevices, Params: []string{"devices"}},
+	"setUsbDeviceState":       {Func: rpcSetUsbDeviceState, Params: []string{"device", "enabled"}},
+	"getAudioOutputEnabled":   {Func: rpcGetAudioOutputEnabled},
+	"setAudioOutputEnabled":   {Func: rpcSetAudioOutputEnabled, Params: []string{"enabled"}},
+	"getAudioInputEnabled":    {Func: rpcGetAudioInputEnabled},
+	"setAudioInputEnabled":    {Func: rpcSetAudioInputEnabled, Params: []string{"enabled"}},
+	"getAudioInputAutoEnable": {Func: rpcGetAudioInputAutoEnable},
+	"setAudioInputAutoEnable": {Func: rpcSetAudioInputAutoEnable, Params: []string{"enabled"}},
+	"setCloudUrl":             {Func: rpcSetCloudUrl, Params: []string{"apiUrl", "appUrl"}},
+	"getKeyboardLayout":       {Func: rpcGetKeyboardLayout},
+	"setKeyboardLayout":       {Func: rpcSetKeyboardLayout, Params: []string{"layout"}},
+	"getKeyboardMacros":       {Func: getKeyboardMacros},
+	"setKeyboardMacros":       {Func: setKeyboardMacros, Params: []string{"params"}},
+	"getLocalLoopbackOnly":    {Func: rpcGetLocalLoopbackOnly},
+	"setLocalLoopbackOnly":    {Func: rpcSetLocalLoopbackOnly, Params: []string{"enabled"}},
 }
--- a/ui/localization/messages/da.json
+++ b/ui/localization/messages/da.json
@ -57,6 +57,8 @@
    "audio_input_failed_disable": "Kunne ikke deaktivere lydindgang: {error}",
    "audio_input_failed_enable": "Kunne ikke aktivere lydindgang: {error}",
    "audio_input_title": "Lydindgang (Mikrofon)",
+    "audio_input_auto_enable_disabled": "Automatisk aktivering af mikrofon deaktiveret",
+    "audio_input_auto_enable_enabled": "Automatisk aktivering af mikrofon aktiveret",
    "audio_output_description": "Aktiver lyd fra mål til højttalere",
    "audio_output_disabled": "Lydudgang deaktiveret",
    "audio_output_enabled": "Lydudgang aktiveret",
--- a/ui/localization/messages/de.json
+++ b/ui/localization/messages/de.json
@ -57,6 +57,8 @@
    "audio_input_failed_disable": "Fehler beim Deaktivieren des Audioeingangs: {error}",
    "audio_input_failed_enable": "Fehler beim Aktivieren des Audioeingangs: {error}",
    "audio_input_title": "Audioeingang (Mikrofon)",
+    "audio_input_auto_enable_disabled": "Automatische Mikrofonaktivierung deaktiviert",
+    "audio_input_auto_enable_enabled": "Automatische Mikrofonaktivierung aktiviert",
    "audio_output_description": "Audio vom Ziel zu Lautsprechern aktivieren",
    "audio_output_disabled": "Audioausgang deaktiviert",
    "audio_output_enabled": "Audioausgang aktiviert",
--- a/ui/localization/messages/en.json
+++ b/ui/localization/messages/en.json
@ -57,6 +57,8 @@
    "audio_input_failed_disable": "Failed to disable audio input: {error}",
    "audio_input_failed_enable": "Failed to enable audio input: {error}",
    "audio_input_title": "Audio Input (Microphone)",
+    "audio_input_auto_enable_disabled": "Auto-enable microphone disabled",
+    "audio_input_auto_enable_enabled": "Auto-enable microphone enabled",
    "audio_output_description": "Enable audio from target to speakers",
    "audio_output_disabled": "Audio output disabled",
    "audio_output_enabled": "Audio output enabled",
--- a/ui/localization/messages/es.json
+++ b/ui/localization/messages/es.json
@ -57,6 +57,8 @@
    "audio_input_failed_disable": "Error al desactivar la entrada de audio: {error}",
    "audio_input_failed_enable": "Error al activar la entrada de audio: {error}",
    "audio_input_title": "Entrada de audio (Micrófono)",
+    "audio_input_auto_enable_disabled": "Habilitación automática de micrófono desactivada",
+    "audio_input_auto_enable_enabled": "Habilitación automática de micrófono activada",
    "audio_output_description": "Habilitar audio del objetivo a los altavoces",
    "audio_output_disabled": "Salida de audio desactivada",
    "audio_output_enabled": "Salida de audio activada",
--- a/ui/localization/messages/fr.json
+++ b/ui/localization/messages/fr.json
@ -57,6 +57,8 @@
    "audio_input_failed_disable": "Échec de la désactivation de l'entrée audio : {error}",
    "audio_input_failed_enable": "Échec de l'activation de l'entrée audio : {error}",
    "audio_input_title": "Entrée audio (Microphone)",
+    "audio_input_auto_enable_disabled": "Activation automatique du microphone désactivée",
+    "audio_input_auto_enable_enabled": "Activation automatique du microphone activée",
    "audio_output_description": "Activer l'audio de la cible vers les haut-parleurs",
    "audio_output_disabled": "Sortie audio désactivée",
    "audio_output_enabled": "Sortie audio activée",
--- a/ui/localization/messages/it.json
+++ b/ui/localization/messages/it.json
@ -57,6 +57,8 @@
    "audio_input_failed_disable": "Impossibile disabilitare l'ingresso audio: {error}",
    "audio_input_failed_enable": "Impossibile abilitare l'ingresso audio: {error}",
    "audio_input_title": "Ingresso audio (Microfono)",
+    "audio_input_auto_enable_disabled": "Abilitazione automatica microfono disabilitata",
+    "audio_input_auto_enable_enabled": "Abilitazione automatica microfono abilitata",
    "audio_output_description": "Abilita l'audio dal target agli altoparlanti",
    "audio_output_disabled": "Uscita audio disabilitata",
    "audio_output_enabled": "Uscita audio abilitata",
--- a/ui/localization/messages/nb.json
+++ b/ui/localization/messages/nb.json
@ -57,6 +57,8 @@
    "audio_input_failed_disable": "Kunne ikke deaktivere lydinngang: {error}",
    "audio_input_failed_enable": "Kunne ikke aktivere lydinngang: {error}",
    "audio_input_title": "Lydinngang (Mikrofon)",
+    "audio_input_auto_enable_disabled": "Automatisk aktivering av mikrofon deaktivert",
+    "audio_input_auto_enable_enabled": "Automatisk aktivering av mikrofon aktivert",
    "audio_output_description": "Aktiver lyd fra mål til høyttalere",
    "audio_output_disabled": "Lydutgang deaktivert",
    "audio_output_enabled": "Lydutgang aktivert",
--- a/ui/localization/messages/sv.json
+++ b/ui/localization/messages/sv.json
@ -57,6 +57,8 @@
    "audio_input_failed_disable": "Det gick inte att inaktivera ljudingången: {error}",
    "audio_input_failed_enable": "Det gick inte att aktivera ljudingången: {error}",
    "audio_input_title": "Ljudingång (Mikrofon)",
+    "audio_input_auto_enable_disabled": "Automatisk aktivering av mikrofon inaktiverad",
+    "audio_input_auto_enable_enabled": "Automatisk aktivering av mikrofon aktiverad",
    "audio_output_description": "Aktivera ljud från mål till högtalare",
    "audio_output_disabled": "Ljudutgång inaktiverad",
    "audio_output_enabled": "Ljudutgång aktiverad",
--- a/ui/localization/messages/zh.json
+++ b/ui/localization/messages/zh.json
@ -57,6 +57,8 @@
    "audio_input_failed_disable": "禁用音频输入失败：{error}",
    "audio_input_failed_enable": "启用音频输入失败：{error}",
    "audio_input_title": "音频输入（麦克风）",
+    "audio_input_auto_enable_disabled": "自动启用麦克风已禁用",
+    "audio_input_auto_enable_enabled": "自动启用麦克风已启用",
    "audio_output_description": "启用从目标设备到扬声器的音频",
    "audio_output_disabled": "音频输出已禁用",
    "audio_output_enabled": "音频输出已启用",
--- a/ui/src/components/popovers/AudioPopover.tsx
+++ b/ui/src/components/popovers/AudioPopover.tsx
@ -16,6 +16,7 @@ export default function AudioPopover() {
  const [audioOutputEnabled, setAudioOutputEnabled] = useState<boolean>(true);
  const [usbAudioEnabled, setUsbAudioEnabled] = useState<boolean>(false);
  const [loading, setLoading] = useState(false);
+  const [micLoading, setMicLoading] = useState(false);
  const isHttps = isSecureContext();

  useEffect(() => {
@ -54,6 +55,21 @@ export default function AudioPopover() {
    });
  }, [send]);

+  const handleMicrophoneToggle = useCallback((enabled: boolean) => {
+    setMicLoading(true);
+    send("setAudioInputEnabled", { enabled }, (resp: JsonRpcResponse) => {
+      setMicLoading(false);
+      if ("error" in resp) {
+        const errorMsg = enabled
+          ? m.audio_input_failed_enable({ error: String(resp.error.data || m.unknown_error()) })
+          : m.audio_input_failed_disable({ error: String(resp.error.data || m.unknown_error()) });
+        notifications.error(errorMsg);
+      } else {
+        setMicrophoneEnabled(enabled);
+      }
+    });
+  }, [send, setMicrophoneEnabled]);
+
  return (
    <GridCard>
      <div className="space-y-4 p-4 py-3">
@ -80,6 +96,7 @@ export default function AudioPopover() {
                <div className="h-px w-full bg-slate-800/10 dark:bg-slate-300/20" />

                <SettingsItem
+                  loading={micLoading}
                  title={m.audio_microphone_title()}
                  description={m.audio_microphone_description()}
                  badge={!isHttps ? m.audio_https_only() : undefined}
@ -89,7 +106,7 @@ export default function AudioPopover() {
                  <Checkbox
                    checked={microphoneEnabled}
                    disabled={!isHttps}
-                    onChange={(e) => setMicrophoneEnabled(e.target.checked)}
+                    onChange={(e) => handleMicrophoneToggle(e.target.checked)}
                  />
                </SettingsItem>
              </>
--- a/ui/src/hooks/stores.ts
+++ b/ui/src/hooks/stores.ts
@ -382,6 +382,8 @@ export interface SettingsState {
  setMicrophoneEnabled: (enabled: boolean) => void;
  audioInputAutoEnable: boolean;
  setAudioInputAutoEnable: (enabled: boolean) => void;
+
+  resetMicrophoneState: () => void;
 }

 export const useSettingsStore = create(
@ -430,13 +432,14 @@ export const useSettingsStore = create(
      videoContrast: 1.0,
      setVideoContrast: (value: number) => set({ videoContrast: value }),

-      // Audio settings with defaults
      audioOutputEnabled: true,
      setAudioOutputEnabled: (enabled: boolean) => set({ audioOutputEnabled: enabled }),
      microphoneEnabled: false,
      setMicrophoneEnabled: (enabled: boolean) => set({ microphoneEnabled: enabled }),
      audioInputAutoEnable: false,
      setAudioInputAutoEnable: (enabled: boolean) => set({ audioInputAutoEnable: enabled }),
+
+      resetMicrophoneState: () => set({ microphoneEnabled: false }),
    }),
    {
      name: "settings",
--- a/ui/src/routes/devices.$id.settings.audio.tsx
+++ b/ui/src/routes/devices.$id.settings.audio.tsx
@ -16,20 +16,15 @@ export default function SettingsAudioRoute() {

  useEffect(() => {
    send("getAudioOutputEnabled", {}, (resp: JsonRpcResponse) => {
-      if ("error" in resp) {
-        return;
-      }
+      if ("error" in resp) return;
      settings.setAudioOutputEnabled(resp.result as boolean);
    });

-    send("getAudioInputEnabled", {}, (resp: JsonRpcResponse) => {
-      if ("error" in resp) {
-        return;
-      }
+    send("getAudioInputAutoEnable", {}, (resp: JsonRpcResponse) => {
+      if ("error" in resp) return;
      settings.setAudioInputAutoEnable(resp.result as boolean);
    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [send]);
+  }, [send, settings]);

  const handleAudioOutputEnabledChange = (enabled: boolean) => {
    send("setAudioOutputEnabled", { enabled }, (resp: JsonRpcResponse) => {
@ -47,16 +42,15 @@ export default function SettingsAudioRoute() {
  };

  const handleAudioInputAutoEnableChange = (enabled: boolean) => {
-    send("setAudioInputEnabled", { enabled }, (resp: JsonRpcResponse) => {
+    send("setAudioInputAutoEnable", { enabled }, (resp: JsonRpcResponse) => {
      if ("error" in resp) {
-        const errorMsg = enabled
-          ? m.audio_input_failed_enable({ error: String(resp.error.data || m.unknown_error()) })
-          : m.audio_input_failed_disable({ error: String(resp.error.data || m.unknown_error()) });
-        notifications.error(errorMsg);
+        notifications.error(String(resp.error.data || m.unknown_error()));
        return;
      }
      settings.setAudioInputAutoEnable(enabled);
-      const successMsg = enabled ? m.audio_input_enabled() : m.audio_input_disabled();
+      const successMsg = enabled
+        ? m.audio_input_auto_enable_enabled()
+        : m.audio_input_auto_enable_disabled();
      notifications.success(successMsg);
    });
  };
--- a/ui/src/routes/devices.$id.tsx
+++ b/ui/src/routes/devices.$id.tsx
@ -538,11 +538,6 @@ export default function KvmIdRoute() {
    const audioTrans = pc.addTransceiver("audio", { direction: "sendrecv" });
    setAudioTransceiver(audioTrans);

-    // Enable microphone if auto-enable is on (only works over HTTPS or localhost)
-    if (audioInputAutoEnable && isSecureContext()) {
-      setMicrophoneEnabled(true);
-    }
-
    const rpcDataChannel = pc.createDataChannel("rpc");
    rpcDataChannel.onclose = () => console.log("rpcDataChannel has closed");
    rpcDataChannel.onerror = (ev: Event) => console.error(`Error on DataChannel '${rpcDataChannel.label}': ${ev}`);
@ -606,47 +601,39 @@ export default function KvmIdRoute() {
    }
  }, [peerConnectionState, cleanupAndStopReconnecting]);

-  // Handle dynamic microphone enable/disable
  useEffect(() => {
    if (!audioTransceiver || !peerConnection) return;

    if (microphoneEnabled) {
-      // Request microphone access
-      if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
-        navigator.mediaDevices.getUserMedia({
-          audio: {
-            echoCancellation: true,
-            noiseSuppression: true,
-            autoGainControl: true,
-            channelCount: 2,
-          }
-        }).then((stream) => {
-          const audioTrack = stream.getAudioTracks()[0];
-          if (audioTrack && audioTransceiver.sender) {
-            audioTransceiver.sender.replaceTrack(audioTrack);
-            console.log("Microphone enabled");
-          }
-        }).catch((err) => {
-          console.warn("Microphone access denied or unavailable:", err.message);
-          setMicrophoneEnabled(false);
-        });
-      }
+      navigator.mediaDevices?.getUserMedia({
+        audio: {
+          echoCancellation: true,
+          noiseSuppression: true,
+          autoGainControl: true,
+          channelCount: 2,
+        }
+      }).then((stream) => {
+        const audioTrack = stream.getAudioTracks()[0];
+        if (audioTrack && audioTransceiver.sender) {
+          audioTransceiver.sender.replaceTrack(audioTrack);
+        }
+      }).catch(() => {
+        setMicrophoneEnabled(false);
+      });
    } else {
-      // Disable microphone by removing the track
      if (audioTransceiver.sender.track) {
        audioTransceiver.sender.track.stop();
        audioTransceiver.sender.replaceTrack(null);
-        console.log("Microphone disabled");
      }
    }
-  }, [microphoneEnabled, audioTransceiver, peerConnection, setMicrophoneEnabled]);
+  }, [microphoneEnabled, audioTransceiver, peerConnection]);

-  // Auto-enable microphone when setting is loaded from backend
  useEffect(() => {
-    if (audioInputAutoEnable && audioTransceiver && peerConnection && !microphoneEnabled && isSecureContext()) {
+    if (!audioTransceiver || !peerConnection || !audioInputAutoEnable || microphoneEnabled) return;
+    if (isSecureContext()) {
      setMicrophoneEnabled(true);
    }
-  }, [audioInputAutoEnable, audioTransceiver, peerConnection, microphoneEnabled, setMicrophoneEnabled]);
+  }, [audioInputAutoEnable, audioTransceiver, peerConnection, microphoneEnabled]);

  // Cleanup effect
  const { clearInboundRtpStats, clearCandidatePairStats } = useRTCStore();
@ -806,15 +793,6 @@ export default function KvmIdRoute() {

  const { send } = useJsonRpc(onJsonRpcRequest);

-  // Load audio input auto-enable setting from backend on mount
-  useEffect(() => {
-    send("getAudioInputEnabled", {}, (resp: JsonRpcResponse) => {
-      if ("error" in resp) {
-        return;
-      }
-      setAudioInputAutoEnable(resp.result as boolean);
-    });
-  }, [send, setAudioInputAutoEnable]);

  useEffect(() => {
    if (rpcDataChannel?.readyState !== "open") return;
@ -827,6 +805,15 @@ export default function KvmIdRoute() {
    });
  }, [rpcDataChannel?.readyState, send, setHdmiState]);

+  // Load audio input auto-enable preference from backend
+  useEffect(() => {
+    if (rpcDataChannel?.readyState !== "open") return;
+    send("getAudioInputAutoEnable", {}, (resp: JsonRpcResponse) => {
+      if ("error" in resp) return;
+      setAudioInputAutoEnable(resp.result as boolean);
+    });
+  }, [rpcDataChannel?.readyState, send, setAudioInputAutoEnable]);
+
  const [needLedState, setNeedLedState] = useState(true);

  // request keyboard led state from the device
--- a/ui/src/routes/login-local.tsx
+++ b/ui/src/routes/login-local.tsx
@ -16,8 +16,11 @@ import { DeviceStatus } from "@routes/welcome-local";
 import { DEVICE_API } from "@/ui.config";
 import api from "@/api";
 import { m } from "@localizations/messages.js";
+import { useSettingsStore } from "@/hooks/stores";

 const loader: LoaderFunction = async () => {
+  useSettingsStore.getState().resetMicrophoneState();
+
  const res = await api
    .GET(`${DEVICE_API}/device/status`)
    .then(res => res.json() as Promise<DeviceStatus>);
--- a/ui/src/routes/login.tsx
+++ b/ui/src/routes/login.tsx
@ -1,13 +1,19 @@
+import { useEffect } from "react";
 import { useLocation, useSearchParams } from "react-router";

 import { m } from "@localizations/messages.js";
 import AuthLayout from "@components/AuthLayout";
+import { useSettingsStore } from "@/hooks/stores";

 export default function LoginRoute() {
  const [sq] = useSearchParams();
  const location = useLocation();
  const deviceId = sq.get("deviceId") || location.state?.deviceId;

+  useEffect(() => {
+    useSettingsStore.getState().resetMicrophoneState();
+  }, []);
+
  if (deviceId) {
    return (
      <AuthLayout
Author	SHA1	Message	Date
Alex	7397408052	Merge `336a75812f` into `1d1e58f036`	2025-11-04 09:17:45 +00:00
Alex P	336a75812f	feat: add visual feedback for auto-enable microphone toggle Added success notifications when toggling auto-enable microphone setting. Includes translations for all supported languages.	2025-11-04 11:17:29 +02:00
Alex P	ce4ea10551	fix: handle audio track recreation to prevent microphone failures When browsers recreate audio tracks during long sessions, the backend now properly handles the new track instead of ignoring it. Old track handlers detect when they've been superseded and exit cleanly to prevent goroutine leaks.	2025-11-04 10:40:35 +02:00
Alex P	3448663afa	feat: persist audio preferences to backend config - Add AudioInputAutoEnable and AudioOutputEnabled fields to backend config - Implement RPC methods for get/set audio input auto-enable preference - Load audio output enabled state from config on startup - Make manual microphone toggle call backend to enable audio pipeline - Auto-enable preference now persists across incognito sessions - Reset microphone state to off when reaching login pages - Fix issue where manual mic toggle required auto-enable to be on	2025-11-04 08:52:27 +02:00