feat: decide which tunnel to use based on server tunnel port response

Author: jacobtread

Cargo.lock

@@ -14,7 +14,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # Shared backing library
-pocket-relay-client-shared = { version = "^0.2", path = "../PocketRelayClientShared" }
+pocket-relay-client-shared = { version = "^0.3", path = "../PocketRelayClientShared" }
 
 # Logging
 env_logger = "0.10"

Cargo.toml

@@ -13,20 +13,38 @@ pub fn start_all_servers(ctx: Arc<ClientContext>) {
     // Stop existing servers and tasks if they are running
     stop_server_tasks();
 
-    // Create server tasks
+    // Spawn redirector server
     let redirector = redirector::start_redirector_server();
-    let blaze = blaze::start_blaze_server(ctx.clone());
-    let http = http::start_http_server(ctx.clone());
-    let tunnel = udp_tunnel::start_tunnel_server_v2(ctx.clone());
-    let qos = qos::start_qos_server();
-    let telemetry = telemetry::start_telemetry_server(ctx);
-
-    // Spawn server tasks
     run_server(redirector, "redirector");
+
+    // Spawn blaze server
+    let blaze = blaze::start_blaze_server(ctx.clone());
     run_server(blaze, "blaze");
+
+    // Spawn http proxy server
+    let http = http::start_http_server(ctx.clone());
     run_server(http, "http");
-    run_server(tunnel, "tunnel");
+
+    // Spawn QoS server
+    let qos = qos::start_qos_server();
     run_server(qos, "qos");
+
+    // Spawn tunnel server
+    match ctx.tunnel_port {
+        // When UDP tunnel server port is available use the faster UDP tunnel server
+        Some(tunnel_port) => {
+            let tunnel = udp_tunnel::start_udp_tunnel_server(ctx.clone(), tunnel_port);
+            run_server(tunnel, "tunnel");
+        }
+        // When unavailable fallback to the HTTP upgrade tunnel
+        None => {
+            let tunnel = tunnel::start_tunnel_server(ctx.clone());
+            run_server(tunnel, "tunnel");
+        }
+    };
+
+    // Spawn telemetry server
+    let telemetry = telemetry::start_telemetry_server(ctx);
     run_server(telemetry, "telemetry");
 }