modified PipeFile to only take a File and be cloneable through an Arc

Signed-off-by: danbugs <[email protected]>

Author: danbugs

crates/engine/src/io.rs

@@ -2,9 +2,8 @@ use cap_std::fs::File as CapFile;
 use std::{
     collections::HashSet,
     fmt::Debug,
-    fs::{File, OpenOptions},
+    fs::File,
     io::{LineWriter, Write},
-    path::PathBuf,
     sync::{Arc, RwLock, RwLockReadGuard},
 };
 use wasi_common::{
@@ -59,32 +58,24 @@ pub trait OutputBuffers {
 }
 
 /// Wrapper around File with a convenient PathBuf for cloning
-pub struct PipeFile(pub File, pub PathBuf);
+pub struct PipeFile(pub Arc<RwLock<Option<File>>>);
 
 impl PipeFile {
     /// Constructs an instance from a file, and the PathBuf to that file.
-    pub fn new(file: File, path: PathBuf) -> Self {
-        Self(file, path)
+    pub fn new(file: File) -> Self {
+        Self(Arc::new(RwLock::new(Some(file))))
     }
 }
 
 impl std::fmt::Debug for PipeFile {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("PipeFile")
-            .field("File", &self.0)
-            .field("PathBuf", &self.1)
-            .finish()
+        f.debug_struct("PipeFile").field("File", &self.0).finish()
     }
 }
 
 impl Clone for PipeFile {
     fn clone(&self) -> Self {
-        let f = OpenOptions::new()
-            .read(true)
-            .write(true)
-            .open(&self.1)
-            .unwrap();
-        Self(f, self.1.clone())
+        Self(Arc::clone(&self.0))
     }
 }
 

crates/http/src/spin.rs

@@ -36,9 +36,12 @@ impl HttpExecutor for SpinHttpExecutor {
             engine.config.module_io_redirects.clone()
         {
             ModuleIoRedirects::new_from_files(
-                clp.stdin_pipe.map(|inp| inp.0),
-                clp.stdout_pipe.map(|oup| oup.0),
-                clp.stderr_pipe.map(|erp| erp.0),
+                clp.stdin_pipe
+                    .map(|inp| (*inp.0.write().unwrap()).take().unwrap()),
+                clp.stdout_pipe
+                    .map(|oup| (*oup.0.write().unwrap()).take().unwrap()),
+                clp.stderr_pipe
+                    .map(|erp| (*erp.0.write().unwrap()).take().unwrap()),
             )
         } else {
             ModuleIoRedirects::new(follow)

crates/redis/src/spin.rs

@@ -27,9 +27,12 @@ impl RedisExecutor for SpinRedisExecutor {
             engine.config.module_io_redirects.clone()
         {
             ModuleIoRedirects::new_from_files(
-                clp.stdin_pipe.map(|inp| inp.0),
-                clp.stdout_pipe.map(|oup| oup.0),
-                clp.stderr_pipe.map(|erp| erp.0),
+                clp.stdin_pipe
+                    .map(|inp| (*inp.0.write().unwrap()).take().unwrap()),
+                clp.stdout_pipe
+                    .map(|oup| (*oup.0.write().unwrap()).take().unwrap()),
+                clp.stderr_pipe
+                    .map(|erp| (*erp.0.write().unwrap()).take().unwrap()),
             )
         } else {
             ModuleIoRedirects::new(follow)