properly handles eof for spawned process

webosbrew · May 6, 2024 · 7d7c6a0 · 7d7c6a0
1 parent d57e4f6
commit 7d7c6a0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src-tauri/src/plugins/cmd.rs b/src-tauri/src/plugins/cmd.rs
@@ -1,4 +1,4 @@
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use std::io::{Read, Write};
 use std::sync::Arc;
 
@@ -13,6 +13,14 @@ use crate::event_channel::{EventChannel, EventHandler};
 use crate::session_manager::{Proc, ProcCallback, ProcData, SessionManager};
 use crate::spawn_manager::SpawnManager;
 
+#[derive(Debug, Clone, Serialize, PartialEq)]
+#[serde(tag = "type")]
+pub(crate) enum SpawnResult {
+    Exit { status: i32 },
+    Signal { signal: u32 },
+    Closed,
+}
+
 #[tauri::command]
 async fn exec<R: Runtime>(
     app: AppHandle<R>,
@@ -87,7 +95,7 @@ fn proc_worker<R: Runtime>(
     match proc.wait_close(&app.state::<SessionManager>()) {
         Ok(r) => {
             log::info!("{proc:?} closed with {r:?}");
-            channel.closed(&r);
+            channel.closed(SpawnResult::Exit { status: r });
         }
         Err(e) => {
             log::warn!("{proc:?} closed with {e:?}");

diff --git a/src-tauri/src/session_manager/proc.rs b/src-tauri/src/session_manager/proc.rs
@@ -78,7 +78,7 @@ impl Proc {
         channel.request_exec(&self.command)?;
         let mut buf = [0; 8192];
         let mut interrupted = false;
-        while !channel.is_closed() {
+        while !channel.is_closed() && !channel.is_eof() {
             if self.interrupted.lock().unwrap().eq(&true) {
                 channel.send_eof()?;
                 log::info!("interrupting luna-send");

diff --git a/src/app/core/services/remote-command.service.ts b/src/app/core/services/remote-command.service.ts
@@ -68,12 +68,12 @@ export declare class CommandData<T = Buffer | string> {
 }
 
 export class CommandSubject<T = Buffer | string> extends ReplaySubject<CommandData<T>> {
-    private channel: EventChannel<ProcData, any>;
+    private channel: EventChannel<ProcData, SpawnResult>;
 
     constructor(zone: NgZone, token: string, command: string, encoding: 'buffer' | 'utf-8' | undefined) {
         super();
         const subject = this;
-        this.channel = new class extends EventChannel<ProcData, any> {
+        this.channel = new class extends EventChannel<ProcData, SpawnResult> {
             stdout: string = '';
             stderr: string = '';
             interrupted = false;