Bump version to 0.1.7.

Update dependencies. Remove futures-executor.
red-dal · Jul 20, 2022 · 4f037e3 · 4f037e3
1 parent d2644f0
commit 4f037e3
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 59 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ladder_lib/Cargo.toml b/ladder_lib/Cargo.toml
@@ -154,7 +154,10 @@ __codec = []
 
 [dependencies]
 ladder_lib_macro = { path = "../ladder_lib_macro" }
-futures = "0.3"
+futures =  { version = "0.3", default-features = false, features = [
+    "std",
+	"async-await"
+] }
 idna = "0.2"
 tokio = { version = "1.0", default-features = false, features = [
 	"rt-multi-thread",

diff --git a/ladder_lib/src/proxy/vmess/request/mod.rs b/ladder_lib/src/proxy/vmess/request/mod.rs
@@ -510,7 +510,7 @@ mod tests {
 
 		info!("{:#?}", request);
 
-		futures::executor::block_on(async move {
+		tokio::runtime::Runtime::new().unwrap().block_on(async move {
 			let buffer = request.encode_aead(&id, time);
 			let (auth_id, data) = buffer.split_at(16);
 			let data = data.to_owned();

diff --git a/rusty_ladder/Cargo.toml b/rusty_ladder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rusty_ladder"
-version = "0.1.6"
+version = "0.1.7"
 authors = ["reddal"]
 edition = "2018"
 license = "GPL-3.0"
@@ -121,14 +121,15 @@ serde_json = { version = "1.0", optional = true }
 toml = { version = "0.5", optional = true }
 structopt = "0.3"
 log = { version = "0.4", default-features = false, features = [
-    "std",
-    "release_max_level_info",
     "serde",
 ] }
 tokio = { version = "1.0" }
 tui = { version = "0.18", optional = true }
 crossterm = { version = "0.23", optional = true }
-futures = "0.3"
+futures =  { version = "0.3", default-features = false, features = [
+    "std",
+	"async-await"
+] }
 lazy_static = "1.4"
 thiserror = "1.0"
 smol_str = "0.1"

diff --git a/rusty_ladder/src/main.rs b/rusty_ladder/src/main.rs
@@ -499,10 +499,11 @@ mod tui_utils {
 			};
 			let (serve_task, abort_handle) = abortable(task);
 
+			let handle = rt.handle().clone();
 			// Spawn a thread to handle TUI
 			let tui_thread = {
 				thread::spawn(move || {
-					let res = tui::run(tui_receiver, tui::DEFAULT_UPDATE_INTERVAL, monitor);
+					let res = tui::run(tui_receiver, tui::DEFAULT_UPDATE_INTERVAL, monitor, handle);
 					// This error is caused by server thread panicking, so it's safe to ignore.
 					abort_handle.abort();
 					res

diff --git a/rusty_ladder/src/tui/data_manager.rs b/rusty_ladder/src/tui/data_manager.rs
@@ -21,17 +21,20 @@ use super::ColumnIndex;
 use ladder_lib::server::stat::{self, snapshot, Monitor, Snapshot};
 use log::trace;
 use std::cmp::Ordering;
+use tokio::runtime::Handle;
 
 pub(super) struct DataManager {
 	monitor: Monitor,
 	pub snapshots: Vec<Snapshot>,
+	rt: Handle,
 }
 
 impl DataManager {
-	pub fn new(monitor: Monitor) -> Self {
+	pub fn new(rt: Handle, monitor: Monitor) -> Self {
 		Self {
 			monitor,
 			snapshots: Vec::with_capacity(64),
+			rt,
 		}
 	}
 
@@ -40,7 +43,7 @@ impl DataManager {
 		{
 			let result = &mut self.snapshots;
 			let monitor = &self.monitor;
-			futures::executor::block_on(async {
+			self.rt.block_on(async {
 				// call async functions
 				monitor.query(&stat::Filter::new_all(), result);
 			});

diff --git a/rusty_ladder/src/tui/mod.rs b/rusty_ladder/src/tui/mod.rs
@@ -97,6 +97,7 @@ pub fn run(
 	stop_receiver: mpsc::Receiver<()>,
 	update_interval: Duration,
 	monitor: Monitor,
+	rt: tokio::runtime::Handle,
 ) -> Result<(), BoxStdErr> {
 	setup_panic();
 	trace!(
@@ -113,7 +114,7 @@ pub fn run(
 	// let mut last_update_time = Instant::now();
 
 	let mut renderer = Renderer::new();
-	let mut data_manager = DataManager::new(monitor);
+	let mut data_manager = DataManager::new(rt, monitor);
 
 	let mut sort_column: Option<ColumnIndex> = None;