Fix mac build

Cargo.toml

@@ -71,7 +71,7 @@ serde_json = "1"
 serde_with = "3"
 
 objc = "0.2"
-core-foundation = "0.10"
+core-foundation = "0.9"
 system-configuration = "0.6"
 
 windows = "0.58"

netstatus/src/sc.rs

@@ -3,6 +3,7 @@ use core_foundation::{
     base::TCFType,
     runloop::{kCFRunLoopDefaultMode, CFRunLoop, CFRunLoopRef},
 };
+use flume::{r#async::RecvStream, unbounded};
 use objc::{
     runtime::{Class, Object},
     *,
@@ -16,8 +17,6 @@ use std::{
     thread::JoinHandle,
 };
 use system_configuration::network_reachability::{ReachabilityFlags, SCNetworkReachability};
-use tokio::sync::watch;
-use tokio_stream::wrappers::WatchStream;
 
 #[link(name = "CoreWLAN", kind = "framework")]
 extern "C" {
@@ -63,7 +62,7 @@ pub fn current() -> NetStatus {
 }
 
 pub fn watch() -> impl Stream<Item = ()> {
-    let (tx, rx) = watch::channel(());
+    let (tx, rx) = unbounded();
     let loop_thread = std::thread::spawn(move || {
         let mut sc =
             SCNetworkReachability::from(SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), 0));
@@ -76,7 +75,7 @@ pub fn watch() -> impl Stream<Item = ()> {
         CFRunLoop::run_current();
     });
     StatusWatchStream {
-        s: WatchStream::new(rx),
+        rx: rx.into_stream(),
         thread: CFJThread {
             handle: Some(loop_thread),
         },
@@ -86,15 +85,15 @@ pub fn watch() -> impl Stream<Item = ()> {
 #[pin_project]
 struct StatusWatchStream {
     #[pin]
-    s: WatchStream<()>,
+    rx: RecvStream<'static, ()>,
     thread: CFJThread,
 }
 
 impl Stream for StatusWatchStream {
     type Item = ();
 
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        self.project().s.poll_next(cx)
+        self.project().rx.poll_next(cx)
     }
 }
 

tunet-service/Cargo.toml

@@ -38,6 +38,7 @@ runas = "1"
 winlog2 = "0.3"
 
 [target.'cfg(target_os = "macos")'.dependencies]
+libc = "0.2"
 dirs = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 plist = "1"

tunet-service/src/mac/mod.rs

@@ -1,8 +1,8 @@
 use anyhow::{anyhow, Result};
+use compio::signal::unix::signal;
+use futures_util::{FutureExt, StreamExt};
 use serde::Serialize;
 use std::path::PathBuf;
-use tokio::signal::unix::{signal, SignalKind};
-use tokio_stream::StreamExt;
 
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "PascalCase")]
@@ -63,23 +63,25 @@ pub fn unregister() -> Result<()> {
 
 pub fn start(interval: Option<humantime::Duration>) -> Result<()> {
     env_logger::try_init()?;
-    tokio::runtime::Builder::new_current_thread()
-        .enable_all()
+    compio::runtime::RuntimeBuilder::new()
         .build()?
         .block_on(start_impl(interval))
 }
 
 async fn start_impl(interval: Option<humantime::Duration>) -> Result<()> {
-    let mut ctrlc = signal(SignalKind::interrupt())?;
-    let mut kill = signal(SignalKind::terminate())?;
-    let mut timer = crate::create_timer(interval);
-    let mut events = netstatus::NetStatus::watch();
+    let mut timer = crate::create_timer(interval).fuse();
+    let mut timer = std::pin::pin!(timer);
+    let mut events = netstatus::NetStatus::watch().fuse();
     loop {
-        tokio::select! {
-            _ = ctrlc.recv() => {
+        let mut ctrlc = signal(libc::SIGINT);
+        let ctrlc = std::pin::pin!(ctrlc);
+        let mut kill = signal(libc::SIGTERM);
+        let kill = std::pin::pin!(kill);
+        futures_util::select! {
+            _ = ctrlc.fuse() => {
                 break;
             }
-            _ = kill.recv() => {
+            _ = kill.fuse() => {
                 break;
             }
             _ = timer.next() => {

tunet-service/src/stub/mod.rs

@@ -1,6 +1,6 @@
 use anyhow::{anyhow, Result};
-use tokio::signal::ctrl_c;
-use tokio_stream::StreamExt;
+use compio::signal::ctrl_c;
+use futures_util::{FutureExt, StreamExt};
 
 pub fn register(_interval: Option<humantime::Duration>) -> Result<()> {
     Err(anyhow!("不支持的命令"))
@@ -12,17 +12,19 @@ pub fn unregister() -> Result<()> {
 
 pub fn start(interval: Option<humantime::Duration>) -> Result<()> {
     env_logger::try_init()?;
-    tokio::runtime::Builder::new_current_thread()
-        .enable_all()
+    compio::runtime::RuntimeBuilder::new()
         .build()?
         .block_on(start_impl(interval))
 }
 
 async fn start_impl(interval: Option<humantime::Duration>) -> Result<()> {
-    let mut timer = crate::create_timer(interval);
+    let mut timer = crate::create_timer(interval).fuse();
+    let mut timer = std::pin::pin!(timer);
     loop {
-        tokio::select! {
-            _ = ctrl_c() => {
+        let mut ctrlc = ctrl_c();
+        let ctrlc = std::pin::pin!(ctrlc);
+        futures_util::select! {
+            _ = ctrlc.fuse() => {
                 break;
             }
             _ = timer.next() => {