Merge pull request #82 from tsirysndr/feat/run-subcommand

cli: add run subcommand and remove dependency on external deno command

README.md

@@ -106,7 +106,7 @@ MacOS, currently not supported, but you can run in a docker container.
 
 ## 📦 Downloads
 
-- `Linux`: intel: [rockbox_2025.01.07_x86_64-linux.tar.gz](https://github.com/tsirysndr/rockbox-zig/releases/download/2025.01.07/rockbox_2025.01.07_x86_64-linux.tar.gz) arm64: [rockbox_2025.01.07_aarch64-linux.tar.gz](https://github.com/tsirysndr/rockbox-zig/releases/download/2025.01.07/rockbox_2025.01.07_aarch64-linux.tar.gz)
+- `Linux`: intel: [rockbox_2025.01.08_x86_64-linux.tar.gz](https://github.com/tsirysndr/rockbox-zig/releases/download/2025.01.08/rockbox_2025.01.08_x86_64-linux.tar.gz) arm64: [rockbox_2025.01.08_aarch64-linux.tar.gz](https://github.com/tsirysndr/rockbox-zig/releases/download/2025.01.08/rockbox_2025.01.08_aarch64-linux.tar.gz)
 
 ## ✨ Features
 

cli/src/cmd/mod.rs

@@ -1,5 +1,6 @@
 pub mod community;
 pub mod repl;
+pub mod run;
 pub mod scan;
 pub mod start;
 pub mod webui;

cli/src/cmd/repl.rs

@@ -5,8 +5,9 @@ macro_rules! svec {
 }
 
 pub fn repl() {
-    let handle = thread::spawn(|| {
-        deno::cli(svec!["deno", "repl", "-A"]);
+    let handle = thread::spawn(|| match deno::cli(svec!["deno", "repl", "-A"]) {
+        Ok(_) => {}
+        Err(_) => {}
     });
     handle.join().unwrap();
 }

cli/src/cmd/run.rs

@@ -0,0 +1,9 @@
+use std::{ffi::OsString, thread};
+
+pub fn run(args: Vec<OsString>) {
+    let handle = thread::spawn(move || match deno::cli(args) {
+        Ok(_) => {}
+        Err(_) => {}
+    });
+    handle.join().unwrap();
+}

cli/src/lib.rs

@@ -27,9 +27,8 @@ pub fn install_rockboxd() -> Result<(), Error> {
 }
 
 pub fn wait_for_rockboxd(port: u32, timeout: Option<u32>) -> Result<(), Error> {
-    setup_pkgx()?;
     let cmd = format!(
-        "pkgx deno run -A npm:wait-port localhost:{} -t {}",
+        "rockbox run -A npm:wait-port localhost:{} -t {}",
         port,
         timeout.unwrap_or(60) * 1000
     );

cli/src/main.rs

@@ -1,8 +1,10 @@
+use std::ffi::OsString;
+
 use anyhow::Error;
 use clap::{arg, Command};
 use owo_colors::OwoColorize;
 
-use cmd::{community::*, repl::*, scan::*, start::*, webui::*};
+use cmd::{community::*, repl::*, run::*, scan::*, start::*, webui::*};
 
 pub mod cmd;
 
@@ -46,10 +48,30 @@ fn cli() -> Command {
                 .about("Start the Rockbox REPL")
                 .visible_alias("shell"),
         )
+        .subcommand(
+            Command::new("run")
+                .arg(arg!(<FILE> "JavaScript or TypeScript file to run"))
+                .about("Run a JavaScript or TypeScript program")
+                .visible_alias("x"),
+        )
 }
 
 #[tokio::main]
 async fn main() -> Result<(), Error> {
+    let args = std::env::args().collect::<Vec<String>>();
+    if args.len() > 1 && args[1] == "run" {
+        let _args = args
+            .into_iter()
+            .map(|s| match s.as_str() {
+                "rockbox" => "deno".into(),
+                _ => s.into(),
+            })
+            .collect::<Vec<OsString>>();
+
+        run(_args);
+        return Ok(());
+    }
+
     let matches = cli().get_matches();
 
     match matches.subcommand() {

crates/mpd/src/handlers/system.rs

@@ -1,5 +1,3 @@
-use std::os::unix::thread;
-
 use anyhow::Error;
 use tokio::sync::mpsc::Sender;