Refactored gRPC Monitor API

Author: cmaglie

commands/daemon/daemon.go

@@ -438,7 +438,11 @@ func (s *ArduinoCoreServerImpl) Monitor(stream rpc.ArduinoCoreService_MonitorSer
 		return err
 	}
 
-	portProxy, _, err := monitor.Monitor(stream.Context(), req)
+	openReq := req.GetOpenRequest()
+	if openReq == nil {
+		return &arduino.InvalidInstanceError{}
+	}
+	portProxy, _, err := monitor.Monitor(stream.Context(), openReq)
 	if err != nil {
 		return err
 	}
@@ -458,7 +462,7 @@ func (s *ArduinoCoreServerImpl) Monitor(stream rpc.ArduinoCoreService_MonitorSer
 				syncSend.Send(&rpc.MonitorResponse{Error: err.Error()})
 				return
 			}
-			if conf := msg.GetPortConfiguration(); conf != nil {
+			if conf := msg.GetUpdatedConfiguration(); conf != nil {
 				for _, c := range conf.GetSettings() {
 					if err := portProxy.Config(c.SettingId, c.Value); err != nil {
 						syncSend.Send(&rpc.MonitorResponse{Error: err.Error()})

commands/daemon/term_example/main.go

@@ -89,8 +89,10 @@ func connectToPort(cli commands.ArduinoCoreServiceClient, instance *commands.Ins
 		log.Fatal("Error opening Monitor:", err)
 	}
 	if err := monitorClient.Send(&commands.MonitorRequest{
-		Instance: instance,
-		Port:     port,
+		Message: &commands.MonitorRequest_OpenRequest{OpenRequest: &commands.MonitorPortOpenRequest{
+			Instance: instance,
+			Port:     port,
+		}},
 	}); err != nil {
 		log.Fatal("Error sending Monitor config:", err)
 	}
@@ -106,9 +108,9 @@ func connectToPort(cli commands.ArduinoCoreServiceClient, instance *commands.Ins
 		}
 	}()
 
-	hello := &commands.MonitorRequest{
+	hello := &commands.MonitorRequest{Message: &commands.MonitorRequest_TxData{
 		TxData: []byte("HELLO!"),
-	}
+	}}
 	fmt.Println("Send:", hello)
 	if err := monitorClient.Send(hello); err != nil {
 		log.Fatal("Monitor send HELLO:", err)

commands/monitor/monitor.go

@@ -60,7 +60,7 @@ func (p *PortProxy) Close() error {
 
 // Monitor opens a communication port. It returns a PortProxy to communicate with the port and a PortDescriptor
 // that describes the available configuration settings.
-func Monitor(ctx context.Context, req *rpc.MonitorRequest) (*PortProxy, *pluggableMonitor.PortDescriptor, error) {
+func Monitor(ctx context.Context, req *rpc.MonitorPortOpenRequest) (*PortProxy, *pluggableMonitor.PortDescriptor, error) {
 	pme, release := instances.GetPackageManagerExplorer(req.GetInstance())
 	if pme == nil {
 		return nil, nil, &arduino.InvalidInstanceError{}

internal/cli/monitor/monitor.go

@@ -199,7 +199,7 @@ func runMonitorCmd(
 			}
 		}
 	}
-	portProxy, _, err := monitor.Monitor(context.Background(), &rpc.MonitorRequest{
+	portProxy, _, err := monitor.Monitor(context.Background(), &rpc.MonitorPortOpenRequest{
 		Instance:          inst,
 		Port:              &rpc.Port{Address: portAddress, Protocol: portProtocol},
 		Fqbn:              fqbn,