Update code

Cargo.toml

@@ -35,7 +35,6 @@ tunet-helper = { path = "tunet-helper" }
 tunet-model = { path = "tunet-model" }
 tunet-settings = { path = "tunet-settings" }
 
-async-trait = "0.1"
 once_cell = "1"
 
 anyhow = "1"
@@ -71,5 +70,5 @@ objc = "0.2"
 core-foundation = "0.9"
 system-configuration = "0.5"
 
-windows = "0.51"
+windows = "0.52"
 winresource = "0.1"

tunet-flutter/lib/main.dart

@@ -32,7 +32,7 @@ void main() async {
 class MyApp extends StatelessWidget {
   final ManagedRuntime runtime;
 
-  const MyApp({Key? key, required this.runtime}) : super(key: key);
+  const MyApp({super.key, required this.runtime});
 
   @override
   Widget build(BuildContext context) {

tunet-flutter/lib/views/about_card.dart

@@ -5,7 +5,7 @@ import 'package:shimmer_animation/shimmer_animation.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 class AboutCard extends StatelessWidget {
-  const AboutCard({Key? key}) : super(key: key);
+  const AboutCard({super.key});
 
   @override
   Widget build(BuildContext context) {

tunet-flutter/lib/views/details_card.dart

@@ -4,7 +4,7 @@ import 'package:shimmer_animation/shimmer_animation.dart';
 import '../runtime.dart';
 
 class DetailsCard extends StatefulWidget {
-  const DetailsCard({Key? key}) : super(key: key);
+  const DetailsCard({super.key});
 
   @override
   State<StatefulWidget> createState() => _DetailsCardState();

tunet-flutter/native/src/api.rs

@@ -3,15 +3,12 @@ use chrono::Datelike;
 use flutter_rust_bridge::{frb, RustOpaque, StreamSink};
 
 pub use netstatus::NetStatus;
-pub use std::{
-    net::Ipv4Addr,
-    sync::{Arc, Mutex},
-};
+pub use std::{net::Ipv4Addr, sync::Mutex};
 pub use tokio::{runtime::Handle, sync::mpsc};
 pub use tunet_helper::{
-    usereg::{NetDateTime, NetDetail, NetUser},
-    Balance, Duration as NewDuration, Flux, NaiveDate, NaiveDateTime, NaiveDuration as Duration,
-    NetFlux, NetState,
+    usereg::{NetDateTime, NetDetail},
+    Balance, Duration as NewDuration, Flux, NaiveDateTime, NaiveDuration as Duration, NetFlux,
+    NetState,
 };
 pub use tunet_model::{Action, DetailDaily, Model, UpdateMsg};
 

tunet-flutter/native/src/lib.rs

@@ -1,2 +1,3 @@
 mod api;
+#[allow(clippy::unnecessary_literal_unwrap)]
 mod bridge_generated;

tunet-gui/ui/about.slint

@@ -6,7 +6,6 @@ export global AboutModel {
     in property <[[StandardListViewItem]]> deps: [
         [ { text: "anyhow" }, { text: "MIT"} ],
         [ { text: "async-stream" }, { text: "MIT"} ],
-        [ { text: "async-trait" }, { text: "MIT"} ],
         [ { text: "chrono" }, { text: "MIT"} ],
         [ { text: "clap" }, { text: "MIT"} ],
         [ { text: "console" }, { text: "MIT"} ],

tunet-helper/Cargo.toml

@@ -9,7 +9,6 @@ repository.workspace = true
 [dependencies]
 authtea = { workspace = true }
 netstatus = { workspace = true }
-async-trait = { workspace = true }
 async-stream = "0.3"
 futures-core = { workspace = true }
 reqwest = { version = "0.11", default-features = false, features = [
@@ -29,7 +28,6 @@ mac_address2 = { workspace = true }
 once_cell = { workspace = true }
 regex = { version = "1", default-features = false, features = ["std"] }
 thiserror = { workspace = true }
-enum_dispatch = { workspace = true }
 allo-isolate = { version = "0.1", optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies]

tunet-helper/src/auth.rs

@@ -132,11 +132,10 @@ impl<U: AuthConnectUri + Send + Sync> AuthConnect<U> {
     }
 }
 
-#[async_trait]
 impl<U: AuthConnectUri + Send + Sync> TUNetHelper for AuthConnect<U> {
     async fn login(&self, u: &str, p: &str) -> NetHelperResult<String> {
         let ac_id = self.get_ac_id().await.unwrap_or(1);
-        Ok(self.try_login(ac_id, u, p).await?)
+        self.try_login(ac_id, u, p).await
     }
 
     async fn logout(&self, u: &str) -> NetHelperResult<String> {
@@ -154,7 +153,7 @@ impl<U: AuthConnectUri + Send + Sync> TUNetHelper for AuthConnect<U> {
 
     async fn flux(&self) -> NetHelperResult<NetFlux> {
         let res = self.client.get(U::flux_uri()).send().await?;
-        Ok(res.text().await?.parse()?)
+        res.text().await?.parse()
     }
 }
 

tunet-helper/src/lib.rs

@@ -1,8 +1,7 @@
 #![forbid(unsafe_code)]
 
-use async_trait::async_trait;
-use enum_dispatch::enum_dispatch;
 use std::fmt::{Display, Formatter};
+use std::future::Future;
 use thiserror::Error;
 
 pub use chrono::{
@@ -180,28 +179,51 @@ impl std::str::FromStr for NetState {
     }
 }
 
-#[async_trait]
-#[enum_dispatch(TUNetConnect)]
 pub trait TUNetHelper: Send + Sync {
-    async fn login(&self, u: &str, p: &str) -> NetHelperResult<String>;
-    async fn logout(&self, u: &str) -> NetHelperResult<String>;
-    async fn flux(&self) -> NetHelperResult<NetFlux>;
+    fn login(&self, u: &str, p: &str) -> impl Future<Output = NetHelperResult<String>> + Send;
+    fn logout(&self, u: &str) -> impl Future<Output = NetHelperResult<String>> + Send;
+    fn flux(&self) -> impl Future<Output = NetHelperResult<NetFlux>> + Send;
 }
 
-#[enum_dispatch]
 #[derive(Clone)]
 pub enum TUNetConnect {
-    NetConnect,
-    Auth4Connect,
-    Auth6Connect,
+    Net(NetConnect),
+    Auth4(Auth4Connect),
+    Auth6(Auth6Connect),
+}
+
+impl TUNetHelper for TUNetConnect {
+    async fn login(&self, u: &str, p: &str) -> NetHelperResult<String> {
+        match self {
+            Self::Net(inner) => TUNetHelper::login(inner, u, p).await,
+            Self::Auth4(inner) => TUNetHelper::login(inner, u, p).await,
+            Self::Auth6(inner) => TUNetHelper::login(inner, u, p).await,
+        }
+    }
+
+    async fn logout(&self, u: &str) -> NetHelperResult<String> {
+        match self {
+            TUNetConnect::Net(inner) => TUNetHelper::logout(inner, u).await,
+            TUNetConnect::Auth4(inner) => TUNetHelper::logout(inner, u).await,
+            TUNetConnect::Auth6(inner) => TUNetHelper::logout(inner, u).await,
+        }
+    }
+
+    async fn flux(&self) -> NetHelperResult<NetFlux> {
+        match self {
+            TUNetConnect::Net(inner) => TUNetHelper::flux(inner).await,
+            TUNetConnect::Auth4(inner) => TUNetHelper::flux(inner).await,
+            TUNetConnect::Auth6(inner) => TUNetHelper::flux(inner).await,
+        }
+    }
 }
 
 impl TUNetConnect {
     pub fn new(s: NetState, client: HttpClient) -> NetHelperResult<TUNetConnect> {
         match s {
-            NetState::Net => Ok(Self::NetConnect(net::NetConnect::new(client))),
-            NetState::Auth4 => Ok(Self::Auth4Connect(auth::AuthConnect::new(client))),
-            NetState::Auth6 => Ok(Self::Auth6Connect(auth::AuthConnect::new(client))),
+            NetState::Net => Ok(Self::Net(net::NetConnect::new(client))),
+            NetState::Auth4 => Ok(Self::Auth4(auth::AuthConnect::new(client))),
+            NetState::Auth6 => Ok(Self::Auth6(auth::AuthConnect::new(client))),
             _ => Err(NetHelperError::InvalidHost),
         }
     }

tunet-helper/src/net.rs

@@ -16,7 +16,6 @@ impl NetConnect {
     }
 }
 
-#[async_trait]
 impl TUNetHelper for NetConnect {
     async fn login(&self, u: &str, p: &str) -> NetHelperResult<String> {
         let password_md5 = {
@@ -43,6 +42,6 @@ impl TUNetHelper for NetConnect {
 
     async fn flux(&self) -> NetHelperResult<NetFlux> {
         let res = self.client.get(NET_FLUX_URI).send().await?;
-        Ok(res.text().await?.parse()?)
+        res.text().await?.parse()
     }
 }

tunet/Cargo.toml

@@ -52,7 +52,6 @@ tunet-settings = { workspace = true }
 anyhow = { workspace = true }
 futures-util = { workspace = true }
 tokio = { workspace = true, features = ["rt"] }
-async-trait = { workspace = true }
 mac_address2 = { workspace = true }
 clap = { workspace = true }
 itertools = { workspace = true }