🐛 fix wrong icon path for cargo bundle (#26)

Author: GZTimeWalker

crates/desktop/Cargo.toml

@@ -66,7 +66,7 @@ osx_url_schemes   = ["org.xdsec.wsrx"]
 short_description = "Controlled TCP-over-WebSocket forwarding tunnel."
 
 icon = [
-  "arts/logo.png",
-  "macos/WebSocketReflectorX.icns",
-  "windows/WebSocketReflectorX.ico",
+  "../../arts/logo.png",
+  "../../macos/WebSocketReflectorX.icns",
+  "../../windows/WebSocketReflectorX.ico",
 ]

crates/desktop/src/daemon/api_controller.rs

@@ -18,14 +18,13 @@ use tower_http::{
 use tracing::{Span, debug};
 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},
     ui::{Instance, InstanceBridge, Scope, ScopeBridge},
 };
 
-use super::latency_worker::update_instance_latency;
-
 pub fn router(state: ServerState) -> axum::Router {
     let cors_state = state.clone();
     let cors_layer = CorsLayer::new()
@@ -168,9 +167,7 @@ async fn launch_instance(
     if instances.iter().any(|i| i.local.as_str() == local) {
         return Err((
             StatusCode::BAD_REQUEST,
-            format!(
-                "The local address {local} is already taken by another instance"
-            ),
+            format!("The local address {local} is already taken by another instance"),
         ));
     }
 

crates/desktop/src/daemon/latency_worker.rs

@@ -109,7 +109,8 @@ async fn pingfall(state: ServerState, instance: InstanceData) {
         .find(|scope| scope.host == instance.scope_host.as_str());
 
     if let Some(scope) = scope
-        && scope.features.contains(FeatureFlags::PingFall) {
-            on_instance_del(&state, &instance.local).await;
-        }
+        && scope.features.contains(FeatureFlags::PingFall)
+    {
+        on_instance_del(&state, &instance.local).await;
+    }
 }

crates/desktop/src/daemon/ui_controller.rs

@@ -1,3 +1,8 @@
+use slint::{ComponentHandle, Model, ToSharedString, VecModel};
+use tracing::{debug, info, warn};
+use wsrx::utils::create_tcp_listener;
+
+use super::latency_worker::update_instance_latency;
 use crate::{
     bridges::ui_state::sync_scoped_instance,
     daemon::{
@@ -6,11 +11,6 @@ use crate::{
     },
     ui::{Instance, InstanceBridge, MainWindow, Scope, ScopeBridge},
 };
-use slint::{ComponentHandle, Model, ToSharedString, VecModel};
-use tracing::{debug, info, warn};
-use wsrx::utils::create_tcp_listener;
-
-use super::latency_worker::update_instance_latency;
 
 pub async fn on_instance_add(state: &ServerState, remote: &str, local: &str) {
     let listener = match create_tcp_listener(local).await {

crates/wsrx/src/cli/daemon.rs

@@ -149,9 +149,10 @@ fn build_router(secret: Option<String>) -> axum::Router {
             |State(secret): State<Option<String>>, req: ExtractRequest, next: Next| async move {
                 if let Some(secret) = secret {
                     if let Some(auth) = req.headers().get("authorization")
-                        && auth.to_str().map_err(|_| StatusCode::UNAUTHORIZED)? == secret {
-                            return Ok(next.run(req).await);
-                        }
+                        && auth.to_str().map_err(|_| StatusCode::UNAUTHORIZED)? == secret
+                    {
+                        return Ok(next.run(req).await);
+                    }
                     return Err(StatusCode::UNAUTHORIZED);
                 }
                 Ok(next.run(req).await)

crates/wsrx/src/cli/serve.rs

@@ -72,9 +72,10 @@ fn build_router(secret: Option<String>) -> axum::Router {
             |State(secret): State<Option<String>>, req: ExtractRequest, next: Next| async move {
                 if let Some(secret) = secret {
                     if let Some(auth) = req.headers().get("authorization")
-                        && auth.to_str().map_err(|_| StatusCode::UNAUTHORIZED)? == secret {
-                            return Ok(next.run(req).await);
-                        }
+                        && auth.to_str().map_err(|_| StatusCode::UNAUTHORIZED)? == secret
+                    {
+                        return Ok(next.run(req).await);
+                    }
                     return Err(StatusCode::UNAUTHORIZED);
                 }
                 Ok(next.run(req).await)

crates/wsrx/src/lib.rs

@@ -11,4 +11,4 @@ pub mod utils;
 #[cfg(feature = "client")]
 pub mod tunnel;
 
-pub use proxy::{proxy, Error, Message, WrappedWsStream};
+pub use proxy::{Error, Message, WrappedWsStream, proxy};

crates/wsrx/src/tunnel.rs

@@ -18,10 +18,10 @@ pub struct TunnelConfig {
 
 /// A tunnel that proxies TCP connections to a remote WebSocket server.
 ///
-/// This struct is responsible for creating a TCP listener and accepting incoming
-/// connections. It will then establish a WebSocket connection to the remote
-/// server and proxy the data between the TCP connection and the WebSocket
-/// connection.
+/// This struct is responsible for creating a TCP listener and accepting
+/// incoming connections. It will then establish a WebSocket connection to the
+/// remote server and proxy the data between the TCP connection and the
+/// WebSocket connection.
 #[derive(Debug)]
 pub struct Tunnel {
     config: TunnelConfig,

crates/wsrx/src/utils.rs

@@ -2,16 +2,15 @@ use std::net::ToSocketAddrs;
 
 use axum::http::StatusCode;
 use tokio::net::TcpListener;
-
 #[cfg(feature = "log")]
 use tracing::error;
 
-
 /// Creates a TCP listener on the specified local address.
 ///
 /// @param local The local address to bind the TCP listener to.
 ///
-/// @returns A `Result` containing the `TcpListener` if successful, or an error tuple
+/// @returns A `Result` containing the `TcpListener` if successful,
+/// or an error tuple
 pub async fn create_tcp_listener(local: &str) -> Result<TcpListener, (StatusCode, String)> {
     let mut tcp_addr_obj = local.to_socket_addrs().map_err(|err| {
         #[cfg(feature = "log")]