feat: bluetooth get auto setup settings

Author: filipton

Cargo.lock

@@ -24,7 +24,7 @@ local-ip-address = "0.6.3"
 mdns-sd = "0.13.1"
 reqwest = { version = "0.12.12", features = ["json", "rustls-tls"], default-features = false }
 serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.137"
+serde_json = "1.0.138"
 tokio = { version = "1.43.0", features = ["full"] }
 tower-http = { version = "0.6.2", features = ["trace"] }
 tracing = "0.1.41"

Cargo.toml

@@ -88,15 +88,13 @@ async fn setup_bt_device(device: btleplug::platform::Peripheral) -> Result<()> {
 
     // get wifi settings from API or env
     tracing::trace!("Getting wifi settings");
-    let (ssid, psk) = if let Ok((ssid, psk)) = crate::socket::api::get_wifi_settings().await {
-        (ssid, psk)
+    let auto_setup_settings = if let Ok(ass) = crate::socket::api::get_auto_setup_settings().await {
+        ass
     } else {
-        let ssid = std::env::var("WIFI_SSID")?;
-        let psk = std::env::var("WIFI_PSK")?;
-        (ssid, psk)
+        std::env::var("AUTOSETUP_SETTINGS")?
     };
 
-    let set_wifi_data = format!("{ssid}|{psk}");
+    let set_wifi_data = format!("{auto_setup_settings}\0");
     let set_wifi_data = set_wifi_data.as_bytes();
     tracing::trace!("Got wifi settings");
 

src/bluetooth.rs

@@ -1,6 +1,5 @@
-use std::{os::unix::fs::PermissionsExt, path::PathBuf};
-
 use anyhow::Result;
+use std::{os::unix::fs::PermissionsExt, path::PathBuf};
 
 mod bluetooth;
 mod github;

src/main.rs

@@ -170,19 +170,15 @@ pub async fn add_device(esp_id: u32, firmware_type: &str) -> Result<(), UnixErro
     res
 }
 
-pub async fn get_wifi_settings() -> Result<(String, String)> {
+pub async fn get_auto_setup_settings() -> Result<String> {
     let res = crate::UNIX_SOCKET
-        .send_tagged_request(UnixRequestData::WifiSettings)
+        .send_tagged_request(UnixRequestData::AutoSetupSettings)
         .await
         .map_err(|e| anyhow::anyhow!("Unix error: {e:?}"))?;
 
-    if let UnixResponseData::WifiSettingsResp {
-        wifi_ssid,
-        wifi_password,
-    } = res
-    {
-        return Ok((wifi_ssid, wifi_password));
+    if let UnixResponseData::AutoSetupSettingsResp(resp) = res {
+        return Ok(serde_json::to_string(&resp)?);
     }
 
-    Err(anyhow::anyhow!("Cant get wifi settings!"))
+    Err(anyhow::anyhow!("Cant get auto setup settings!"))
 }

src/socket/api.rs

@@ -16,7 +16,7 @@ pub enum UnixRequestData {
     PersonInfo {
         card_id: String,
     },
-    WifiSettings,
+    AutoSetupSettings,
     CreateAttendance {
         card_id: String,
         esp_id: u32,

unix-utils/src/request.rs

@@ -10,15 +10,26 @@ pub struct UnixResponse {
     pub data: Option<UnixResponseData>,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct AutoSetupSettings {
+    pub ssid: String,
+    pub psk: String,
+    pub data: AutoSetupData,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct AutoSetupData {
+    pub mdns: bool,
+
+    #[serde(rename = "wsUrl")]
+    pub ws_url: String,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(tag = "type", content = "data")]
 #[serde(rename_all_fields = "camelCase")]
 pub enum UnixResponseData {
-    WifiSettingsResp2(String),
-    WifiSettingsResp {
-        wifi_ssid: String,
-        wifi_password: String,
-    },
+    AutoSetupSettingsResp(AutoSetupSettings),
     ServerStatus(CompetitionStatusResp),
     PersonInfoResp {
         id: String,