feat: better client name w/ hostname

This commit is contained in:
DecDuck
2025-04-04 10:14:23 +11:00
parent 137b71b3ba
commit 77251a6524
3 changed files with 47 additions and 13 deletions

54
src-tauri/Cargo.lock generated
View File

@ -243,7 +243,7 @@ dependencies = [
"futures-lite", "futures-lite",
"parking", "parking",
"polling", "polling",
"rustix", "rustix 0.38.42",
"slab", "slab",
"tracing", "tracing",
"windows-sys 0.59.0", "windows-sys 0.59.0",
@ -275,7 +275,7 @@ dependencies = [
"cfg-if", "cfg-if",
"event-listener 5.3.1", "event-listener 5.3.1",
"futures-lite", "futures-lite",
"rustix", "rustix 0.38.42",
"tracing", "tracing",
] ]
@ -302,7 +302,7 @@ dependencies = [
"cfg-if", "cfg-if",
"futures-core", "futures-core",
"futures-io", "futures-io",
"rustix", "rustix 0.38.42",
"signal-hook-registry", "signal-hook-registry",
"slab", "slab",
"windows-sys 0.59.0", "windows-sys 0.59.0",
@ -1291,6 +1291,7 @@ dependencies = [
"deranged", "deranged",
"directories", "directories",
"droplet-rs", "droplet-rs",
"gethostname 1.0.1",
"hex 0.4.3", "hex 0.4.3",
"http 1.2.0", "http 1.2.0",
"http-serde 2.1.1", "http-serde 2.1.1",
@ -1303,7 +1304,7 @@ dependencies = [
"reqwest-middleware 0.4.0", "reqwest-middleware 0.4.0",
"reqwest-middleware-cache", "reqwest-middleware-cache",
"rustbreak", "rustbreak",
"rustix", "rustix 0.38.42",
"serde", "serde",
"serde-binary", "serde-binary",
"serde_json", "serde_json",
@ -1827,7 +1828,17 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc3655aa6818d65bc620d6911f05aa7b6aeb596291e1e9f79e52df85583d1e30" checksum = "dc3655aa6818d65bc620d6911f05aa7b6aeb596291e1e9f79e52df85583d1e30"
dependencies = [ dependencies = [
"rustix", "rustix 0.38.42",
"windows-targets 0.52.6",
]
[[package]]
name = "gethostname"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed7131e57abbde63513e0e6636f76668a1ca9798dcae2df4e283cae9ee83859e"
dependencies = [
"rustix 1.0.5",
"windows-targets 0.52.6", "windows-targets 0.52.6",
] ]
@ -2768,6 +2779,12 @@ version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "linux-raw-sys"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
[[package]] [[package]]
name = "litemap" name = "litemap"
version = "0.7.4" version = "0.7.4"
@ -3818,7 +3835,7 @@ dependencies = [
"concurrent-queue", "concurrent-queue",
"hermit-abi", "hermit-abi",
"pin-project-lite", "pin-project-lite",
"rustix", "rustix 0.38.42",
"tracing", "tracing",
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
@ -4088,7 +4105,7 @@ checksum = "fbd3533fd4222b8337470456ea84d80436b4c91c53db51c372461d5f7e6eb0b4"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
"rustix", "rustix 0.38.42",
"windows 0.59.0", "windows 0.59.0",
] ]
@ -4347,7 +4364,20 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"errno", "errno",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys 0.4.14",
"windows-sys 0.59.0",
]
[[package]]
name = "rustix"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
dependencies = [
"bitflags 2.6.0",
"errno",
"libc",
"linux-raw-sys 0.9.3",
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
@ -5372,7 +5402,7 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dda2d571a9baf0664c1f2088db227e3072f9028602fafa885deade7547c3b738" checksum = "dda2d571a9baf0664c1f2088db227e3072f9028602fafa885deade7547c3b738"
dependencies = [ dependencies = [
"gethostname", "gethostname 0.5.0",
"log", "log",
"os_info", "os_info",
"serde", "serde",
@ -5522,7 +5552,7 @@ dependencies = [
"cfg-if", "cfg-if",
"fastrand", "fastrand",
"once_cell", "once_cell",
"rustix", "rustix 0.38.42",
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
@ -6204,7 +6234,7 @@ checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
dependencies = [ dependencies = [
"cc", "cc",
"downcast-rs", "downcast-rs",
"rustix", "rustix 0.38.42",
"scoped-tls", "scoped-tls",
"smallvec", "smallvec",
"wayland-sys", "wayland-sys",
@ -6217,7 +6247,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"rustix", "rustix 0.38.42",
"wayland-backend", "wayland-backend",
"wayland-scanner", "wayland-scanner",
] ]

View File

@ -57,6 +57,7 @@ reqwest-middleware = "0.4.0"
reqwest-middleware-cache = "0.1.1" reqwest-middleware-cache = "0.1.1"
deranged = "=0.4.0" deranged = "=0.4.0"
droplet-rs = "0.7.3" droplet-rs = "0.7.3"
gethostname = "1.0.1"
[dependencies.tauri] [dependencies.tauri]
version = "2.1.1" version = "2.1.1"

View File

@ -2,6 +2,7 @@ use std::{env, sync::Mutex};
use chrono::Utc; use chrono::Utc;
use droplet_rs::ssl::sign_nonce; use droplet_rs::ssl::sign_nonce;
use gethostname::gethostname;
use log::{debug, error, warn}; use log::{debug, error, warn};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::json; use serde_json::json;
@ -162,9 +163,11 @@ pub fn auth_initiate_logic() -> Result<(), RemoteAccessError> {
Url::parse(&db_lock.base_url.clone())? Url::parse(&db_lock.base_url.clone())?
}; };
let hostname = gethostname();
let endpoint = base_url.join("/api/v1/client/auth/initiate")?; let endpoint = base_url.join("/api/v1/client/auth/initiate")?;
let body = InitiateRequestBody { let body = InitiateRequestBody {
name: "Drop Desktop Client".to_string(), name: format!("{} (Desktop)", hostname.into_string().unwrap()),
platform: env::consts::OS.to_string(), platform: env::consts::OS.to_string(),
}; };