Address CodeRabbit review and fix CI on embedded-vnc

client/server/capture.go

@@ -111,7 +111,7 @@ func (s *Server) StartCapture(req *proto.StartCaptureRequest, stream proto.Daemo
 		return status.Errorf(codes.Internal, "create capture session: %v", err)
 	}
 
-	engine, err := s.claimCapture(sess)
+	engine, err := s.claimCapture(sess, func() { pw.Close() })
 	if err != nil {
 		sess.Stop()
 		pw.Close()
@@ -305,7 +305,7 @@ func (s *Server) cleanupBundleCapture() {
 // capture is already running it is evicted: a previous streaming session
 // whose gRPC client died and never freed the slot stays stuck otherwise,
 // and a bundle capture is just informational state.
-func (s *Server) claimCapture(sess *capture.Session) (*internal.Engine, error) {
+func (s *Server) claimCapture(sess *capture.Session, cancel func()) (*internal.Engine, error) {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
 
@@ -315,6 +315,7 @@ func (s *Server) claimCapture(sess *capture.Session) (*internal.Engine, error) {
 		return nil, err
 	}
 	s.activeCapture = sess
+	s.activeCaptureCancel = cancel
 	return engine, nil
 }
 
@@ -331,13 +332,18 @@ func (s *Server) evictActiveCaptureLocked() {
 	}
 	log.Infof("evicting previous streaming capture to start a new one")
 	prev := s.activeCapture
+	cancel := s.activeCaptureCancel
 	if engine, err := s.getCaptureEngineLocked(); err == nil {
 		if err := engine.SetCapture(nil); err != nil {
 			log.Debugf("clear previous capture: %v", err)
 		}
 	}
 	s.activeCapture = nil
+	s.activeCaptureCancel = nil
 	prev.Stop()
+	if cancel != nil {
+		cancel()
+	}
 }
 
 // releaseCapture clears the active-capture owner if it still matches sess.
@@ -346,6 +352,7 @@ func (s *Server) releaseCapture(sess *capture.Session) {
 	defer s.mutex.Unlock()
 	if s.activeCapture == sess {
 		s.activeCapture = nil
+		s.activeCaptureCancel = nil
 	}
 }
 
@@ -360,6 +367,7 @@ func (s *Server) clearCaptureIfOwner(sess *capture.Session, engine *internal.Eng
 		log.Debugf("clear capture: %v", err)
 	}
 	s.activeCapture = nil
+	s.activeCaptureCancel = nil
 }
 
 func (s *Server) getCaptureEngineLocked() (*internal.Engine, error) {

client/server/server.go

@@ -93,8 +93,12 @@ type Server struct {
 	captureEnabled         bool
 	bundleCapture          *bundleCapture
 	// activeCapture is the session currently installed on the engine; guarded by s.mutex.
-	activeCapture    *capture.Session
-	networksDisabled bool
+	activeCapture *capture.Session
+	// activeCaptureCancel tears down the streaming pipe/cancel for the
+	// active streaming capture so eviction unblocks the StartCapture RPC
+	// handler. Nil for bundle captures (they own their own context).
+	activeCaptureCancel func()
+	networksDisabled    bool
 
 	sleepHandler *sleephandler.SleepHandler