relay fallback

Author: hry-gh

src-tauri/src/relays.rs

@@ -15,6 +15,8 @@ pub struct Relay {
     pub id: String,
     pub name: String,
     pub host: String,
+    #[serde(default)]
+    pub fallback: bool,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, specta::Type)]
@@ -90,46 +92,55 @@ fn get_default_relays() -> Vec<Relay> {
             id: "direct".to_string(),
             name: "Direct".to_string(),
             host: "direct.cm-ss13.com".to_string(),
+            fallback: true,
         },
         Relay {
             id: "nyc".to_string(),
             name: "NYC".to_string(),
             host: "nyc.cm-ss13.com".to_string(),
+            fallback: false,
         },
         Relay {
             id: "uk".to_string(),
             name: "UK".to_string(),
             host: "uk.cm-ss13.com".to_string(),
+            fallback: false,
         },
         Relay {
             id: "eu-e".to_string(),
             name: "EU East".to_string(),
             host: "eu-e.cm-ss13.com".to_string(),
+            fallback: false,
         },
         Relay {
             id: "eu-w".to_string(),
             name: "EU West".to_string(),
             host: "eu-w.cm-ss13.com".to_string(),
+            fallback: false,
         },
         Relay {
             id: "aus".to_string(),
             name: "Australia".to_string(),
             host: "aus.cm-ss13.com".to_string(),
+            fallback: false,
         },
         Relay {
             id: "us-e".to_string(),
             name: "US East".to_string(),
             host: "us-e.cm-ss13.com".to_string(),
+            fallback: false,
         },
         Relay {
             id: "us-w".to_string(),
             name: "US West".to_string(),
             host: "us-w.cm-ss13.com".to_string(),
+            fallback: false,
         },
         Relay {
             id: "asia-se".to_string(),
             name: "SE Asia".to_string(),
             host: "asia-se.cm-ss13.com".to_string(),
+            fallback: false,
         },
     ]
 }
@@ -235,6 +246,21 @@ pub async fn init_relays(state: &Arc<RelayState>, handle: &AppHandle) {
         .collect();
 
     futures_util::future::join_all(ping_futures).await;
+
+    let selected = state.get_selected().await;
+    if selected.is_empty() {
+        let relays = state.get_relays().await;
+        if let Some(fallback) = relays.iter().find(|r| r.relay.fallback) {
+            tracing::warn!(
+                "All relay pings failed, falling back to: {} ({})",
+                fallback.relay.id,
+                fallback.relay.host
+            );
+            let id = fallback.relay.id.clone();
+            state.set_selected(id.clone()).await;
+            let _ = handle.emit("relay-selected", &id);
+        }
+    }
 }
 
 #[tauri::command]

src/bindings.ts

@@ -543,7 +543,7 @@ export type LauncherFeatures = { relay_selector: boolean; singleplayer: boolean;
 export type LauncherStrings = { auth_provider_name: string; login_prompt: string; discord_game_name: string }
 export type LauncherUrls = { server_api: string; hub_api: string | null; auth_base: string | null; steam_auth: string | null; byond_hash_api: string | null; register_url: string | null; help_url: string }
 export type OidcConfig = { client_id: string; auth_url: string; token_url: string; userinfo_url: string }
-export type RelayWithPing = ({ id: string; name: string; host: string }) & { ping: number | null; checking: boolean }
+export type RelayWithPing = ({ id: string; name: string; host: string; fallback?: boolean }) & { ping: number | null; checking: boolean }
 export type ReleaseInfo = { tag_name: string; name: string; published_at: string; download_url: string | null; size: number }
 export type RenderingPipeline = "dxvk" | "wined3d"
 export type Server = { id: string | null; name: string; url: string; status: string; hub_status?: string; players?: number; data?: ServerData | null; is_18_plus?: boolean; version?: string | null; engine?: EngineRequirements | null; tags?: string[]; auth_methods?: string[]; engine_type?: string | null; description?: string | null; links?: ServerLink[]; verified_domain?: string | null; region?: string | null; language?: string | null }

src/components/RelayDropdown.tsx

@@ -55,7 +55,7 @@ export const RelayDropdown = ({
               return a.ping - b.ping;
             })
             .map((relay) => {
-            const isDisabled = relay.ping === null && !relay.checking;
+            const isDisabled = relay.ping === null && !relay.checking && !relay.fallback;
             const isSelected = selectedRelay === relay.id;
 
             return (

src/stores/serverStore.ts

@@ -33,8 +33,10 @@ interface ServerStore {
   initRelays: () => Promise<UnlistenFn>;
 }
 
-const hasValidPing = (relays: RelayWithPing[]): boolean => {
-  return relays.some((r) => r.ping !== null && !r.checking);
+const relaysResolved = (relays: RelayWithPing[]): boolean => {
+  const hasValidPing = relays.some((r) => r.ping !== null && !r.checking);
+  const allDone = relays.length > 0 && relays.every((r) => !r.checking);
+  return hasValidPing || allDone;
 };
 
 export const useServerStore = create<ServerStore>()((set) => ({
@@ -100,7 +102,7 @@ export const useServerStore = create<ServerStore>()((set) => ({
   initRelays: async () => {
     try {
       const relays = unwrap(await commands.getRelays());
-      const ready = hasValidPing(relays);
+      const ready = relaysResolved(relays);
       set({ relays, relaysReady: ready });
 
       const selectedRelay = unwrap(await commands.getSelectedRelay());
@@ -113,7 +115,7 @@ export const useServerStore = create<ServerStore>()((set) => ({
       "relays-updated",
       (event) => {
         const relays = event.payload;
-        const isReady = hasValidPing(relays);
+        const isReady = relaysResolved(relays);
         set({ relays, relaysReady: isReady });
       }
     );