diff --git a/jsonrpc.go b/jsonrpc.go index 7cd62c2d..4dfc766b 100644 --- a/jsonrpc.go +++ b/jsonrpc.go @@ -10,13 +10,11 @@ import ( "os/exec" "path/filepath" "reflect" - "strconv" "sync" "time" "github.com/pion/webrtc/v4" "github.com/rs/zerolog" - "go.bug.st/serial" "github.com/jetkvm/kvm/internal/hidrpc" "github.com/jetkvm/kvm/internal/usbgadget" @@ -829,103 +827,12 @@ func rpcSendCustomCommand(command string) error { return nil } -type SerialSettings struct { - BaudRate string `json:"baudRate"` - DataBits string `json:"dataBits"` - StopBits string `json:"stopBits"` - Parity string `json:"parity"` -} - func rpcGetSerialSettings() (SerialSettings, error) { - settings := SerialSettings{ - BaudRate: strconv.Itoa(serialPortMode.BaudRate), - DataBits: strconv.Itoa(serialPortMode.DataBits), - StopBits: "1", - Parity: "none", - } - - switch serialPortMode.StopBits { - case serial.OneStopBit: - settings.StopBits = "1" - case serial.OnePointFiveStopBits: - settings.StopBits = "1.5" - case serial.TwoStopBits: - settings.StopBits = "2" - } - - switch serialPortMode.Parity { - case serial.NoParity: - settings.Parity = "none" - case serial.OddParity: - settings.Parity = "odd" - case serial.EvenParity: - settings.Parity = "even" - case serial.MarkParity: - settings.Parity = "mark" - case serial.SpaceParity: - settings.Parity = "space" - } - - return settings, nil -} - -var serialPortMode = defaultMode - -func rpcSetSerialSettings(settings SerialSettings) error { - baudRate, err := strconv.Atoi(settings.BaudRate) - if err != nil { - return fmt.Errorf("invalid baud rate: %v", err) - } - dataBits, err := strconv.Atoi(settings.DataBits) - if err != nil { - return fmt.Errorf("invalid data bits: %v", err) - } - - var stopBits serial.StopBits - switch settings.StopBits { - case "1": - stopBits = serial.OneStopBit - case "1.5": - stopBits = serial.OnePointFiveStopBits - case "2": - stopBits = serial.TwoStopBits - default: - return fmt.Errorf("invalid stop bits: %s", settings.StopBits) - } - - var parity serial.Parity - switch settings.Parity { - case "none": - parity = serial.NoParity - case "odd": - parity = serial.OddParity - case "even": - parity = serial.EvenParity - case "mark": - parity = serial.MarkParity - case "space": - parity = serial.SpaceParity - default: - return fmt.Errorf("invalid parity: %s", settings.Parity) - } - serialPortMode = &serial.Mode{ - BaudRate: baudRate, - DataBits: dataBits, - StopBits: stopBits, - Parity: parity, - } - - _ = port.SetMode(serialPortMode) - - return nil -} - -func rpcGetSerialButtonConfig() (CustomButtonSettings, error) { return getSerialSettings() } -func rpcSetSerialButtonConfig(config CustomButtonSettings) error { - return setSerialSettings(config) +func rpcSetSerialSettings(settings SerialSettings) error { + return setSerialSettings(settings) } const SerialCommandHistoryPath = "/userdata/serialCommandHistory.json" @@ -968,6 +875,30 @@ func rpcSetSerialCommandHistory(commandHistory []string) error { return nil } +func rpcDeleteSerialCommandHistory() error { + logger.Trace().Str("path", SerialCommandHistoryPath).Msg("Deleting serial command history") + empty := []string{} + + file, err := os.Create(SerialCommandHistoryPath) + if err != nil { + return fmt.Errorf("failed to create SerialCommandHistory file: %w", err) + } + defer file.Close() + + encoder := json.NewEncoder(file) + encoder.SetIndent("", " ") + if err := encoder.Encode(empty); err != nil { + return fmt.Errorf("failed to encode SerialCommandHistory: %w", err) + } + + return nil +} + +func rpcSetTerminalPaused(terminalPaused bool) error { + setTerminalPaused(terminalPaused) + return nil +} + func rpcGetUsbDevices() (usbgadget.Devices, error) { return *config.UsbDevices, nil } @@ -1243,94 +1174,94 @@ 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}, - "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"}}, - "sendCustomCommand": {Func: rpcSendCustomCommand, Params: []string{"command"}}, - "getSerialSettings": {Func: rpcGetSerialSettings}, - "setSerialSettings": {Func: rpcSetSerialSettings, Params: []string{"settings"}}, - "getSerialButtonConfig": {Func: rpcGetSerialButtonConfig}, - "setSerialButtonConfig": {Func: rpcSetSerialButtonConfig, Params: []string{"config"}}, - "getSerialCommandHistory": {Func: rpcGetSerialCommandHistory}, - "setSerialCommandHistory": {Func: rpcSetSerialCommandHistory, Params: []string{"commandHistory"}}, - "getUsbDevices": {Func: rpcGetUsbDevices}, - "setUsbDevices": {Func: rpcSetUsbDevices, Params: []string{"devices"}}, - "setUsbDeviceState": {Func: rpcSetUsbDeviceState, Params: []string{"device", "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}, + "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"}}, + "sendCustomCommand": {Func: rpcSendCustomCommand, Params: []string{"command"}}, + "getSerialSettings": {Func: rpcGetSerialSettings}, + "setSerialSettings": {Func: rpcSetSerialSettings, Params: []string{"settings"}}, + "getSerialCommandHistory": {Func: rpcGetSerialCommandHistory}, + "setSerialCommandHistory": {Func: rpcSetSerialCommandHistory, Params: []string{"commandHistory"}}, + "deleteSerialCommandHistory": {Func: rpcDeleteSerialCommandHistory}, + "setTerminalPaused": {Func: rpcSetTerminalPaused, Params: []string{"terminalPaused"}}, + "getUsbDevices": {Func: rpcGetUsbDevices}, + "setUsbDevices": {Func: rpcSetUsbDevices, Params: []string{"devices"}}, + "setUsbDeviceState": {Func: rpcSetUsbDeviceState, Params: []string{"device", "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"}}, } diff --git a/serial.go b/serial.go index 0d32d9c6..02301822 100644 --- a/serial.go +++ b/serial.go @@ -2,10 +2,8 @@ package kvm import ( "bufio" - "encoding/base64" "encoding/json" "fmt" - "io" "os" "strconv" "strings" @@ -19,7 +17,7 @@ const serialPortPath = "/dev/ttyS3" var port serial.Port var serialMux *SerialMux -var consoleBr *ConsoleBroker +var consoleBroker *ConsoleBroker func mountATXControl() error { _ = port.SetMode(defaultMode) @@ -267,69 +265,15 @@ func unmountSerialButtons() error { return nil } -// ---- Serial Buttons RX fan-out (JSON-RPC events) ---- -var serialButtonsRXStopCh chan struct{} - -func startSerialButtonsRxLoop(session *Session) { - scopedLogger := serialLogger.With().Str("service", "custom_buttons_rx").Logger() - scopedLogger.Debug().Msg("Attempting to start RX reader.") - // Stop previous loop if running - if serialButtonsRXStopCh != nil { - stopSerialButtonsRxLoop() - } - serialButtonsRXStopCh = make(chan struct{}) - - go func() { - buf := make([]byte, 4096) - scopedLogger.Debug().Msg("Starting loop") - - for { - select { - case <-serialButtonsRXStopCh: - return - default: - if currentSession == nil { - time.Sleep(500 * time.Millisecond) - continue - } - n, err := port.Read(buf) - if err != nil { - if err != io.EOF { - scopedLogger.Debug().Err(err).Msg("serial RX read error") - } - time.Sleep(50 * time.Millisecond) - continue - } - if n == 0 { - continue - } - // Safe for any bytes: wrap in Base64 - b64 := base64.StdEncoding.EncodeToString(buf[:n]) - writeJSONRPCEvent("serial.rx", map[string]any{ - "base64": b64, - }, currentSession) - } - } - }() -} - -func stopSerialButtonsRxLoop() { - scopedLogger := serialLogger.With().Str("service", "custom_buttons_rx").Logger() - scopedLogger.Debug().Msg("Stopping RX reader.") - if serialButtonsRXStopCh != nil { - close(serialButtonsRXStopCh) - serialButtonsRXStopCh = nil - } -} - func sendCustomCommand(command string) error { scopedLogger := serialLogger.With().Str("service", "custom_buttons_tx").Logger() scopedLogger.Info().Str("Command", command).Msg("Sending custom command.") - _, err := port.Write([]byte(command)) - if err != nil { - scopedLogger.Warn().Err(err).Str("Command", command).Msg("Failed to send serial command") - return err + scopedLogger.Info().Msgf("Sending custom command: %q", command) + if serialMux == nil { + return fmt.Errorf("serial mux not initialized") } + payload := []byte(command) + serialMux.Enqueue(payload, "button", true) // echo if enabled return nil } @@ -340,15 +284,19 @@ var defaultMode = &serial.Mode{ StopBits: serial.OneStopBit, } -var SerialConfig = CustomButtonSettings{ +var serialPortMode = defaultMode + +var serialConfig = SerialSettings{ BaudRate: defaultMode.BaudRate, DataBits: defaultMode.DataBits, Parity: "none", StopBits: "1", - Terminator: Terminator{Label: "CR (\\r)", Value: "\r"}, - LineMode: true, + Terminator: Terminator{Label: "LF (\\n)", Value: "\n"}, HideSerialSettings: false, EnableEcho: false, + NormalizeMode: "names", + NormalizeLineEnd: "keep", + PreserveANSI: true, Buttons: []QuickButton{}, } @@ -368,62 +316,137 @@ type QuickButton struct { } // Mode describes a serial port configuration. -type CustomButtonSettings struct { +type SerialSettings struct { BaudRate int `json:"baudRate"` // The serial port bitrate (aka Baudrate) DataBits int `json:"dataBits"` // Size of the character (must be 5, 6, 7 or 8) Parity string `json:"parity"` // Parity (see Parity type for more info) StopBits string `json:"stopBits"` // Stop bits (see StopBits type for more info) Terminator Terminator `json:"terminator"` // Terminator to send after each command - LineMode bool `json:"lineMode"` // Whether to send each line when Enter is pressed, or each character immediately HideSerialSettings bool `json:"hideSerialSettings"` // Whether to hide the serial settings in the UI EnableEcho bool `json:"enableEcho"` // Whether to echo received characters back to the sender + NormalizeMode string `json:"normalizeMode"` // Normalization mode: "carret", "names", "hex" + NormalizeLineEnd string `json:"normalizeLineEnd"` // Line ending normalization: "keep", "lf", "cr", "crlf" + PreserveANSI bool `json:"preserveANSI"` // Whether to preserve ANSI escape codes Buttons []QuickButton `json:"buttons"` // Custom quick buttons } -func getSerialSettings() (CustomButtonSettings, error) { +func getSerialSettings() (SerialSettings, error) { switch defaultMode.StopBits { case serial.OneStopBit: - SerialConfig.StopBits = "1" + serialConfig.StopBits = "1" case serial.OnePointFiveStopBits: - SerialConfig.StopBits = "1.5" + serialConfig.StopBits = "1.5" case serial.TwoStopBits: - SerialConfig.StopBits = "2" + serialConfig.StopBits = "2" } switch defaultMode.Parity { case serial.NoParity: - SerialConfig.Parity = "none" + serialConfig.Parity = "none" case serial.OddParity: - SerialConfig.Parity = "odd" + serialConfig.Parity = "odd" case serial.EvenParity: - SerialConfig.Parity = "even" + serialConfig.Parity = "even" case serial.MarkParity: - SerialConfig.Parity = "mark" + serialConfig.Parity = "mark" case serial.SpaceParity: - SerialConfig.Parity = "space" + serialConfig.Parity = "space" } file, err := os.Open(serialSettingsPath) if err != nil { logger.Debug().Msg("SerialButtons config file doesn't exist, using default") - return SerialConfig, err + return serialConfig, err } defer file.Close() // load and merge the default config with the user config - var loadedConfig CustomButtonSettings + var loadedConfig SerialSettings if err := json.NewDecoder(file).Decode(&loadedConfig); err != nil { logger.Warn().Err(err).Msg("SerialButtons config file JSON parsing failed") - return SerialConfig, nil + return serialConfig, nil } - SerialConfig = loadedConfig // Update global config + serialConfig = loadedConfig // Update global config + + // Apply settings to serial port, when opening the extension + var stopBits serial.StopBits + switch serialConfig.StopBits { + case "1": + stopBits = serial.OneStopBit + case "1.5": + stopBits = serial.OnePointFiveStopBits + case "2": + stopBits = serial.TwoStopBits + } + + var parity serial.Parity + switch serialConfig.Parity { + case "none": + parity = serial.NoParity + case "odd": + parity = serial.OddParity + case "even": + parity = serial.EvenParity + case "mark": + parity = serial.MarkParity + case "space": + parity = serial.SpaceParity + } + + serialPortMode = &serial.Mode{ + BaudRate: serialConfig.BaudRate, + DataBits: serialConfig.DataBits, + StopBits: stopBits, + Parity: parity, + } + + _ = port.SetMode(serialPortMode) + + if serialMux != nil { + serialMux.SetEchoEnabled(serialConfig.EnableEcho) + } + + var normalizeMode NormalizeMode + switch serialConfig.NormalizeMode { + case "carret": + normalizeMode = ModeCaret + case "names": + normalizeMode = ModeNames + case "hex": + normalizeMode = ModeHex + default: + normalizeMode = ModeNames + } + + var crlfMode CRLFMode + switch serialConfig.NormalizeLineEnd { + case "keep": + crlfMode = CRLFAsIs + case "lf": + crlfMode = CRLF_LF + case "cr": + crlfMode = CRLF_CR + case "crlf": + crlfMode = CRLF_CRLF + case "lfcr": + crlfMode = CRLF_LFCR + default: + crlfMode = CRLFAsIs + } + + if consoleBroker != nil { + norm := NormOptions{ + Mode: normalizeMode, CRLF: crlfMode, TabRender: "", PreserveANSI: serialConfig.PreserveANSI, + } + consoleBroker.SetNormOptions(norm) + } return loadedConfig, nil } -func setSerialSettings(newSettings CustomButtonSettings) error { +func setSerialSettings(newSettings SerialSettings) error { logger.Trace().Str("path", serialSettingsPath).Msg("Saving config") file, err := os.Create(serialSettingsPath) @@ -474,15 +497,56 @@ func setSerialSettings(newSettings CustomButtonSettings) error { _ = port.SetMode(serialPortMode) - SerialConfig = newSettings // Update global config + serialConfig = newSettings // Update global config if serialMux != nil { - serialMux.SetEchoEnabled(SerialConfig.EnableEcho) + serialMux.SetEchoEnabled(serialConfig.EnableEcho) + } + + var normalizeMode NormalizeMode + switch serialConfig.NormalizeMode { + case "carret": + normalizeMode = ModeCaret + case "names": + normalizeMode = ModeNames + case "hex": + normalizeMode = ModeHex + default: + normalizeMode = ModeNames + } + + var crlfMode CRLFMode + switch serialConfig.NormalizeLineEnd { + case "keep": + crlfMode = CRLFAsIs + case "lf": + crlfMode = CRLF_LF + case "cr": + crlfMode = CRLF_CR + case "crlf": + crlfMode = CRLF_CRLF + case "lfcr": + crlfMode = CRLF_LFCR + default: + crlfMode = CRLFAsIs + } + + if consoleBroker != nil { + norm := NormOptions{ + Mode: normalizeMode, CRLF: crlfMode, TabRender: "", PreserveANSI: serialConfig.PreserveANSI, + } + consoleBroker.SetNormOptions(norm) } return nil } +func setTerminalPaused(paused bool) { + if consoleBroker != nil { + consoleBroker.SetTerminalPaused(paused) + } +} + func initSerialPort() { _ = reopenSerialPort() switch config.ActiveExtension { @@ -510,80 +574,61 @@ func reopenSerialPort() error { // new broker (no sink yet—set it in handleSerialChannel.OnOpen) norm := NormOptions{ - Mode: ModeCaret, CRLF: CRLF_CRLF, TabRender: "", PreserveANSI: true, + Mode: ModeNames, CRLF: CRLF_LF, TabRender: "", PreserveANSI: true, } - if consoleBr != nil { - consoleBr.Close() + if consoleBroker != nil { + consoleBroker.Close() } - consoleBr = NewConsoleBroker(nil, norm) - consoleBr.Start() + consoleBroker = NewConsoleBroker(nil, norm) + consoleBroker.Start() // new mux if serialMux != nil { serialMux.Close() } - serialMux = NewSerialMux(port, consoleBr) - serialMux.SetEchoEnabled(SerialConfig.EnableEcho) // honor your setting + serialMux = NewSerialMux(port, consoleBroker) + serialMux.SetEchoEnabled(serialConfig.EnableEcho) // honor your setting serialMux.Start() - serialMux.SetEchoEnabled(SerialConfig.EnableEcho) return nil } -func handleSerialChannel(d *webrtc.DataChannel) { +func handleSerialChannel(dataChannel *webrtc.DataChannel) { scopedLogger := serialLogger.With(). - Uint16("data_channel_id", *d.ID()).Logger() + Uint16("data_channel_id", *dataChannel.ID()).Str("service", "serial terminal channel").Logger() + + dataChannel.OnOpen(func() { - d.OnOpen(func() { - // go func() { - // buf := make([]byte, 1024) - // for { - // n, err := port.Read(buf) - // if err != nil { - // if err != io.EOF { - // scopedLogger.Warn().Err(err).Msg("Failed to read from serial port") - // } - // break - // } - // err = d.Send(buf[:n]) - // if err != nil { - // scopedLogger.Warn().Err(err).Msg("Failed to send serial output") - // break - // } - // } - // }() // Plug the terminal sink into the broker - if consoleBr != nil { - consoleBr.SetSink(dataChannelSink{d: d}) - _ = d.SendText("RX: [serial attached]\r\n") + scopedLogger.Info().Msg("Opening serial channel from console broker") + if consoleBroker != nil { + consoleBroker.SetSink(dataChannelSink{dataChannel: dataChannel}) + _ = dataChannel.SendText("RX: [serial attached]\n") + scopedLogger.Info().Msg("Serial channel is now active") } }) - d.OnMessage(func(msg webrtc.DataChannelMessage) { - // if port == nil { - // return - // } - // _, err := port.Write(append(msg.Data, []byte(SerialConfig.Terminator.Value)...)) - // if err != nil { - // scopedLogger.Warn().Err(err).Msg("Failed to write to serial") - // } + dataChannel.OnMessage(func(msg webrtc.DataChannelMessage) { + + scopedLogger.Info().Bytes("Data:", msg.Data).Msg("Sending data to serial mux") + scopedLogger.Info().Msgf("Sending data to serial mux: %q", msg.Data) if serialMux == nil { return } - payload := append(msg.Data, []byte(SerialConfig.Terminator.Value)...) + // requestEcho=true — the mux will honor it only if EnableEcho is on - serialMux.Enqueue(payload, "webrtc", true) + serialMux.Enqueue(msg.Data, "webrtc", true) }) - d.OnError(func(err error) { + dataChannel.OnError(func(err error) { scopedLogger.Warn().Err(err).Msg("Serial channel error") }) - d.OnClose(func() { + dataChannel.OnClose(func() { scopedLogger.Info().Msg("Serial channel closed") - if consoleBr != nil { - consoleBr.SetSink(nil) + if consoleBroker != nil { + consoleBroker.SetSink(nil) } }) } diff --git a/serial_console_helpers.go b/serial_console_helpers.go index aded0f8d..4d6e2bb9 100644 --- a/serial_console_helpers.go +++ b/serial_console_helpers.go @@ -17,9 +17,9 @@ type Sink interface { SendText(s string) error } -type dataChannelSink struct{ d *webrtc.DataChannel } +type dataChannelSink struct{ dataChannel *webrtc.DataChannel } -func (s dataChannelSink) SendText(str string) error { return s.d.SendText(str) } +func (sink dataChannelSink) SendText(str string) error { return sink.dataChannel.SendText(str) } /* ---------- NORMALIZATION (applies to RX & TX) ---------- */ @@ -35,9 +35,10 @@ type CRLFMode int const ( CRLFAsIs CRLFMode = iota - CRLF_CRLF CRLF_LF CRLF_CR + CRLF_CRLF + CRLF_LFCR ) type NormOptions struct { @@ -93,14 +94,6 @@ func normalize(in []byte, opt NormOptions) string { case CRLFAsIs: out.WriteByte(b) i++ - case CRLF_CRLF: - if i+1 < len(in) && ((b == '\r' && in[i+1] == '\n') || (b == '\n' && in[i+1] == '\r')) { - out.WriteString("\r\n") - i += 2 - } else { - out.WriteString("\r\n") - i++ - } case CRLF_LF: if i+1 < len(in) && ((b == '\r' && in[i+1] == '\n') || (b == '\n' && in[i+1] == '\r')) { i += 2 @@ -115,6 +108,22 @@ func normalize(in []byte, opt NormOptions) string { i++ } out.WriteByte('\r') + case CRLF_CRLF: + if i+1 < len(in) && ((b == '\r' && in[i+1] == '\n') || (b == '\n' && in[i+1] == '\r')) { + out.WriteString("\n") + i += 2 + } else { + out.WriteString("\n") + i++ + } + case CRLF_LFCR: + if i+1 < len(in) && ((b == '\r' && in[i+1] == '\n') || (b == '\n' && in[i+1] == '\r')) { + out.WriteString("\r") + i += 2 + } else { + out.WriteString("\r") + i++ + } } continue } @@ -184,11 +193,22 @@ type ConsoleBroker struct { in chan consoleEvent done chan struct{} + // pause control + terminalPaused bool + pauseCh chan bool + + // buffered output while paused + bufLines []string + bufBytes int + maxBufLines int + maxBufBytes int + // line-aware echo - rxAtLineEnd bool - pendingTX *consoleEvent - quietTimer *time.Timer - quietAfter time.Duration + rxAtLineEnd bool + txLineActive bool // true if we’re mid-line (prefix already written) + pendingTX *consoleEvent + quietTimer *time.Timer + quietAfter time.Duration // normalization norm NormOptions @@ -200,42 +220,78 @@ type ConsoleBroker struct { func NewConsoleBroker(s Sink, norm NormOptions) *ConsoleBroker { return &ConsoleBroker{ - sink: s, - in: make(chan consoleEvent, 256), - done: make(chan struct{}), - rxAtLineEnd: true, - quietAfter: 120 * time.Millisecond, - norm: norm, - labelRX: "RX", - labelTX: "TX", + sink: s, + in: make(chan consoleEvent, 256), + done: make(chan struct{}), + pauseCh: make(chan bool, 8), + terminalPaused: false, + rxAtLineEnd: true, + txLineActive: false, + quietAfter: 120 * time.Millisecond, + norm: norm, + labelRX: "RX", + labelTX: "TX", + // reasonable defaults; tweak as you like + maxBufLines: 5000, + maxBufBytes: 1 << 20, // 1 MiB } } -func (b *ConsoleBroker) Start() { go b.loop() } -func (b *ConsoleBroker) Close() { close(b.done) } -func (b *ConsoleBroker) SetSink(s Sink) { b.sink = s } +func (b *ConsoleBroker) Start() { go b.loop() } +func (b *ConsoleBroker) Close() { close(b.done) } +func (b *ConsoleBroker) SetSink(s Sink) { b.sink = s } +func (b *ConsoleBroker) SetNormOptions(norm NormOptions) { b.norm = norm } +func (b *ConsoleBroker) SetTerminalPaused(v bool) { + if b == nil { + return + } + // send to broker loop to avoid data races + select { + case b.pauseCh <- v: + default: + b.pauseCh <- v + } +} func (b *ConsoleBroker) Enqueue(ev consoleEvent) { b.in <- ev // blocking is fine; adjust if you want drop semantics } func (b *ConsoleBroker) loop() { + scopedLogger := serialLogger.With().Str("service", "Serial Console Broker").Logger() for { select { case <-b.done: return + + case v := <-b.pauseCh: + // apply pause state + was := b.terminalPaused + b.terminalPaused = v + if was && !v { + // we just unpaused: flush buffered output in order + scopedLogger.Info().Msg("Terminal unpaused; flushing buffered output") + b.flushBuffer() + } else if !was && v { + scopedLogger.Info().Msg("Terminal paused; buffering output") + } + case ev := <-b.in: switch ev.kind { case evRX: + scopedLogger.Info().Msg("Processing RX data from serial port") b.handleRX(ev.data) case evTX: + scopedLogger.Info().Msg("Processing TX echo request") b.handleTX(ev.data) } + case <-b.quietCh(): if b.pendingTX != nil { - _ = b.sink.SendText("\r\n") + b.emitToTerminal(b.lineSep()) // use CRLF policy b.flushPendingTX() b.rxAtLineEnd = true + b.txLineActive = false } } } @@ -268,12 +324,14 @@ func (b *ConsoleBroker) stopQuietTimer() { } func (b *ConsoleBroker) handleRX(data []byte) { + scopedLogger := serialLogger.With().Str("service", "Serial Console Broker RX handler").Logger() if b.sink == nil || len(data) == 0 { return } text := normalize(data, b.norm) if text != "" { - _ = b.sink.SendText(fmt.Sprintf("%s: %s", b.labelRX, text)) + scopedLogger.Info().Msg("Emitting RX data to sink") + b.emitToTerminal(fmt.Sprintf("%s: %s", b.labelRX, text)) } last := data[len(data)-1] @@ -286,23 +344,46 @@ func (b *ConsoleBroker) handleRX(data []byte) { } func (b *ConsoleBroker) handleTX(data []byte) { + scopedLogger := serialLogger.With().Str("service", "Serial Console Broker TX handler").Logger() if b.sink == nil || len(data) == 0 { return } if b.rxAtLineEnd && b.pendingTX == nil { - _ = b.sink.SendText("\r\n") + scopedLogger.Info().Msg("Emitting TX data to sink immediately") b.emitTX(data) - b.rxAtLineEnd = true return } + scopedLogger.Info().Msg("Queuing TX data to emit after RX line completion or quiet period") b.pendingTX = &consoleEvent{kind: evTX, data: append([]byte(nil), data...)} b.startQuietTimer() } func (b *ConsoleBroker) emitTX(data []byte) { + scopedLogger := serialLogger.With().Str("service", "Serial Console Broker TX emiter").Logger() + if len(data) == 0 { + return + } + text := normalize(data, b.norm) - if text != "" { - _ = b.sink.SendText(fmt.Sprintf("%s: %s\r\n", b.labelTX, text)) + if text == "" { + return + } + + // Check if we’re in the middle of a TX line + if !b.txLineActive { + // Start new TX line with prefix + scopedLogger.Info().Msg("Emitting TX data to sink with prefix") + b.emitToTerminal(fmt.Sprintf("%s: %s", b.labelTX, text)) + b.txLineActive = true + } else { + // Continue current line (no prefix) + scopedLogger.Info().Msg("Emitting TX data to sink without prefix") + b.emitToTerminal(text) + } + + // If the data ends with a newline, mark TX line as complete + if strings.HasSuffix(text, "\r") || strings.HasSuffix(text, "\n") { + b.txLineActive = false } } @@ -312,6 +393,57 @@ func (b *ConsoleBroker) flushPendingTX() { } b.emitTX(b.pendingTX.data) b.pendingTX = nil + b.txLineActive = false +} + +func (b *ConsoleBroker) lineSep() string { + switch b.norm.CRLF { + case CRLF_CRLF: + return "\r\n" + case CRLF_CR: + return "\r" + case CRLF_LF: + return "\n" + default: + return "\n" + } +} + +func (b *ConsoleBroker) emitToTerminal(s string) { + if b.sink == nil || s == "" { + return + } + if b.terminalPaused { + b.enqueueBuffered(s) + return + } + _ = b.sink.SendText(s) +} + +func (b *ConsoleBroker) enqueueBuffered(s string) { + b.bufLines = append(b.bufLines, s) + b.bufBytes += len(s) + // trim if over limits (drop oldest) + for b.bufBytes > b.maxBufBytes || len(b.bufLines) > b.maxBufLines { + if len(b.bufLines) == 0 { + break + } + b.bufBytes -= len(b.bufLines[0]) + b.bufLines = b.bufLines[1:] + } +} + +func (b *ConsoleBroker) flushBuffer() { + if b.sink == nil || len(b.bufLines) == 0 { + b.bufLines = nil + b.bufBytes = 0 + return + } + for _, s := range b.bufLines { + _ = b.sink.SendText(s) + } + b.bufLines = nil + b.bufBytes = 0 } /* ---------- SERIAL MUX (single reader/writer, emits to broker) ---------- */ @@ -351,10 +483,12 @@ func (m *SerialMux) Close() { close(m.done) } func (m *SerialMux) SetEchoEnabled(v bool) { m.echoEnabled.Store(v) } func (m *SerialMux) Enqueue(payload []byte, source string, requestEcho bool) { + serialLogger.Info().Str("src", source).Bool("echo", requestEcho).Msg("Enqueuing TX data to serial port") m.txQ <- txFrame{payload: append([]byte(nil), payload...), source: source, echo: requestEcho} } func (m *SerialMux) reader() { + scopedLogger := serialLogger.With().Str("service", "SerialMux reader").Logger() buf := make([]byte, 4096) for { select { @@ -370,6 +504,7 @@ func (m *SerialMux) reader() { continue } if n > 0 && m.broker != nil { + scopedLogger.Info().Msg("Sending RX data to console broker") m.broker.Enqueue(consoleEvent{kind: evRX, data: append([]byte(nil), buf[:n]...)}) } } @@ -377,17 +512,20 @@ func (m *SerialMux) reader() { } func (m *SerialMux) writer() { + scopedLogger := serialLogger.With().Str("service", "SerialMux writer").Logger() for { select { case <-m.done: return case f := <-m.txQ: + scopedLogger.Info().Msg("Writing TX data to serial port") if _, err := m.port.Write(f.payload); err != nil { - serialLogger.Warn().Err(err).Str("src", f.source).Msg("serial write failed") + scopedLogger.Warn().Err(err).Str("src", f.source).Msg("serial write failed") continue } // echo (if requested AND globally enabled) if f.echo && m.echoEnabled.Load() && m.broker != nil { + scopedLogger.Info().Msg("Sending TX echo to console broker") m.broker.Enqueue(consoleEvent{kind: evTX, data: append([]byte(nil), f.payload...)}) } } diff --git a/ui/src/components/CommandInput.tsx b/ui/src/components/CommandInput.tsx index 69f3e4d1..52664250 100644 --- a/ui/src/components/CommandInput.tsx +++ b/ui/src/components/CommandInput.tsx @@ -13,6 +13,20 @@ function useCommandHistory(max = 300) { const { send } = useJsonRpc(); const [items, setItems] = useState([]); + const deleteHistory = useCallback(() => { + console.log("Deleting serial command history"); + send("deleteSerialCommandHistory", {}, (resp: JsonRpcResponse) => { + if ("error" in resp) { + notifications.error( + `Failed to delete serial command history: ${resp.error.data || "Unknown error"}`, + ); + } else { + setItems([]); + notifications.success("Serial command history deleted"); + } + }); + }, [send]); + useEffect(() => { send("getSerialCommandHistory", {}, (resp: JsonRpcResponse) => { if ("error" in resp) { @@ -90,7 +104,7 @@ function useCommandHistory(max = 300) { .reverse(); // newest first }, [items]); - return { push, up, down, resetTraversal, search }; + return { push, up, down, resetTraversal, search, deleteHistory }; } function Portal({ children }: { children: React.ReactNode }) { @@ -102,7 +116,7 @@ function Portal({ children }: { children: React.ReactNode }) { // ---------- reverse search popup ---------- function ReverseSearch({ - open, results, sel, setSel, onPick, onClose, + open, results, sel, setSel, onPick, onClose, onDeleteHistory }: { open: boolean; results: Hit[]; @@ -110,6 +124,7 @@ function ReverseSearch({ setSel: (i: number) => void; onPick: (val: string) => void; onClose: () => void; + onDeleteHistory: () => void; }) { const listRef = React.useRef(null); @@ -151,7 +166,10 @@ function ReverseSearch({
↑/↓ select • Enter accept • Esc close - +
+ + +
@@ -177,7 +195,7 @@ export function CommandInput({ const [revOpen, setRevOpen] = useState(false); const [revQuery, setRevQuery] = useState(""); const [sel, setSel] = useState(0); - const { push, up, down, resetTraversal, search } = useCommandHistory(); + const { push, up, down, resetTraversal, search, deleteHistory } = useCommandHistory(); const results = useMemo(() => search(revQuery), [revQuery, search]); @@ -280,6 +298,7 @@ export function CommandInput({ setSel={setSel} onPick={(v) => { setCmd(v); setRevOpen(false); requestAnimationFrame(() => cmdInputRef.current?.focus()); }} onClose={() => {setRevOpen(false); requestAnimationFrame(() => cmdInputRef.current?.focus());}} + onDeleteHistory={deleteHistory} /> )} diff --git a/ui/src/components/Terminal.tsx b/ui/src/components/Terminal.tsx index 7c090995..8a2345c8 100644 --- a/ui/src/components/Terminal.tsx +++ b/ui/src/components/Terminal.tsx @@ -1,6 +1,6 @@ import "react-simple-keyboard/build/css/index.css"; -import { ChevronDownIcon } from "@heroicons/react/16/solid"; -import { useEffect, useMemo, useCallback } from "react"; +import { ChevronDownIcon, PauseCircleIcon, PlayCircleIcon } from "@heroicons/react/16/solid"; +import { useEffect, useMemo, useCallback, useState } from "react"; import { useXTerm } from "react-xtermjs"; import { FitAddon } from "@xterm/addon-fit"; import { WebLinksAddon } from "@xterm/addon-web-links"; @@ -9,8 +9,10 @@ import { Unicode11Addon } from "@xterm/addon-unicode11"; import { ClipboardAddon } from "@xterm/addon-clipboard"; import { cx } from "@/cva.config"; -import { AvailableTerminalTypes, useUiStore } from "@/hooks/stores"; +import { AvailableTerminalTypes, useUiStore, useTerminalStore } from "@/hooks/stores"; import { CommandInput } from "@/components/CommandInput"; +import { JsonRpcResponse, useJsonRpc } from "@/hooks/useJsonRpc"; +import notifications from "@/notifications"; import { Button } from "./Button"; @@ -67,20 +69,16 @@ function Terminal({ readonly dataChannel: RTCDataChannel; readonly type: AvailableTerminalTypes; }) { - const { terminalLineMode, terminalType, setTerminalType, setDisableVideoFocusTrap } = useUiStore(); + const { terminalType, setTerminalType, setDisableVideoFocusTrap } = useUiStore(); + const { terminator } = useTerminalStore(); const { instance, ref } = useXTerm({ options: TERMINAL_CONFIG }); + const [ terminalPaused, setTerminalPaused ] = useState(false) const isTerminalTypeEnabled = useMemo(() => { console.log("Terminal type:", terminalType, "Checking against:", type); return terminalType == type; }, [terminalType, type]); - useEffect(() => { - if (!instance) return; - instance.options.disableStdin = !terminalLineMode; - instance.options.cursorStyle = terminalLineMode ? "bar" : "block"; - }, [instance, terminalLineMode]); - useEffect(() => { setTimeout(() => { setDisableVideoFocusTrap(isTerminalTypeEnabled); @@ -92,6 +90,18 @@ function Terminal({ }, [setDisableVideoFocusTrap, isTerminalTypeEnabled]); const readyState = dataChannel.readyState; + + const { send } = useJsonRpc(); + + const handleTerminalPauseChange = () => { + send("setTerminalPaused", { terminalPaused: !terminalPaused }, (resp: JsonRpcResponse) => { + if ("error" in resp) { + notifications.error(`Failed to update terminal pause state: ${resp.error.data || "Unknown error"}`); + return; + } + setTerminalPaused(!terminalPaused); + }); + }; useEffect(() => { if (!instance) return; if (readyState !== "open") return; @@ -101,6 +111,11 @@ function Terminal({ dataChannel.addEventListener( "message", e => { + if (typeof e.data === "string") { + instance.write(e.data); // text path + return; + } + // binary path (if the server ever sends bytes) // Handle binary data differently based on browser implementation // Firefox sends data as blobs, chrome sends data as arraybuffer if (binaryType === "arraybuffer") { @@ -118,7 +133,12 @@ function Terminal({ ); const onDataHandler = instance.onData(data => { - dataChannel.send(data); + if (data === "\r") { + // Intercept enter key to add terminator + dataChannel.send(terminator ?? ""); + } else { + dataChannel.send(data); + } }); // Setup escape key handler @@ -141,7 +161,7 @@ function Terminal({ onDataHandler.dispose(); onKeyHandler.dispose(); }; - }, [dataChannel, instance, readyState, setDisableVideoFocusTrap, setTerminalType]); + }, [dataChannel, instance, readyState, setDisableVideoFocusTrap, setTerminalType, terminator]); useEffect(() => { if (!instance) return; @@ -172,8 +192,8 @@ function Terminal({ const sendLine = useCallback((line: string) => { // Just send; line ending/echo/normalization handled in serial.go - dataChannel.send(line); - }, [dataChannel]); + dataChannel.send(line + terminator); + }, [dataChannel, terminator]); return (
+ {terminalType == "serial" && ( +
-
- - {/* Serial settings (collapsible) */} - {!buttonConfig.hideSerialSettings && ( - <> -
- handleSerialButtonConfigChange("baudRate", Number(e.target.value))} - /> - - handleSerialButtonConfigChange("dataBits", Number(e.target.value))} - /> - - handleSerialButtonConfigChange("stopBits", e.target.value)} - /> - - handleSerialButtonConfigChange("parity", e.target.value)} - /> -
- handleSerialButtonConfigChange("terminator", {label: e.target.selectedOptions[0].text, value: e.target.value})} - /> -
- When sent, the selected line ending ({buttonConfig.terminator.label}) will be appended. -
-
-
- { - handleSerialButtonConfigChange("lineMode", e.target.value === "line") - setTerminalLineMode(e.target.value === "line"); - }} - /> -
- {buttonConfig.lineMode - ? "In Line Mode, input is sent when you press Enter in the input field." - : "In Raw Mode, input is sent immediately as you type in the console."} -
-
-
-
- - { - handleSerialButtonConfigChange("enableEcho", e.target.checked); - }} - /> - -
-
- - )} - - {/* Buttons grid */} -
- {sortedButtons.map((btn) => ( -
-
-
-
- ))} - {sortedButtons.length === 0 && ( -
No buttons yet. Click “Add Button”.
- )} -
- - {/* Editor drawer/modal (inline lightweight) */} - {editorOpen && ( -
-
- -
{editorOpen.id ? "Edit Button" : "New Button"}
-
-
-
- { - setDraftLabel(e.target.value); - }} - /> -
-
- { - setDraftCmd(e.target.value); - }} - /> - {draftTerminator.value != "" && ( -
- When sent, the selected line ending ({draftTerminator.label}) will be appended. -
- )} -
-
-
- setDraftTerminator({label: e.target.selectedOptions[0].text, value: e.target.value})} - /> -
-
-
-
-
-
- {editorOpen.id && ( - <> -
-
- )} -
- - - ); -} - -/** ============== helpers ============== */ -function genId() { - return "b_" + Math.random().toString(36).slice(2, 10); -} -function stableSort(arr: QuickButton[]) { - return [...arr].sort((a, b) => (a.sort - b.sort) || a.label.localeCompare(b.label)); -} - diff --git a/ui/src/components/extensions/SerialConsole.tsx b/ui/src/components/extensions/SerialConsole.tsx index e36365ff..da641e98 100644 --- a/ui/src/components/extensions/SerialConsole.tsx +++ b/ui/src/components/extensions/SerialConsole.tsx @@ -1,131 +1,520 @@ -import { LuTerminal } from "react-icons/lu"; -import { useEffect, useState } from "react"; +import { LuPlus, LuTrash2, LuPencil, LuSettings2, LuEye, LuEyeOff, LuSave, LuArrowBigUp, LuArrowBigDown, LuCircleX, LuTerminal } from "react-icons/lu"; +import { useEffect, useMemo, useState } from "react"; import { Button } from "@components/Button"; import Card from "@components/Card"; import { SettingsPageHeader } from "@components/SettingsPageheader"; import { JsonRpcResponse, useJsonRpc } from "@/hooks/useJsonRpc"; import notifications from "@/notifications"; -import { useUiStore } from "@/hooks/stores"; import { SelectMenuBasic } from "@components/SelectMenuBasic"; +import { InputFieldWithLabel } from "@components/InputField"; +import { useUiStore, useTerminalStore } from "@/hooks/stores"; +import Checkbox from "@components/Checkbox"; +import {SettingsItem} from "@components/SettingsItem"; -interface SerialSettings { - baudRate: string; - dataBits: string; - stopBits: string; - parity: string; + + +/** ============== Types ============== */ +interface QuickButton { + id: string; // uuid-ish + label: string; // shown on the button + command: string; // raw command to send (without auto-terminator) + terminator: {label: string, value: string}; // None/CR/LF/CRLF/LFCR + sort: number; // for stable ordering } +interface SerialSettings { + baudRate: number; + dataBits: number; + stopBits: string; + parity: string; + terminator: {label: string, value: string}; // None/CR/LF/CRLF/LFCR + hideSerialSettings: boolean; + enableEcho: boolean; // future use + normalizeMode: string; // future use + normalizeLineEnd: string; // future use + preserveANSI: boolean; // future use + buttons: QuickButton[]; +} + +/** ============== Component ============== */ + export function SerialConsole() { + const { setTerminalType } = useUiStore(); + const { setTerminator } = useTerminalStore(); + const { send } = useJsonRpc(); - const [settings, setSettings] = useState({ - baudRate: "9600", - dataBits: "8", + + // extension config (buttons + prefs) + const [buttonConfig, setButtonConfig] = useState({ + baudRate: 9600, + dataBits: 8, stopBits: "1", parity: "none", + terminator: {label: "LF (\\n)", value: "\n"}, + hideSerialSettings: false, + enableEcho: false, + normalizeMode: "names", + normalizeLineEnd: "keep", + preserveANSI: true, + buttons: [], }); + type NormalizeMode = "caret" | "names" | "hex"; // note: caret (not carret) + + const normalizeHelp: Record = { + caret: "Caret notation: e.g. Ctrl+A as ^A, Esc as ^[", + names: "Names: e.g. Ctrl+A as , Esc as ", + hex: "Hex notation: e.g. Ctrl+A as 0x01, Esc as 0x1B", + }; + + // editor modal state + const [editorOpen, setEditorOpen] = useState(null); + const [draftLabel, setDraftLabel] = useState(""); + const [draftCmd, setDraftCmd] = useState(""); + const [draftTerminator, setDraftTerminator] = useState({label: "LF (\\n)", value: "\n"}); + + // load serial settings like SerialConsole useEffect(() => { send("getSerialSettings", {}, (resp: JsonRpcResponse) => { if ("error" in resp) { notifications.error( - `Failed to get serial settings: ${resp.error.data || "Unknown error"}`, + `Failed to get button config: ${resp.error.data || "Unknown error"}`, ); return; } - setSettings(resp.result as SerialSettings); - }); - }, [send]); - const handleSettingChange = (setting: keyof SerialSettings, value: string) => { - const newSettings = { ...settings, [setting]: value }; - send("setSerialSettings", { settings: newSettings }, (resp: JsonRpcResponse) => { + setButtonConfig(resp.result as SerialSettings); + setTerminator((resp.result as SerialSettings).terminator.value); + }); + + }, [send, setTerminator]); + + const handleSerialSettingsChange = (config: keyof SerialSettings, value: unknown) => { + const newButtonConfig = { ...buttonConfig, [config]: value }; + send("setSerialSettings", { settings: newButtonConfig }, (resp: JsonRpcResponse) => { + if ("error" in resp) { + notifications.error(`Failed to update serial settings: ${resp.error.data || "Unknown error"}`); + return; + } + }); + setButtonConfig(newButtonConfig); + }; + + const onClickButton = (btn: QuickButton) => { + + const command = btn.command + btn.terminator.value; + + send("sendCustomCommand", { command }, (resp: JsonRpcResponse) => { if ("error" in resp) { notifications.error( - `Failed to update serial settings: ${resp.error.data || "Unknown error"}`, + `Failed to send custom command: ${resp.error.data || "Unknown error"}`, ); - return; } - setSettings(newSettings); }); }; - const { setTerminalType } = useUiStore(); + + /** CRUD helpers */ + const addNew = () => { + setEditorOpen({ id: undefined }); + setDraftLabel(""); + setDraftCmd(""); + setDraftTerminator({label: "LF (\\n)", value: "\n"}); + }; + + const editBtn = (btn: QuickButton) => { + setEditorOpen({ id: btn.id }); + setDraftLabel(btn.label); + setDraftCmd(btn.command); + setDraftTerminator(btn.terminator); + }; + + const removeBtn = (id: string) => { + const nextButtons = buttonConfig.buttons.filter(b => b.id !== id).map((b, i) => ({ ...b, sort: i })) ; + handleSerialSettingsChange("buttons", stableSort(nextButtons) ); + setEditorOpen(null); + }; + + const moveUpBtn = (id: string) => { + // Make a copy so we don't mutate state directly + const newButtons = [...buttonConfig.buttons]; + + // Find the index of the button to move + const index = newButtons.findIndex(b => b.id === id); + + if (index > 0) { + // Swap with the previous element + [newButtons[index - 1], newButtons[index]] = [ + newButtons[index], + newButtons[index - 1], + ]; + } + + // Re-assign sort values + const nextButtons = newButtons.map((b, i) => ({ ...b, sort: i })); + handleSerialSettingsChange("buttons", stableSort(nextButtons) ); + setEditorOpen(null); + }; + + const moveDownBtn = (id: string) => { + // Make a copy so we don't mutate state directly + const newButtons = [...buttonConfig.buttons]; + + // Find the index of the button to move + const index = newButtons.findIndex(b => b.id === id); + + if (index >= 0 && index < newButtons.length - 1) { + // Swap with the next element + [newButtons[index], newButtons[index + 1]] = [ + newButtons[index + 1], + newButtons[index], + ]; + } + + // Re-assign sort values + const nextButtons = newButtons.map((b, i) => ({ ...b, sort: i })); + handleSerialSettingsChange("buttons", stableSort(nextButtons) ); + setEditorOpen(null); + }; + + const saveDraft = () => { + const label = draftLabel.trim() || "Unnamed"; + const command = draftCmd; + if (!command) { + notifications.error("Command cannot be empty."); + return; + } + const terminator = draftTerminator; + console.log("Saving draft:", { label, command, terminator }); + + + // if editing, get current id, otherwise undefined => new button + const currentID = editorOpen?.id; + + // either update existing or add new + // if new, assign next sort index + // if existing, keep sort index + const nextButtons = currentID + ? buttonConfig.buttons.map(b => (b.id === currentID ? { ...b, label, command , terminator} : b)) + : [...buttonConfig.buttons, { id: genId(), label, command, terminator, sort: buttonConfig.buttons.length }]; + + handleSerialSettingsChange("buttons", stableSort(nextButtons) ); + setEditorOpen(null); + }; + + /** simple reordering: alphabetical by sort, then label */ + const sortedButtons = useMemo(() => buttonConfig.buttons, [buttonConfig.buttons]); return (
- {/* Open Console Button */} -
+ {/* Top actions */} +
- {/* Settings */} -
- handleSettingChange("baudRate", e.target.value)} - /> - handleSettingChange("dataBits", e.target.value)} - /> + {/* Serial settings (collapsible) */} + {!buttonConfig.hideSerialSettings && ( + <> +
+ handleSerialSettingsChange("baudRate", Number(e.target.value))} + /> - handleSettingChange("stopBits", e.target.value)} - /> + handleSerialSettingsChange("dataBits", Number(e.target.value))} + /> - handleSettingChange("parity", e.target.value)} - /> + handleSerialSettingsChange("stopBits", e.target.value)} + /> + + handleSerialSettingsChange("parity", e.target.value)} + /> +
+ { + handleSerialSettingsChange("terminator", {label: e.target.selectedOptions[0].text, value: e.target.value}) + setTerminator(e.target.value); + }} + /> +
+ When sent, the selected line ending ({buttonConfig.terminator.label}) will be appended. +
+
+
+ { + handleSerialSettingsChange("normalizeMode", e.target.value) + }} + /> +
+ {normalizeHelp[(buttonConfig.normalizeMode as NormalizeMode)]} +
+
+
+ { + handleSerialSettingsChange("normalizeLineEnd", e.target.value) + }} + /> +
+
+ { + handleSerialSettingsChange("preserveANSI", e.target.value === "keep") + }} + /> +
+
+
+ + { + handleSerialSettingsChange("enableEcho", e.target.checked); + }} + /> + +
+
+ + )} + + {/* Buttons grid */} +
+ {sortedButtons.map((btn) => ( +
+
+
+
+ ))} + {sortedButtons.length === 0 && ( +
No buttons yet. Click “Add Button”.
+ )}
+ + {/* Editor drawer/modal (inline lightweight) */} + {editorOpen && ( +
+
+ +
{editorOpen.id ? "Edit Button" : "New Button"}
+
+
+
+ { + setDraftLabel(e.target.value); + }} + /> +
+
+ { + setDraftCmd(e.target.value); + }} + /> + {draftTerminator.value != "" && ( +
+ When sent, the selected line ending ({draftTerminator.label}) will be appended. +
+ )} +
+
+
+ setDraftTerminator({label: e.target.selectedOptions[0].text, value: e.target.value})} + /> +
+
+
+
+
+
+ {editorOpen.id && ( + <> +
+
+ )}
); } + +/** ============== helpers ============== */ +function genId() { + return "b_" + Math.random().toString(36).slice(2, 10); +} +function stableSort(arr: QuickButton[]) { + return [...arr].sort((a, b) => (a.sort - b.sort) || a.label.localeCompare(b.label)); +} + diff --git a/ui/src/components/popovers/ExtensionPopover.tsx b/ui/src/components/popovers/ExtensionPopover.tsx index dc57502d..f36c0503 100644 --- a/ui/src/components/popovers/ExtensionPopover.tsx +++ b/ui/src/components/popovers/ExtensionPopover.tsx @@ -7,7 +7,6 @@ import { SettingsPageHeader } from "@components/SettingsPageheader"; import { ATXPowerControl } from "@components/extensions/ATXPowerControl"; import { DCPowerControl } from "@components/extensions/DCPowerControl"; import { SerialConsole } from "@components/extensions/SerialConsole"; -import { SerialButtons } from "@components/extensions/SerialButtons"; import { Button } from "@components/Button"; import notifications from "@/notifications"; @@ -37,12 +36,6 @@ const AVAILABLE_EXTENSIONS: Extension[] = [ description: "Access your serial console extension", icon: LuTerminal, }, - { - id: "serial-buttons", - name: "Serial Buttons", - description: "Send custom serial signals by buttons", - icon: LuTerminal, - }, ]; export default function ExtensionPopover() { @@ -83,8 +76,6 @@ export default function ExtensionPopover() { return ; case "serial-console": return ; - case "serial-buttons": - return ; default: return null; } diff --git a/ui/src/hooks/stores.ts b/ui/src/hooks/stores.ts index 1a634978..22f77043 100644 --- a/ui/src/hooks/stores.ts +++ b/ui/src/hooks/stores.ts @@ -69,9 +69,6 @@ export interface UIState { terminalType: AvailableTerminalTypes; setTerminalType: (type: UIState["terminalType"]) => void; - - terminalLineMode: boolean; - setTerminalLineMode: (enabled: boolean) => void; } export const useUiStore = create(set => ({ @@ -99,9 +96,6 @@ export const useUiStore = create(set => ({ isAttachedVirtualKeyboardVisible: true, setAttachedVirtualKeyboardVisibility: (enabled: boolean) => set({ isAttachedVirtualKeyboardVisible: enabled }), - - terminalLineMode: true, - setTerminalLineMode: (enabled: boolean) => set({ terminalLineMode: enabled }), })); export interface RTCState { @@ -664,6 +658,18 @@ export const useDeviceStore = create(set => ({ setSystemVersion: (version: string) => set({ systemVersion: version }), })); +export interface TerminalState { + terminator: string | null; + + setTerminator: (version: string) => void; +} + +export const useTerminalStore = create(set => ({ + terminator: null, + + setTerminator: (version: string) => set({ terminator: version }), +})); + export interface DhcpLease { ip?: string; netmask?: string;