Implements stdout:read() for process object

Author: ultimaweapon

.github/workflows/build-project.yml

@@ -16,5 +16,7 @@ jobs:
     steps:
     - name: Check out repository
       uses: actions/checkout@v4
+    - name: Lint
+      run: cargo clippy -- -D warnings
     - name: Install Project
       run: cargo install --path .

Cargo.lock

@@ -12,7 +12,7 @@ rustc-hash = "2.1.1"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_yaml = "0.9.34"
 thiserror = "2.0.12"
-tokio = { version = "1.44.1", features = ["process", "rt"] }
+tokio = { version = "1.44.1", features = ["io-util", "process", "rt"] }
 url = "2.5.4"
 zl = { git = "https://github.com/ultimaweapon/zero-lua.git" }
 

Cargo.toml

@@ -157,9 +157,9 @@ Working directory for the process. If this key does not present it will default
 
 Can be either `null`, `inherit` or `pipe`. If this key does not present it will default to `inherit`. For `pipe` the process object will have `stdout` property, which have [read](https://www.lua.org/manual/5.4/manual.html#pdf-file:read) method.
 
-### Url
+### Url:new(url)
 
-`Url` is a class to parse and manipulate a URL.
+Create an instance of `Url` class from `url`.
 
 ## Exit code
 

README.md

@@ -65,7 +65,10 @@ pub fn entry(cx: &mut Context) -> Result<(), Error> {
         .map_err(|e| Error::with_source(format!("failed to run '{}'", opts.prog), e))?;
 
     if !r.status.success() {
-        return Err(format!("'{}' exited with an error ({})", opts.prog, r.status).into());
+        return Err(Error::other(format!(
+            "'{}' exited with an error ({})",
+            opts.prog, r.status
+        )));
     }
 
     // Set result.

src/api/os/capture.rs

@@ -40,7 +40,10 @@ pub fn entry(cx: &mut Context<NonYieldable>) -> Result<(), Error> {
         .map_err(|e| Error::with_source(format!("failed to run '{}'", opts.prog), e))?;
 
     if !status.success() {
-        return Err(format!("'{}' exited with an error ({})", opts.prog, status).into());
+        return Err(Error::other(format!(
+            "'{}' exited with an error ({})",
+            opts.prog, status
+        )));
     }
 
     Ok(())

src/api/os/run.rs

@@ -2,9 +2,9 @@ use std::borrow::Cow;
 use std::cell::RefCell;
 use std::panic::AssertUnwindSafe;
 use std::process::{Child, Command, Stdio};
-use tokio::io::AsyncRead;
+use tokio::io::{AsyncBufReadExt, AsyncRead, BufReader};
 use tokio::process::ChildStdout;
-use zl::{Context, Error, Frame, FromOption, PositiveInt, Value, class};
+use zl::{Context, Error, Frame, FromOption, PositiveInt, Value, Yieldable, class};
 
 /// Implementation of `os.spawn`.
 pub fn entry(cx: &mut Context) -> Result<(), Error> {
@@ -86,7 +86,7 @@ pub fn entry(cx: &mut Context) -> Result<(), Error> {
     // Set stdout.
     if let Some(v) = stdout {
         let v = match ChildStdout::from_std(v) {
-            Ok(v) => OutputStream(AssertUnwindSafe(RefCell::new(Box::new(v)))),
+            Ok(v) => OutputStream(AssertUnwindSafe(RefCell::new(BufReader::new(Box::new(v))))),
             Err(e) => {
                 return Err(Error::with_source(
                     "failed to convert stdout to asynchronous",
@@ -142,12 +142,35 @@ impl Drop for Process {
 }
 
 /// Class of `stdout` property of the value returned from `os.spawn`.
-pub struct OutputStream(AssertUnwindSafe<RefCell<Box<dyn AsyncRead + Unpin>>>);
+pub struct OutputStream(AssertUnwindSafe<RefCell<BufReader<Box<dyn AsyncRead + Unpin>>>>);
 
 #[class]
 impl OutputStream {
-    fn read(_: &mut Context) -> Result<(), Error> {
-        todo!()
+    async fn read(cx: &mut Context<'_, Yieldable>) -> Result<(), Error> {
+        // Lock stream.
+        let stream = cx.to_ud::<Self>(PositiveInt::ONE).into_ud();
+        let mut stream = stream
+            .0
+            .try_borrow_mut()
+            .map_err(|_| Error::other(c"concurrent read is not supported"))?;
+
+        // Read.
+        if cx.args() == 1 {
+            let mut line = String::new();
+            let len = stream.read_line(&mut line).await?;
+
+            if len != 0 {
+                if line.ends_with('\n') {
+                    line.pop();
+                }
+
+                cx.push_str(line);
+            }
+        } else {
+            todo!()
+        }
+
+        Ok(())
     }
 }