Merge pull request #210 from posit-dev/feature/connection-disconnect

Handle connection pane disconnect button

crates/amalthea/src/comm/comm_manager.rs

@@ -12,6 +12,7 @@ use crossbeam::channel::Select;
 use crossbeam::channel::Sender;
 use log::info;
 use log::warn;
+use stdext::result::ResultOrLog;
 use stdext::spawn;
 
 use crate::comm::comm_channel::CommMsg;
@@ -175,6 +176,12 @@ impl CommManager {
 
                     // If we found it, remove it.
                     if let Some(index) = index {
+                        // Notify the comm that it's been closed
+                        let comm = self.open_comms.get(index).unwrap();
+                        comm.incoming_tx
+                            .send(CommMsg::Close)
+                            .or_log_error("Failed to send comm_close to comm.");
+
                         self.open_comms.remove(index);
                         self.comm_shell_tx
                             .send(CommShellEvent::Removed(comm_id))

crates/ark/src/connections/r_connection.rs

@@ -212,6 +212,16 @@ impl RConnection {
         }
     }
 
+    fn disconnect(&self) -> std::result::Result<(), anyhow::Error> {
+        // Execute database side disconnect method.
+        r_task(|| -> Result<(), anyhow::Error> {
+            let mut call = RFunction::from(".ps.connection_close");
+            call.add(RObject::from(self.comm.comm_id.clone()));
+            call.call()?;
+            Ok(())
+        })
+    }
+
     fn handle_messages(&self) -> Result<(), anyhow::Error> {
         loop {
             let msg = unwrap!(self.comm.incoming_rx.recv(), Err(err) => {
@@ -223,6 +233,7 @@ impl RConnection {
 
             if let CommMsg::Close = msg {
                 log::trace!("Connection Pane: Received a close message.");
+                self.disconnect()?;
                 break;
             }
 

crates/ark/src/modules/positron/connection.R

@@ -94,3 +94,13 @@ options("connectionObserver" = .ps.connection_observer())
     }
     View(con$previewObject(table = table, ..., limit = 100), title = table)
 }
+
+.ps.connection_close <- function(id, ...) {
+    con <- get(id, getOption("connectionObserver")$.connections)
+    if (is.null(con)) {
+        return(NULL)
+    }
+    # disconnect is resposible for calling connectionClosed that
+    # will remove the connection from the list of connections
+    con$disconnect(...)
+}