chore: release v1.7.60-alpha

core/archipelago/src/mesh/meshtastic.rs

@@ -113,7 +113,12 @@ impl MeshtasticDevice {
             anyhow::bail!("No Meshtastic serial API response");
         }
 
-        let node_id = self.node_num.unwrap_or(0);
+        let node_id = self
+            .node_num
+            .ok_or_else(|| anyhow::anyhow!("Meshtastic serial API did not provide MyInfo"))?;
+        if self.user_id.is_none() && self.long_name.is_none() && self.short_name.is_none() {
+            anyhow::bail!("Meshtastic serial API did not provide node identity");
+        }
         let firmware_version = self
             .long_name
             .clone()
@@ -331,7 +336,7 @@ fn decode_serial_frame(buf: &mut Vec<u8>) -> Option<Vec<u8>> {
 }
 
 fn encode_want_config() -> Vec<u8> {
-    encode_to_radio_variant(TO_RADIO_WANT_CONFIG_ID, &encode_varint_field(1, 1))
+    encode_varint_field(TO_RADIO_WANT_CONFIG_ID, 1)
 }
 
 fn encode_heartbeat() -> Vec<u8> {

core/archipelago/src/mesh/serial.rs

@@ -8,6 +8,7 @@
 use super::protocol::{self, InboundFrame};
 use super::types::DeviceInfo;
 use anyhow::{Context, Result};
+use std::path::Path;
 use std::time::Duration;
 use tracing::{debug, info, warn};
 
@@ -400,12 +401,43 @@ const SERIAL_CANDIDATES: &[&str] = &[
     "/dev/ttyACM2",
 ];
 
+const SKIP_SERIAL_MODEL_SUBSTRINGS: &[&str] = &["Sierra_Wireless", "Z-Wave", "Zooz"];
+
+fn likely_non_mesh_serial_device(path: &str) -> bool {
+    let Some(name) = Path::new(path).file_name().and_then(|s| s.to_str()) else {
+        return false;
+    };
+    let by_id = Path::new("/dev/serial/by-id");
+    let Ok(entries) = std::fs::read_dir(by_id) else {
+        return false;
+    };
+    for entry in entries.flatten() {
+        let file_name = entry.file_name().to_string_lossy().to_string();
+        if !SKIP_SERIAL_MODEL_SUBSTRINGS
+            .iter()
+            .any(|needle| file_name.contains(needle))
+        {
+            continue;
+        }
+        if let Ok(target) = std::fs::read_link(entry.path()) {
+            if target.file_name().and_then(|s| s.to_str()) == Some(name) {
+                return true;
+            }
+        }
+    }
+    false
+}
+
 /// Scan for serial devices that could be Meshcore radios.
 /// Returns paths to existing serial device files.
 pub async fn detect_serial_devices() -> Vec<String> {
     let mut devices = Vec::new();
     for path in SERIAL_CANDIDATES {
         if tokio::fs::metadata(path).await.is_ok() {
+            if likely_non_mesh_serial_device(path) {
+                debug!(path = %path, "Skipping known non-mesh serial device");
+                continue;
+            }
             devices.push(path.to_string());
         }
     }