🐛 fix translations * pingfall flags

Author: Reverier-Xu

crates/desktop/src/daemon/api_controller.rs

@@ -21,7 +21,10 @@ use wsrx::utils::create_tcp_listener;
 use super::latency_worker::update_instance_latency;
 use crate::{
     bridges::ui_state::sync_scoped_instance,
-    daemon::model::{FeatureFlags, InstanceData, ProxyInstance, ScopeData, ServerState},
+    daemon::{
+        latency_worker::update_instance_state,
+        model::{FeatureFlags, InstanceData, ProxyInstance, ScopeData, ServerState},
+    },
     ui::{Instance, InstanceBridge, Scope, ScopeBridge},
 };
 
@@ -199,9 +202,10 @@ async fn launch_instance(
 
     tokio::spawn(async move {
         let client = reqwest::Client::new();
-        update_instance_latency(state_clone, instance, &client)
-            .await
-            .ok();
+        match update_instance_latency(&instance, &client).await {
+            Ok(elapsed) => update_instance_state(state_clone, &instance, elapsed).await,
+            Err(_) => update_instance_state(state_clone, &instance, -1).await,
+        };
     });
 
     match slint::invoke_from_event_loop(move || {

crates/desktop/src/daemon/latency_worker.rs

@@ -26,8 +26,12 @@ pub async fn start(state: ServerState) {
             let client = client.clone();
             let state = state.clone();
             tokio::spawn(async move {
-                let result =
-                    update_instance_latency(state.clone(), instance.clone(), &client).await;
+                let result = update_instance_latency(&instance, &client).await;
+                if let Ok(elapsed) = result {
+                    update_instance_state(state.clone(), &instance, elapsed).await;
+                } else {
+                    update_instance_state(state.clone(), &instance, -1).await;
+                }
                 if let Err(e) = result {
                     pingfall(state.clone(), instance.clone(), e).await;
                 }
@@ -49,7 +53,7 @@ pub enum LatencyError {
 }
 
 pub async fn update_instance_latency(
-    state: ServerState, instance: InstanceData, client: &reqwest::Client,
+    instance: &InstanceData, client: &reqwest::Client,
 ) -> Result<i32, LatencyError> {
     let req = client
         .request(Method::OPTIONS, instance.remote.replace("ws", "http"))
@@ -68,13 +72,18 @@ pub async fn update_instance_latency(
         return Err(LatencyError::NonSuccessStatus(resp.status().as_u16()));
     };
 
+    Ok(elapsed)
+}
+
+pub async fn update_instance_state(state: ServerState, instance: &InstanceData, elapsed: i32) {
     for proxy_instance in state.instances.write().await.iter_mut() {
         if instance.remote != proxy_instance.remote {
             continue;
         }
 
         proxy_instance.latency = elapsed;
         let window = state.ui.clone();
+        let instance = instance.clone();
 
         let _ = slint::invoke_from_event_loop(move || {
             let window = window.upgrade().unwrap();
@@ -104,21 +113,23 @@ pub async fn update_instance_latency(
 
         break;
     }
-
-    Ok(elapsed)
 }
 
 async fn pingfall(state: ServerState, instance: InstanceData, err: LatencyError) {
+    warn!(
+        "Pingfall triggered for instance {} due to error: {err:?}",
+        instance.local
+    );
     let scopes = state.scopes.read().await;
 
     let scope = scopes
         .iter()
         .find(|scope| scope.host == instance.scope_host.as_str());
-
+    debug!("Pingfall settings: {:?}", scope);
     if let Some(scope) = scope
         && scope.features.contains(FeatureFlags::PingFall)
     {
-        let settings = scope.settings.get(&FeatureFlags::PingFall);
+        let settings = scope.settings.get("pingfall");
         if let Some(settings) = settings {
             let pingfall_settings: super::model::PingFallSettings =
                 serde_json::from_value(settings.to_owned()).unwrap_or_default();
@@ -128,19 +139,11 @@ async fn pingfall(state: ServerState, instance: InstanceData, err: LatencyError)
                     if pingfall_settings.fail_status.contains(&code)
                         || pingfall_settings.fail_status.is_empty()
                     {
-                        warn!(
-                            "PingFall triggered for instance {} due to status code {}",
-                            instance.local, code
-                        );
                         on_instance_del(&state, &instance.local).await;
                     }
                 }
                 LatencyError::Rewqest(_) => {
                     if pingfall_settings.drop_unknown {
-                        warn!(
-                            "PingFall triggered for instance {} due to request error",
-                            instance.local
-                        );
                         on_instance_del(&state, &instance.local).await;
                     }
                 }

crates/desktop/src/daemon/model.rs

@@ -30,7 +30,7 @@ pub struct ScopeData {
     pub state: String,
     pub features: FeatureFlags,
     #[serde(default)]
-    pub settings: HashMap<FeatureFlags, Value>,
+    pub settings: HashMap<String, Value>,
 }
 
 #[derive(Clone)]

crates/desktop/src/daemon/ui_controller.rs

@@ -7,6 +7,7 @@ use crate::{
     bridges::ui_state::sync_scoped_instance,
     daemon::{
         default_label,
+        latency_worker::update_instance_state,
         model::{ProxyInstance, ServerState},
     },
     ui::{Instance, InstanceBridge, MainWindow, Scope, ScopeBridge},
@@ -44,9 +45,10 @@ pub async fn on_instance_add(state: &ServerState, remote: &str, local: &str) {
 
     tokio::spawn(async move {
         let client = reqwest::Client::new();
-        update_instance_latency(state_clone, instance_data, &client)
-            .await
-            .ok();
+        match update_instance_latency(&instance_data, &client).await {
+            Ok(elapsed) => update_instance_state(state_clone, &instance_data, elapsed).await,
+            Err(_) => update_instance_state(state_clone, &instance_data, -1).await,
+        };
     });
 
     let label = instance.label.clone();

crates/desktop/ui/i18n/zh_CN/LC_MESSAGES/wsrx-desktop.po

@@ -71,17 +71,17 @@ msgstr "外部控制"
 #: crates/desktop/ui/pages/connections.slint:90
 msgctxt "ConnectionsPage"
 msgid "This scope is controlled by you manually."
-msgstr "此连接池由你手动控制。"
+msgstr "这个连接池由你手动控制。"
 
 #: crates/desktop/ui/pages/connections.slint:90
 msgctxt "ConnectionsPage"
 msgid "This domain can control wsrx on your local network."
-msgstr "此域名可以控制你本地网络上的 wsrx。"
+msgstr "这个域名可以控制你本地网络上的 wsrx。"
 
 #: crates/desktop/ui/pages/connections.slint:90
 msgctxt "ConnectionsPage"
 msgid "This domain requested controlling wsrx."
-msgstr "此域名请求控制 wsrx。"
+msgstr "这个域名请求控制 wsrx。"
 
 #: crates/desktop/ui/pages/connections.slint:99
 msgctxt "ConnectionsPage"

crates/desktop/ui/i18n/zh_TW/LC_MESSAGES/wsrx-desktop.po

@@ -71,17 +71,17 @@ msgstr "外部控制"
 #: crates/desktop/ui/pages/connections.slint:90
 msgctxt "ConnectionsPage"
 msgid "This scope is controlled by you manually."
-msgstr "此連接池由你手動控制。"
+msgstr "这个連接池由你手動控制。"
 
 #: crates/desktop/ui/pages/connections.slint:90
 msgctxt "ConnectionsPage"
 msgid "This domain can control wsrx on your local network."
-msgstr "此域名可以控制你本地網絡上的 wsrx。"
+msgstr "这个域名可以控制你本地網絡上的 wsrx。"
 
 #: crates/desktop/ui/pages/connections.slint:90
 msgctxt "ConnectionsPage"
 msgid "This domain requested controlling wsrx."
-msgstr "此域名請求控制 wsrx。"
+msgstr "这个域名請求控制 wsrx。"
 
 #: crates/desktop/ui/pages/connections.slint:99
 msgctxt "ConnectionsPage"