Add dynamic UART/BLE host connect for serve, dashboard, and WS.

Serve starts without a required port; REST/WS/UI can scan and switch transports, with BLE live ticks and UART-only OTA. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-23 22:40:28 +02:00
parent 92a13d7fd0
commit aa67edfe94
18 changed files with 1573 additions and 404 deletions
@@ -64,16 +64,14 @@ func decodeBatteryStatusPayload(payload []byte) (*pb.BatteryStatusResponse, erro
 }

 func (m *managedSerial) BatteryStatus(req *pb.BatteryStatusRequest) (*pb.BatteryStatusResponse, error) {
-	var resp *pb.BatteryStatusResponse
-	err := m.withPort(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.batteryStatus(req)
-		return e
-	})
-	return resp, err
+	return m.batteryStatusExchange(false, req)
 }

 func (m *managedSerial) BatteryStatusPoll(req *pb.BatteryStatusRequest) (*pb.BatteryStatusResponse, error) {
+	return m.batteryStatusExchange(true, req)
+}
+
+func (m *managedSerial) batteryStatusExchange(poll bool, req *pb.BatteryStatusRequest) (*pb.BatteryStatusResponse, error) {
 	msg := &pb.UartMessage{
 		Type: pb.MessageType_BATTERY_STATUS,
 		Payload: &pb.UartMessage_BatteryStatusRequest{
@@ -85,23 +83,18 @@ func (m *managedSerial) BatteryStatusPoll(req *pb.BatteryStatusRequest) (*pb.Bat
 		return nil, fmt.Errorf("encode: %w", err)
 	}
 	payload := append([]byte{byte(pb.MessageType_BATTERY_STATUS)}, body...)
-	respPayload, err := m.batteryStatusPayloadPoll(payload)
+	var respPayload []byte
+	if poll {
+		respPayload, err = m.exchangePayloadMode(true, payload, "BATTERY_STATUS", batteryReadTimeout)
+	} else {
+		respPayload, err = m.exchangePayloadMode(false, payload, "BATTERY_STATUS", batteryReadTimeout)
+	}
 	if err != nil {
 		return nil, err
 	}
 	return decodeBatteryStatusPayload(respPayload)
 }

-func (m *managedSerial) batteryStatusPayloadPoll(payload []byte) ([]byte, error) {
-	var resp []byte
-	err := m.withPortPoll(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.exchangePayloadForBattery(payload, "BATTERY_STATUS")
-		return e
-	})
-	return resp, err
-}
-
 func (s *serialPort) batteryStatus(req *pb.BatteryStatusRequest) (*pb.BatteryStatusResponse, error) {
 	msg := &pb.UartMessage{
 		Type: pb.MessageType_BATTERY_STATUS,
@@ -122,11 +115,11 @@ func (s *serialPort) batteryStatus(req *pb.BatteryStatusRequest) (*pb.BatterySta
 }

 func (m *managedSerial) AccelStream(req *pb.AccelStreamRequest) (*pb.AccelStreamResponse, error) {
-	return m.accelStreamVia(m.withPort, req)
+	return m.accelStreamExchange(false, req)
 }

 func (m *managedSerial) AccelStreamPoll(req *pb.AccelStreamRequest) (*pb.AccelStreamResponse, error) {
-	return m.accelStreamVia(m.withPortPoll, req)
+	return m.accelStreamExchange(true, req)
 }

 // SetAccelStream enables or disables the ESP-NOW accel stream for one slave (master UART).
@@ -154,24 +147,41 @@ func (m *managedSerial) GetAccelStream(clientID uint32) (bool, error) {
 }

 func (m *managedSerial) TapNotify(req *pb.TapNotifyRequest) (*pb.TapNotifyResponse, error) {
-	return m.tapNotifyVia(m.withPort, req)
+	return m.tapNotifyExchange(false, req)
 }

 func (m *managedSerial) TapNotifyPoll(req *pb.TapNotifyRequest) (*pb.TapNotifyResponse, error) {
-	return m.tapNotifyVia(m.withPortPoll, req)
+	return m.tapNotifyExchange(true, req)
 }

-func (m *managedSerial) tapNotifyVia(
-	portFn func(func(*serialPort) error) error,
-	req *pb.TapNotifyRequest,
-) (*pb.TapNotifyResponse, error) {
-	var resp *pb.TapNotifyResponse
-	err := portFn(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.TapNotify(req)
-		return e
-	})
-	return resp, err
+func (m *managedSerial) tapNotifyExchange(poll bool, req *pb.TapNotifyRequest) (*pb.TapNotifyResponse, error) {
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_TAP_NOTIFY,
+		Payload: &pb.UartMessage_TapNotifyRequest{TapNotifyRequest: req},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_TAP_NOTIFY)}, body...)
+	var respPayload []byte
+	if poll {
+		respPayload, err = m.exchangePayloadPoll(payload, "TAP_NOTIFY")
+	} else {
+		respPayload, err = m.exchangePayload(payload, "TAP_NOTIFY")
+	}
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetTapNotifyResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing tap_notify_response")
+	}
+	return r, nil
 }

 func (m *managedSerial) readCacheStatusPoll() (*pb.CacheStatusResponse, error) {
@@ -204,69 +214,138 @@ func decodeCacheStatusPayload(payload []byte) (*pb.CacheStatusResponse, error) {
 	return r, nil
 }

-func (m *managedSerial) accelStreamVia(
-	portFn func(func(*serialPort) error) error,
-	req *pb.AccelStreamRequest,
-) (*pb.AccelStreamResponse, error) {
-	var resp *pb.AccelStreamResponse
-	err := portFn(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.AccelStream(req)
-		return e
-	})
-	return resp, err
+func (m *managedSerial) accelStreamExchange(poll bool, req *pb.AccelStreamRequest) (*pb.AccelStreamResponse, error) {
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_ACCEL_STREAM,
+		Payload: &pb.UartMessage_AccelStreamRequest{AccelStreamRequest: req},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_ACCEL_STREAM)}, body...)
+	var respPayload []byte
+	if poll {
+		respPayload, err = m.exchangePayloadPoll(payload, "ACCEL_STREAM")
+	} else {
+		respPayload, err = m.exchangePayload(payload, "ACCEL_STREAM")
+	}
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetAccelStreamResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing accel_stream_response")
+	}
+	return r, nil
 }

 func (m *managedSerial) AccelDeadzone(req *pb.AccelDeadzoneRequest) (*pb.AccelDeadzoneResponse, error) {
-	return m.accelDeadzoneVia(m.withPort, req)
+	return m.accelDeadzoneExchange(false, req)
 }

 func (m *managedSerial) AccelDeadzonePoll(req *pb.AccelDeadzoneRequest) (*pb.AccelDeadzoneResponse, error) {
-	return m.accelDeadzoneVia(m.withPortPoll, req)
+	return m.accelDeadzoneExchange(true, req)
 }

 func (m *managedSerial) TapConfig(req *pb.TapConfigRequest) (*pb.TapConfigResponse, error) {
-	return m.tapConfigVia(m.withPort, req)
+	return m.tapConfigExchange(false, req)
 }

 func (m *managedSerial) TapConfigPoll(req *pb.TapConfigRequest) (*pb.TapConfigResponse, error) {
-	return m.tapConfigVia(m.withPortPoll, req)
+	return m.tapConfigExchange(true, req)
 }

-func (m *managedSerial) tapConfigVia(
-	portFn func(func(*serialPort) error) error,
-	req *pb.TapConfigRequest,
-) (*pb.TapConfigResponse, error) {
-	var resp *pb.TapConfigResponse
-	err := portFn(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.TapConfig(req)
-		return e
-	})
-	return resp, err
+func (m *managedSerial) tapConfigExchange(poll bool, req *pb.TapConfigRequest) (*pb.TapConfigResponse, error) {
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_TAP_CONFIG,
+		Payload: &pb.UartMessage_TapConfigRequest{TapConfigRequest: req},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_TAP_CONFIG)}, body...)
+	var respPayload []byte
+	if poll {
+		respPayload, err = m.exchangePayloadPoll(payload, "TAP_CONFIG")
+	} else {
+		respPayload, err = m.exchangePayload(payload, "TAP_CONFIG")
+	}
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetTapConfigResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing tap_config_response")
+	}
+	return r, nil
 }

-func (m *managedSerial) accelDeadzoneVia(
-	portFn func(func(*serialPort) error) error,
-	req *pb.AccelDeadzoneRequest,
-) (*pb.AccelDeadzoneResponse, error) {
-	var resp *pb.AccelDeadzoneResponse
-	err := portFn(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.AccelDeadzone(req)
-		return e
-	})
-	return resp, err
+func (m *managedSerial) accelDeadzoneExchange(poll bool, req *pb.AccelDeadzoneRequest) (*pb.AccelDeadzoneResponse, error) {
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_ACCEL_DEADZONE,
+		Payload: &pb.UartMessage_AccelDeadzoneRequest{AccelDeadzoneRequest: req},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_ACCEL_DEADZONE)}, body...)
+	var respPayload []byte
+	if poll {
+		respPayload, err = m.exchangePayloadPoll(payload, "ACCEL_DEADZONE")
+	} else {
+		respPayload, err = m.exchangePayload(payload, "ACCEL_DEADZONE")
+	}
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetAccelDeadzoneResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing accel_deadzone_response")
+	}
+	return r, nil
 }

 func (m *managedSerial) EspnowUnicastTest(clientID, seq uint32) (*pb.EspNowUnicastTestResponse, error) {
-	var resp *pb.EspNowUnicastTestResponse
-	err := m.withPort(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.EspnowUnicastTest(clientID, seq)
-		return e
-	})
-	return resp, err
+	req := &pb.EspNowUnicastTestRequest{ClientId: clientID, Seq: seq}
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_ESPNOW_UNICAST_TEST,
+		Payload: &pb.UartMessage_EspnowUnicastTestRequest{
+			EspnowUnicastTestRequest: req,
+		},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_ESPNOW_UNICAST_TEST)}, body...)
+	respPayload, err := m.exchangePayload(payload, "ESPNOW_UNICAST_TEST")
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetEspnowUnicastTestResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing espnow_unicast_test_response")
+	}
+	return r, nil
 }

 func decodeVersionPayload(payload []byte) (*pb.VersionResponse, error) {
@@ -520,26 +599,15 @@ func (s *serialPort) echoPing(clientID uint32) (*EchoPingResult, error) {
 }

 func (m *managedSerial) FindMe(clientID uint32) error {
-	return m.withPort(func(sp *serialPort) error {
-		return runFindMeClient(sp, clientID)
-	})
+	return hostFindMe(m, clientID)
 }

 func (m *managedSerial) SetLogLevel(write bool, level uint32) (*pb.SetLogLevelResponse, error) {
-	var resp *pb.SetLogLevelResponse
-	err := m.withPort(func(sp *serialPort) error {
-		var e error
-		resp, e = runSetLogLevelClient(sp, write, level)
-		return e
-	})
-	return resp, err
+	return hostSetLogLevel(m, write, level)
 }

 func (m *managedSerial) Restart(clientID uint32) error {
-	err := m.withPort(func(sp *serialPort) error {
-		return runRestartClient(sp, clientID)
-	})
-	if err != nil {
+	if err := hostRestart(m, clientID); err != nil {
 		return err
 	}
 	if clientID == 0 {
@@ -618,13 +686,7 @@ func (s *serialPort) EchoPing(clientID uint32) (*EchoPingResult, error) {
 }

 func (m *managedSerial) EchoPing(clientID uint32) (*EchoPingResult, error) {
-	var result *EchoPingResult
-	err := m.withPort(func(sp *serialPort) error {
-		var e error
-		result, e = sp.echoPing(clientID)
-		return e
-	})
-	return result, err
+	return hostEchoPing(m, clientID)
 }

 func (s *serialPort) LedRing(req *pb.LedRingProgressRequest) (*pb.LedRingProgressResponse, error) {
@@ -632,13 +694,7 @@ func (s *serialPort) LedRing(req *pb.LedRingProgressRequest) (*pb.LedRingProgres
 }

 func (m *managedSerial) LedRing(req *pb.LedRingProgressRequest) (*pb.LedRingProgressResponse, error) {
-	var resp *pb.LedRingProgressResponse
-	err := m.withPort(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.LedRing(req)
-		return e
-	})
-	return resp, err
+	return hostLedRing(m, req)
 }

 func (s *serialPort) FindMe(clientID uint32) (*pb.EspNowFindMeResponse, error) {