temp commit

orchid-host/src/subprocess.rs

@@ -1,4 +1,5 @@
 use std::cell::RefCell;
+use std::io::Write;
 use std::pin::Pin;
 
 use async_process::{self, Child, ChildStdin, ChildStdout};
@@ -43,17 +44,19 @@ pub async fn ext_command(
 		}
 	}));
 	Ok(ExtInit {
-		header,
 		port: Box::new(Subprocess {
+			name: header.name.clone(),
 			child: RefCell::new(Some(child)),
 			stdin: Some(Mutex::new(Box::pin(stdin))),
 			stdout: Mutex::new(Box::pin(stdout)),
 			ctx,
 		}),
+		header,
 	})
 }
 
 pub struct Subprocess {
+	name: String,
 	child: RefCell<Option<Child>>,
 	stdin: Option<Mutex<Pin<Box<ChildStdin>>>>,
 	stdout: Mutex<Pin<Box<ChildStdout>>>,
@@ -62,11 +65,20 @@ pub struct Subprocess {
 impl Drop for Subprocess {
 	fn drop(&mut self) {
 		let mut child = self.child.borrow_mut().take().unwrap();
+		let name = self.name.clone();
+		if std::thread::panicking() {
+			eprintln!("Killing extension {name}");
+			// we don't really care to handle errors here
+			let _: Result<_, _> = std::io::stderr().flush();
+			let _: Result<_, _> = child.kill();
+			return;
+		}
 		let stdin = self.stdin.take().unwrap();
 		(self.ctx.spawn)(Box::pin(async move {
 			stdin.lock().await.close().await.unwrap();
-			let status = child.status().await.expect("Extension exited with error");
-			assert!(status.success(), "Extension exited with error {status}");
+			let status = (child.status().await)
+				.unwrap_or_else(|e| panic!("{e}, extension {name} exited with error"));
+			assert!(status.success(), "Extension {name} exited with error {status}");
 		}))
 	}
 }