Merge pull request #26 from PocketRelay/dedicated-test

Tunneling Support

Author: jacobtread

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pocket-relay-client"
-version = "0.3.2"
+version = "0.4.0"
 edition = "2021"
 build = "build.rs"
 license = "MIT"
@@ -19,7 +19,7 @@ native = ["dep:native-windows-gui", "dep:native-windows-derive", "dep:futures"]
 
 [dependencies]
 # Shared backing library
-pocket-relay-client-shared = { version = "0.1" }
+pocket-relay-client-shared = { version = "0.2" }
 
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

Cargo.toml

@@ -31,7 +31,7 @@ Below are some quick download links to download the latest versions, the client
 
 | Variant | Download Link                                                                                             |
 | ------- | --------------------------------------------------------------------------------------------------------- |
-| Normal  | [Download](https://github.com/PocketRelay/Client/releases/latest/download/pocket-relay-client-native.exe) |
+| Normal  | [Download](https://github.com/PocketRelay/Client/releases/latest/download/pocket-relay-client.exe)        |
 | Native  | [Download](https://github.com/PocketRelay/Client/releases/latest/download/pocket-relay-client-native.exe) |
 
 

README.md

@@ -1,62 +1,46 @@
 use crate::{
-    core::{reqwest, servers::*, Url},
+    core::{ctx::ClientContext, servers::*},
     ui::show_error,
 };
 use log::error;
-use std::sync::Arc;
+use std::{future::Future, sync::Arc};
 
 /// Starts all the servers in their own tasks
 ///
 /// ## Arguments
-/// * `http_client` - The HTTP client to use on the servers
-/// * `base_url`    - The base URL of the connected server
-pub fn start_all_servers(http_client: reqwest::Client, base_url: Arc<Url>) {
+/// * `ctx` - The client context
+pub fn start_all_servers(ctx: Arc<ClientContext>) {
     // Stop existing servers and tasks if they are running
     stop_server_tasks();
 
-    // Spawn the Redirector server
-    spawn_server_task(async move {
-        if let Err(err) = redirector::start_redirector_server().await {
-            show_error("Failed to start redirector server", &err.to_string());
-            error!("Failed to start redirector server: {}", err);
-        }
-    });
-
-    // Need to copy the client and base_url so it can be moved into the task
-    let (a, b) = (http_client.clone(), base_url.clone());
-
-    // Spawn the Blaze server
-    spawn_server_task(async move {
-        if let Err(err) = blaze::start_blaze_server(a, b).await {
-            show_error("Failed to start blaze server", &err.to_string());
-            error!("Failed to start blaze server: {}", err);
-        }
-    });
-
-    // Need to copy the client and base_url so it can be moved into the task
-    let (a, b) = (http_client.clone(), base_url.clone());
-
-    // Spawn the HTTP server
-    spawn_server_task(async move {
-        if let Err(err) = http::start_http_server(a, b).await {
-            show_error("Failed to start http server", &err.to_string());
-            error!("Failed to start http server: {}", err);
-        }
-    });
-
-    // Spawn the QoS server
-    spawn_server_task(async move {
-        if let Err(err) = qos::start_qos_server().await {
-            show_error("Failed to start qos server", &err.to_string());
-            error!("Failed to start qos server: {}", err);
-        }
-    });
+    // Create server tasks
+    let redirector = redirector::start_redirector_server();
+    let blaze = blaze::start_blaze_server(ctx.clone());
+    let http = http::start_http_server(ctx.clone());
+    let tunnel = tunnel::start_tunnel_server(ctx.clone());
+    let qos = qos::start_qos_server();
+    let telemetry = telemetry::start_telemetry_server(ctx);
+
+    // Spawn server tasks
+    run_server(redirector, "redirector");
+    run_server(blaze, "blaze");
+    run_server(http, "http");
+    run_server(tunnel, "tunnel");
+    run_server(qos, "qos");
+    run_server(telemetry, "telemetry");
+}
 
-    // Spawn the telemetry server
+/// Runs the provided server `future` in a background task displaying
+/// and logging any errors if they occur
+#[inline]
+pub fn run_server<F>(future: F, name: &'static str)
+where
+    F: Future<Output = std::io::Result<()>> + Send + 'static,
+{
     spawn_server_task(async move {
-        if let Err(err) = telemetry::start_telemetry_server(http_client, base_url).await {
-            show_error("Failed to start telemetry server", &err.to_string());
-            error!("Failed to start telemetry server: {}", err);
+        if let Err(err) = future.await {
+            show_error(&format!("Failed to start {name} server"), &err.to_string());
+            error!("Failed to start {name} server: {err}");
         }
     });
 }