Fix cargo-playdate run, add async-std reactor support (#260)

add async-std reactor support, fix `cargo-playdate run`
boozook · Apr 2, 2024 · db91c35 · db91c35
1 parent 993f1fb
commit db91c35
Show file tree

Hide file tree

Showing 11 changed files with 508 additions and 48 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,7 @@ sys = { version = "0.3", path = "api/sys", package = "playdate-sys", default-fea
 tool = { version = "0.1", path = "support/tool", package = "playdate-tool" }
 build = { version = "0.2", path = "support/build", package = "playdate-build", default-features = false }
 utils = { version = "0.2", path = "support/utils", package = "playdate-build-utils", default-features = false }
-device = { version = "0.1", path = "support/device", package = "playdate-device" }
+device = { version = "0.2", path = "support/device", package = "playdate-device" }
 simulator = { version = "0.1", path = "support/sim-ctrl", package = "playdate-simulator-utils", default-features = false }
 bindgen = { version = "0.1", path = "support/bindgen", package = "playdate-bindgen", default-features = false }
 bindgen-cfg = { version = "0.1", path = "support/bindgen-cfg", package = "playdate-bindgen-cfg", default-features = false }
@@ -49,3 +49,4 @@ toml = "0.8"
 futures-lite = "2.3"
 thiserror = "1.0"
 tokio = { version = "1.37", default-features = false }
+async-std = { version = "1.12", default-features = false }
diff --git a/cargo/Cargo.toml b/cargo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-playdate"
-version = "0.4.0-alpha.1"
+version = "0.4.0-alpha.2"
 readme = "README.md"
 description = "Build tool for neat yellow console."
 keywords = ["playdate", "build", "cargo", "plugin", "cargo-subcommand"]
@@ -62,10 +62,9 @@ features = ["assets-report", "toml"]
 
 [dependencies.device]
 workspace = true
-features = ["clap", "async", "tokio-serial", "tokio"]
+features = ["clap", "tokio", "async-std", "tokio-serial"]
 
 [dependencies.simulator]
-# features = ["tokio"]
 workspace = true
 
 [dependencies.clap]

diff --git a/support/device/Cargo.toml b/support/device/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "playdate-device"
-version = "0.1.0"
+version = "0.2.0"
 readme = "README.md"
 description = "Cross-platform interface Playdate device, async & blocking."
 keywords = ["playdate", "usb", "serial"]
@@ -39,6 +39,19 @@ features = ["fs", "process", "time", "io-std"]
 workspace = true
 optional = true
 
+[dependencies.async-std]
+features = [
+	"std",
+	"log",
+	"gloo-timers",
+	"futures-lite",
+	"pin-project-lite",
+	"unstable",
+	"default",
+]
+workspace = true
+optional = true
+
 [dependencies.futures-lite]
 version = "2.3"
 
@@ -75,6 +88,7 @@ features = [
 
 
 [features]
-default = ["async"]
-async = ["futures", "tokio", "tokio-serial"]
-tokio-serial = ["dep:tokio-serial", "tokio?/io-util", "tokio?/rt"]
+default = ["tokio", "tokio-serial"]
+tokio-serial = ["futures", "dep:tokio-serial", "tokio?/io-util", "tokio?/rt"]
+tokio = ["futures", "dep:tokio", "async-std?/tokio1"]                         # use async-std reactor
+async-std = ["futures", "dep:async-std"]                                      # use async-std reactor and features
diff --git a/support/device/src/device/methods.rs b/support/device/src/device/methods.rs
@@ -1,6 +1,3 @@
-#![cfg(feature = "tokio")]
-
-
 use crate::retry::{IterTime, Retries};
 use crate::usb::mode::Mode;
 use crate::error::Error;
@@ -30,14 +27,20 @@ pub async fn wait_mode_change(mut dev: Device, to: Mode, retry: Retries<impl Ite
 	debug!("retries: {retries_num} * {iter_ms:?} ≈ {total:?}.");
 
 	let mut counter = retries_num;
+	#[cfg(all(feature = "tokio", not(feature = "async-std")))]
 	let mut interval = tokio::time::interval(iter_ms);
 
 	while {
 		counter -= 1;
 		counter
 	} != 0
 	{
+		#[cfg(all(not(feature = "async-std"), feature = "tokio"))]
 		interval.tick().await;
+		#[cfg(feature = "async-std")]
+		async_std::task::sleep(iter_ms).await;
+		#[cfg(all(not(feature = "tokio"), not(feature = "async-std")))]
+		std::thread::sleep(iter_ms);
 
 		let mode = dev.mode_cached();
 		trace!(

diff --git a/support/device/src/install.rs b/support/device/src/install.rs
@@ -65,9 +65,11 @@ pub async fn install<'dev>(drive: &'dev MountedDevice,
                            path: &Path,
                            force: bool)
                            -> Result<MountedDevicePathBorrowed<'dev>> {
-	#[cfg(feature = "tokio")]
+	#[cfg(all(feature = "tokio", not(feature = "async-std")))]
 	use tokio::process::Command;
-	#[cfg(not(feature = "tokio"))]
+	#[cfg(feature = "async-std")]
+	use async_std::process::Command;
+	#[cfg(all(not(feature = "tokio"), not(feature = "async-std")))]
 	use std::process::Command;
 
 
@@ -87,9 +89,10 @@ pub async fn install<'dev>(drive: &'dev MountedDevice,
 		async {
 			if cfg!(unix) {
 				let mut cmd = Command::new("cp");
+				cmd.arg("-r");
 
 				if force {
-					cmd.arg("-r");
+					cmd.arg("-f");
 				}
 
 				cmd.arg(path);

diff --git a/support/device/src/mount/linux.rs b/support/device/src/mount/linux.rs
@@ -99,12 +99,14 @@ mod unmount {
 		}
 	}
 
-	#[cfg(feature = "tokio")]
 	impl UnmountAsync for Volume {
 		#[cfg_attr(feature = "tracing", tracing::instrument())]
 		async fn unmount(&self) -> Result<(), Error> {
-			use tokio::process::Command;
 			use futures_lite::future::ready;
+			#[cfg(all(feature = "tokio", not(feature = "async-std")))]
+			use tokio::process::Command;
+			#[cfg(feature = "async-std")]
+			use async_std::process::Command;
 
 
 			Command::from(eject(self)).status()

diff --git a/support/device/src/mount/mac.rs b/support/device/src/mount/mac.rs
@@ -47,15 +47,19 @@ mod unmount {
 		}
 	}
 
-	#[cfg(feature = "tokio")]
+
 	impl UnmountAsync for Volume {
 		#[cfg_attr(feature = "tracing", tracing::instrument())]
 		async fn unmount(&self) -> Result<(), Error> {
-			tokio::process::Command::from(cmd(self)).status()
-			                                        .await?
-			                                        .exit_ok()
-			                                        .map(|_| trace!("unmounted {self}"))
-			                                        .map_err(Into::into)
+			#[cfg(all(feature = "tokio", not(feature = "async-std")))]
+			use tokio::process::Command;
+			#[cfg(feature = "async-std")]
+			use async_std::process::Command;
+			Command::from(cmd(self)).status()
+			                        .await?
+			                        .exit_ok()
+			                        .map(|_| trace!("unmounted {self}"))
+			                        .map_err(Into::into)
 		}
 	}
 

diff --git a/support/device/src/mount/methods.rs b/support/device/src/mount/methods.rs
@@ -40,6 +40,7 @@ pub async fn wait_fs_available<T>(mount: &MountedDevice, retry: Retries<T>) -> R
 	debug!("retries: {retries_num} * {iter_ms:?} ≈ {total:?}.");
 
 	let mut counter = retries_num;
+	#[cfg(all(feature = "tokio", not(feature = "async-std")))]
 	let mut interval = tokio::time::interval(iter_ms);
 
 	let check = || {
@@ -70,7 +71,12 @@ pub async fn wait_fs_available<T>(mount: &MountedDevice, retry: Retries<T>) -> R
 		counter
 	} != 0
 	{
+		#[cfg(all(not(feature = "async-std"), feature = "tokio"))]
 		interval.tick().await;
+		#[cfg(feature = "async-std")]
+		async_std::task::sleep(iter_ms).await;
+		#[cfg(all(not(feature = "tokio"), not(feature = "async-std")))]
+		std::thread::sleep(iter_ms);
 
 		if check() {
 			return Ok(());
@@ -262,6 +268,7 @@ async fn wait_mount_point<T>(dev: Device, retry: Retries<T>) -> Result<MountedDe
 	debug!("retries: {retries_num} * {iter_ms:?} ≈ {total:?}.");
 
 	let mut counter = retries_num;
+	#[cfg(all(feature = "tokio", not(feature = "async-std")))]
 	let mut interval = tokio::time::interval(iter_ms);
 
 	let sn = dev.info()
@@ -274,7 +281,12 @@ async fn wait_mount_point<T>(dev: Device, retry: Retries<T>) -> Result<MountedDe
 		counter
 	} != 0
 	{
+		#[cfg(all(not(feature = "async-std"), feature = "tokio"))]
 		interval.tick().await;
+		#[cfg(feature = "async-std")]
+		async_std::task::sleep(iter_ms).await;
+		#[cfg(all(not(feature = "tokio"), not(feature = "async-std")))]
+		std::thread::sleep(iter_ms);
 
 		let mode = dev.mode_cached();
 		trace!(

diff --git a/support/device/src/mount/win.rs b/support/device/src/mount/win.rs
@@ -67,12 +67,14 @@ mod unmount {
 		}
 	}
 
-	#[cfg(feature = "tokio")]
 	impl UnmountAsync for Volume {
 		#[cfg_attr(feature = "tracing", tracing::instrument())]
 		async fn unmount(&self) -> Result<(), Error> {
-			use tokio::process::Command;
 			use futures_lite::future::ready;
+			#[cfg(all(feature = "tokio", not(feature = "async-std")))]
+			use tokio::process::Command;
+			#[cfg(feature = "async-std")]
+			use async_std::process::Command;
 
 			futures::future::lazy(|_| winapi::unmount(self.letter)).or_else(|err| {
 				                                                       if std::env::var_os("SHELL").is_some() {

diff --git a/support/tool/Cargo.toml b/support/tool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "playdate-tool"
-version = "0.2.1"
+version = "0.2.2"
 readme = "README.md"
 description = "Tool for interaction with Playdate device and sim."
 keywords = ["playdate", "usb", "utility"]
@@ -46,7 +46,7 @@ workspace = true
 
 # PD:
 [dependencies.device]
-features = ["async", "tokio", "clap", "tokio-serial"]
+features = ["clap", "tokio", "tokio-serial"]
 workspace = true
 
 [dependencies.simulator]