gui: split host:port on blur for manually-typed addresses

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

common/src/lib.rs

@@ -35,12 +35,11 @@ pub struct ServerEntry {
 #[cfg(feature = "networking")]
 pub async fn ping_server(address: &str, port: u16) -> color_eyre::Result<ServerStatus> {
     use color_eyre::eyre::{bail, eyre};
-    use std::net::ToSocketAddrs;
     use std::time::Duration;
-    use tokio::net::UdpSocket;
+    use tokio::net::{lookup_host, UdpSocket};
 
-    let dest = format!("{}:{}", address, port)
-        .to_socket_addrs()?
+    let dest = lookup_host(format!("{}:{}", address, port))
+        .await?
         .next()
         .ok_or_else(|| eyre!("could not resolve address"))?;
 

gui/src/main.rs

@@ -16,6 +16,15 @@ fn address_is_valid(addr: &str) -> bool {
     !addr.is_empty() && !addr.contains(':')
 }
 
+fn split_host_port(input: &str) -> (String, Option<String>) {
+    if let Some((host, port)) = input.rsplit_once(':') {
+        if !port.is_empty() && port.chars().all(|c| c.is_ascii_digit()) {
+            return (host.to_string(), Some(port.to_string()));
+        }
+    }
+    (input.to_string(), None)
+}
+
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub enum UserIcon {
     Normal,
@@ -816,6 +825,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
             .unwrap_or_default()
     });
     let mut password = use_signal(|| String::new());
+    let mut address_paste_pending = use_signal(|| false);
 
     let do_save = move |_| {
         let port_num: u16 = port.read().parse().unwrap_or(64738);
@@ -853,6 +863,10 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
                         oninput: move |evt| name.set(evt.value().clone()),
                         required: true,
                     }
+                    div {
+                        class: "modal-field__error",
+                        "Enter a name for this server."
+                    }
                 }
                 div {
                     class: "modal-field",
@@ -862,7 +876,26 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
                         placeholder: "mumble.example.com",
                         pattern: ADDRESS_PATTERN,
                         value: "{address.read()}",
-                        oninput: move |evt| address.set(evt.value().clone()),
+                        onpaste: move |_| address_paste_pending.set(true),
+                        oninput: move |evt| {
+                            if address_paste_pending() {
+                                address_paste_pending.set(false);
+                                let (host, maybe_port) = split_host_port(&evt.value());
+                                address.set(host);
+                                if let Some(p) = maybe_port {
+                                    port.set(p);
+                                }
+                            } else {
+                                address.set(evt.value());
+                            }
+                        },
+                        onblur: move |_| {
+                            let (host, maybe_port) = split_host_port(&address.read());
+                            if let Some(p) = maybe_port {
+                                address.set(host);
+                                port.set(p);
+                            }
+                        },
                         required: true,
                     }
                     div {
@@ -880,6 +913,10 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
                         oninput: move |evt| port.set(evt.value().clone()),
                         required: true,
                     }
+                    div {
+                        class: "modal-field__error",
+                        "Enter a port number."
+                    }
                 }
                 div {
                     class: "modal-field",
@@ -891,6 +928,10 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
                         oninput: move |evt| username.set(evt.value().clone()),
                         required: true,
                     }
+                    div {
+                        class: "modal-field__error",
+                        "Enter a username."
+                    }
                 }
                 div {
                     class: "modal-field",
@@ -933,6 +974,7 @@ fn EditServerModal(
     let mut port = use_signal(|| entry.port.to_string());
     let mut username = use_signal(|| entry.username.clone());
     let mut password = use_signal(|| entry.password.clone().unwrap_or_default());
+    let mut address_paste_pending = use_signal(|| false);
 
     let do_save = move |_| {
         let port_num: u16 = port.read().parse().unwrap_or(64738);
@@ -961,7 +1003,7 @@ fn EditServerModal(
                 class: "modal",
                 h2 { "Edit Server" }
                 div {
-                    class: "modal-field",
+                    class: "modal-field modal-field--strict",
                     label { "Name" }
                     input {
                         r#type: "text",
@@ -970,6 +1012,10 @@ fn EditServerModal(
                         oninput: move |evt| name.set(evt.value().clone()),
                         required: true,
                     }
+                    div {
+                        class: "modal-field__error",
+                        "Enter a name for this server."
+                    }
                 }
                 div {
                     class: "modal-field modal-field--strict",
@@ -979,7 +1025,26 @@ fn EditServerModal(
                         placeholder: "mumble.example.com",
                         pattern: ADDRESS_PATTERN,
                         value: "{address.read()}",
-                        oninput: move |evt| address.set(evt.value().clone()),
+                        onpaste: move |_| address_paste_pending.set(true),
+                        oninput: move |evt| {
+                            if address_paste_pending() {
+                                address_paste_pending.set(false);
+                                let (host, maybe_port) = split_host_port(&evt.value());
+                                address.set(host);
+                                if let Some(p) = maybe_port {
+                                    port.set(p);
+                                }
+                            } else {
+                                address.set(evt.value());
+                            }
+                        },
+                        onblur: move |_| {
+                            let (host, maybe_port) = split_host_port(&address.read());
+                            if let Some(p) = maybe_port {
+                                address.set(host);
+                                port.set(p);
+                            }
+                        },
                         required: true,
                     }
                     div {
@@ -988,7 +1053,7 @@ fn EditServerModal(
                     }
                 }
                 div {
-                    class: "modal-field",
+                    class: "modal-field modal-field--strict",
                     label { "Port" }
                     input {
                         r#type: "number",
@@ -997,9 +1062,13 @@ fn EditServerModal(
                         oninput: move |evt| port.set(evt.value().clone()),
                         required: true,
                     }
+                    div {
+                        class: "modal-field__error",
+                        "Enter a port number."
+                    }
                 }
                 div {
-                    class: "modal-field",
+                    class: "modal-field modal-field--strict",
                     label { "Username" }
                     input {
                         r#type: "text",
@@ -1008,6 +1077,10 @@ fn EditServerModal(
                         oninput: move |evt| username.set(evt.value().clone()),
                         required: true,
                     }
+                    div {
+                        class: "modal-field__error",
+                        "Enter a username."
+                    }
                 }
                 div {
                     class: "modal-field",