Added Close request to gRPC Monitor API

arduino · cmaglie · Jan 2, 2024 · Aug 21, 2023 · Aug 21, 2023 · Aug 23, 2023
commit 9c59c34ab8d3e846151f7ec12301f9af41a773ec
diff --git a/commands/daemon/daemon.go b/commands/daemon/daemon.go
@@ -508,6 +508,11 @@ func (s *ArduinoCoreServerImpl) Monitor(stream rpc.ArduinoCoreService_MonitorSer
 					}
 				}
 			}
+			if close := msg.GetClose(); close {
+				if err := portProxy.Close(); err != nil {
+					logrus.WithError(err).Debug("Error closing monitor port")
+				}
+			}
 			tx := msg.GetTxData()
 			for len(tx) > 0 {
 				n, err := portProxy.Write(tx)

diff --git a/rpc/cc/arduino/cli/commands/v1/monitor.pb.go b/rpc/cc/arduino/cli/commands/v1/monitor.pb.go
diff --git a/rpc/cc/arduino/cli/commands/v1/monitor.proto b/rpc/cc/arduino/cli/commands/v1/monitor.proto
@@ -30,6 +30,10 @@ message MonitorRequest {
    bytes tx_data = 2;
    // Port configuration, contains settings of the port to be changed
    MonitorPortConfiguration updated_configuration = 3;
+    // Close message, set to true to gracefully close a port (this ensure
+    // that the gRPC streaming call is closed by the daemon AFTER the port
+    // has been successfully closed)
+    bool close = 4;
  }
 }