the fmt of cool

.github/copilot-instructions.md

@@ -1,5 +1,8 @@
-you can use block code as so:
+you should use block code to refence code, like so:
 ```rust
 hello_world!(println);
+    // indented lines
 ```
-in the chat.
+in the chat. Else it fucks up formatting.
+
+We work towards clean, maintainable design. im not the best at this thing.

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "rust-analyzer.cargo.target": "armv7-unknown-linux-musleabihf"
+  "rust-analyzer.cargo.target": "armv7-unknown-linux-musleabihf",
+  "rust-analyzer.diagnostics.disabled": ["unlinked-file"]
 }

Cargo.lock

@@ -610,6 +610,17 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
+[[package]]
+name = "lda-ipjs"
+version = "0.0.1"
+dependencies = [
+ "macaddr",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "strum",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.175"
@@ -1179,7 +1190,7 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "wakey"
-version = "0.1.3"
+version = "0.1.5"
 dependencies = [
  "axum",
  "axum-extra",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wakey"
-version = "0.1.3"
+version = "0.1.5"
 edition = "2024"
 publish = ["gitea"]
 
@@ -26,3 +26,6 @@ strip = true
 [features]
 default = ["very-smart-parsing"]
 very-smart-parsing = [] # this is the a-bit-redundant parse thing that copilot made
+
+[workspace]
+members = ["ipjs"]

ipjs/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "lda-ipjs"
+description = "ip -j show schemas"
+version = "0.0.1"
+edition = "2024"
+
+[dependencies]
+macaddr = { version = "1.0.1", features = ["serde", "serde_std"] }
+strum = { version = "0.27.2", features = ["derive", "strum_macros"] }
+serde_json = "1.0.143"
+serde_with = { version = "3.14.0", features = ["json"] }
+serde = { version = "1.0.219", features = ["derive"] }

ipjs/src/lib.rs

@@ -0,0 +1,19 @@
+//! low
+//!
+//! # lda-ipj
+//!
+//! this package will represent all my needs with the all the subcommands of ip -j.
+//!
+//! ## what i need
+//!
+//! ```console
+//! ip -j neigh
+//! ```
+//!
+//! i also need to see devices and idk MAYBE maybe not MAYBE UHHHHHH maybe broadcast
+//!
+
+pub mod neighbor;
+pub mod utils;
+
+// i want a generalized way to build and call

ipjs/src/neighbor/mod.rs

@@ -0,0 +1,70 @@
+//! ```
+//! ip -j n s
+//! ```
+//!
+//! yes. this is a real call.
+
+use crate::utils::serialize::mac::{des_opm, ser_opm};
+use std::net::IpAddr;
+
+use macaddr::MacAddr;
+use serde::{Deserialize, Serialize};
+use strum::{Display, EnumString};
+
+#[derive(Debug, PartialEq, Eq, Clone, Hash, Serialize, Deserialize)]
+pub struct NeighborInput {
+    /// supports only the last item (ignore), `to` keyword is optional
+    to: IpAddr,
+    /// supports only one item (it complains)
+    dev: String, // im all for simplicity
+    /// takes multiple, has to have `nud` before bro or it will think you `to`
+    nud: Vec<NUDState>,
+}
+
+// as input this must be lowercase. as output it is uppercase
+#[derive(Debug, PartialEq, Eq, EnumString, Display, Clone, Copy, Hash, Serialize, Deserialize)]
+#[strum(serialize_all = "lowercase", ascii_case_insensitive)]
+#[serde(rename_all = "UPPERCASE")]
+pub enum NUDState {
+    /// the neighbour entry is valid forever and can
+    /// be only be removed administratively.
+    Permanent,
+    /// the neighbour entry is valid. No attempts to
+    /// validate this entry will be made but it can
+    /// be removed when its lifetime expires.
+    Noarp,
+    /// the neighbour entry is valid until the
+    /// reachability timeout expires.
+    Reachable,
+    /// the neighbour entry is valid but suspicious.
+    /// This option to ip neigh does not change the
+    /// neighbour state if it was valid and the
+    /// address is not changed by this command.
+    Stale,
+    /// this is a pseudo state used when initially
+    /// creating a neighbour entry or after trying to
+    /// remove it before it becomes free to do so.
+    None,
+    /// the neighbour entry has not (yet) been
+    /// validated/resolved.
+    Incomplete,
+    /// neighbor entry validation is currently
+    /// delayed.
+    Delay,
+    /// neighbor is being probed.
+    Probe,
+    /// max number of probes exceeded without
+    /// success, neighbor validation has ultimately
+    /// failed.
+    Failed,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Hash, Serialize, Deserialize)]
+
+pub struct NeighborItem {
+    dst: IpAddr,
+    dev: String,
+    #[serde(deserialize_with = "des_opm", serialize_with = "ser_opm")]
+    lladdr: Option<MacAddr>,
+    state: Vec<NUDState>,
+}

ipjs/src/utils/mod.rs

@@ -0,0 +1 @@
+pub mod serialize;

ipjs/src/utils/serialize/mac.rs

@@ -0,0 +1,45 @@
+
+use macaddr::MacAddr;
+use serde::{self, Deserialize, Deserializer, de::Error as DeError};
+use serde::{Serialize, Serializer, de};
+
+pub fn serialize_macs<S>(macs: &[MacAddr], serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    let strings: Vec<String> = macs.iter().map(|m| m.to_string()).collect();
+    serde::Serialize::serialize(&strings, serializer)
+}
+
+/// Serialize a MacAddr as a string
+pub fn serialize_mac<S>(mac: &MacAddr, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    serializer.serialize_str(&mac.to_string())
+}
+
+/// Deserialize a MacAddr from a string
+pub fn deserialize_mac<'de, D>(deserializer: D) -> Result<MacAddr, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let s = <String as serde::Deserialize>::deserialize(deserializer)?;
+    s.parse::<MacAddr>().map_err(DeError::custom)
+}
+
+/// serialize an [`Option<MacAddr>`]
+pub fn ser_opm<S: Serializer>(bro: &Option<MacAddr>, ser: S) -> Result<S::Ok, S::Error> {
+    Option::<String>::serialize(&bro.as_ref().map(ToString::to_string), ser)
+}
+
+/// deserialize an [`Option<MacAddr>`]
+pub fn des_opm<'de, D>(des: D) -> Result<Option<MacAddr>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    Option::<&str>::deserialize(des)?
+        .map(str::parse)
+        .transpose()
+        .map_err(de::Error::custom)
+}

ipjs/src/utils/serialize/mod.rs

@@ -0,0 +1,2 @@
+pub mod mac;
+pub mod vec;

ipjs/src/utils/serialize/vec.rs

@@ -0,0 +1,37 @@
+use serde::Deserialize;
+use serde::de;
+
+#[derive(Deserialize)]
+#[serde(untagged)]
+enum OneOrMany<T> {
+    One(T),
+    Many(Vec<T>),
+}
+
+pub fn vec_from_strs<'de, D, T>(des: D) -> Result<Vec<T>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+    T: std::str::FromStr,
+    T::Err: std::fmt::Display,
+{
+    let raw: OneOrMany<String> = OneOrMany::<String>::deserialize(des)?;
+    let mut out = Vec::new();
+    match raw {
+        OneOrMany::One(s) => {
+            let t = s.trim();
+            if !t.is_empty() {
+                out.push(t.parse().map_err(de::Error::custom)?);
+            }
+        }
+        OneOrMany::Many(vs) => {
+            for s in vs {
+                let t = s.trim();
+                if t.is_empty() {
+                    continue;
+                }
+                out.push(t.parse().map_err(de::Error::custom)?);
+            }
+        }
+    }
+    Ok(out)
+}

plan.md

@@ -0,0 +1,60 @@
+# taking back my code AHHHH
+
+this is going to be lengthy. ci is spotless but idk how it works cuz powershell. this is good but i cant afford VPN on the router; we will need to do some bullshit.
+
+## overview
+
+we need a:
+
+- small ahh bin in the router.
+  - forwards a shell and some functions.
+  - may be shell calling fns maybe some unsafe c. i cant unsafe c.
+- big ahh bin in the vps.
+  - connect to the small ahh bin thru the wide ass internet.
+  - forwards some APIs.
+- static site
+  - now need no hosts; apis can be called anywhere anyway.
+  - do offer these in the big ahh bins tho lets not miss out some shit.
+- automation
+  - gitea
+    - on the vps or the uh idk.
+    - ABSOLUTELY can auto build main:latest every day / other day.
+    - and releases.
+  - router
+    - a script to pull the tar. from actions artifacts or from releases. (lua or shell yo)
+    - a script for the bin and the init.d scripts for these two.
+  - vps
+    - a systemd service (ima use ai for ts ngl)
+    - an auto updater. maybe we overkill and dnf. maybe go easy and git clone + cargo install. maybe we pull from release or nightly. idk
+
+i think idk
+
+## router
+
+### current
+
+everything.
+
+we have some functions that call ip neigh a bajillion times.
+we have some other functions that read the same file/folder in /sys or sum shit.
+we have a function that broadcast to a set ahh address.
+
+we have some routes; and some data structures acting as schema for them ahh. we dont do posts with json but gets with query strings for some ahh reasons.
+
+these are carryover from the early days.
+
+also from the early days are the js.
+
+static was 100% ai with 0 intervention.
+
+we have a search bar of sort that hooks through a smart endpoint that searches for everything.
+
+we have some bullshit. and two buttons to check and wake. that pings `/api/smart/{query}` and `/wake?name=query`. why.
+we have the result of the wake and or status and the errors in the first text box.
+
+the list of cliets with names connected to the router the second box.
+thats cool.
+
+### changes?
+
+idk changes.

random shit/Untitled.rs

@@ -0,0 +1,173 @@
+use macaddr::MacAddr6;
+use serde::Deserialize;
+use std::{net::IpAddr, process::Command};
+
+// Raw JSON shape from ip -j -4 address show
+#[derive(Debug, Deserialize)]
+struct IpJAddrInfo {
+    family: Option<String>,
+    local: Option<String>,
+    broadcast: Option<String>,
+    scope: Option<String>,
+    label: Option<String>,
+    prefixlen: Option<u8>,
+    // many more exist; we only take what we need
+}
+
+#[derive(Debug, Deserialize)]
+struct IpJAddrEntry {
+    ifname: String,
+    // interface MAC address (present on non-loopback):
+    address: Option<String>,
+    addr_info: Option<Vec<IpJAddrInfo>>,
+}
+
+#[derive(Debug, Clone)]
+pub struct AddrInfo {
+    pub local: IpAddr,
+    pub broadcast: Option<IpAddr>,
+    pub scope: Option<String>,
+    pub label: Option<String>,
+    pub prefixlen: Option<u8>,
+}
+
+#[derive(Debug, Clone)]
+pub struct IpAEntry {
+    pub ifname: String,
+    pub mac: Option<MacAddr6>,
+    pub addr_info: Vec<AddrInfo>,
+    // IPv4 only (inet)
+}
+
+// Run ip -j -4 address show and deserialize
+fn read_ip_json() -> Result<Vec<IpJAddrEntry>, Box<dyn std::error::Error>> {
+    let out = Command::new("ip")
+        .args(["-j", "-4", "address", "show"])
+        .output()?;
+    if !out.status.success() {
+        return Err(format!("ip exited with {}", out.status).into());
+    }
+    let entries: Vec<IpJAddrEntry> = serde_json::from_slice(&out.stdout)?;
+    Ok(entries)
+}
+
+fn parse_ip(s: &str) -> Option<IpAddr> {
+    s.parse::<IpAddr>().ok()
+}
+
+fn parse_mac(s: &str) -> Option<MacAddr6> {
+    // ip outputs lowercase aa:bb:..., which MacAddr6 can parse
+    s.parse::<MacAddr6>().ok()
+}
+
+// Public: read and convert to a cleaned model
+pub fn get_ip_addr_entries() -> Result<Vec<IpAEntry>, Box<dyn std::error::Error>> {
+    let raw = read_ip_json()?;
+    let mut out = Vec::new();
+    for e in raw {
+        let mac = e.address.as_deref().and_then(parse_mac);
+        let mut infos = Vec::new();
+
+        if let Some(list) = e.addr_info {
+            for ai in list {
+                // keep only IPv4
+                if ai.family.as_deref() != Some("inet") {
+                    continue;
+                }
+                if let Some(local) = ai.local.as_deref().and_then(parse_ip) {
+                    let broadcast = ai.broadcast.as_deref().and_then(parse_ip);
+                    infos.push(AddrInfo {
+                        local,
+                        broadcast,
+                        scope: ai.scope,
+                        label: ai.label,
+                        prefixlen: ai.prefixlen,
+                    });
+                }
+            }
+        }
+
+        out.push(IpAEntry {
+            ifname: e.ifname,
+            mac,
+            addr_info: infos,
+        });
+    }
+
+    Ok(out)
+}
+
+// Helper: first “good” (global) broadcast on an interface
+pub fn broadcast_for_ifname(ifname: &str) -> Result<Option<IpAddr>, Box<dyn std::error::Error>> {
+    let entries = get_ip_addr_entries()?;
+    let dev = entries.into_iter().find(|e| e.ifname == ifname);
+    if let Some(dev) = dev {
+        // Prefer scope=global with a broadcast; else any broadcast
+        if let Some(b) = dev
+            .addr_info
+            .iter()
+            .filter(|ai| ai.scope.as_deref() == Some("global"))
+            .filter_map(|ai| ai.broadcast)
+            .next()
+        {
+            return Ok(Some(b));
+        }
+        if let Some(b) = dev.addr_info.iter().filter_map(|ai| ai.broadcast).next() {
+            return Ok(Some(b));
+        }
+    }
+    Ok(None)
+}
+
+// Helper: broadcast for a given interface MAC
+pub fn broadcast_for_mac(
+    mac: MacAddr6,
+) -> Result<Option<(String, IpAddr)>, Box<dyn std::error::Error>> {
+    let entries = get_ip_addr_entries()?;
+    for e in entries {
+        if let Some(m) = e.mac {
+            if m == mac {
+                // prefer global broadcast
+                if let Some(b) = e
+                    .addr_info
+                    .iter()
+                    .filter(|ai| ai.scope.as_deref() == Some("global"))
+                    .filter_map(|ai| ai.broadcast)
+                    .next()
+                {
+                    return Ok(Some((e.ifname, b)));
+                }
+                if let Some(b) = e.addr_info.iter().filter_map(|ai| ai.broadcast).next() {
+                    return Ok(Some((e.ifname, b)));
+                }
+            }
+        }
+    }
+    Ok(None)
+}
+
+// Fallback: if nothing else, use limited broadcast (may be filtered on some networks)
+pub fn fallback_broadcast() -> IpAddr {
+    // 255.255.255.255
+    IpAddr::from([255, 255, 255, 255])
+}
+
+// Convenience: all broadcasts grouped by interface (IPv4)
+pub fn all_broadcasts() -> Result<Vec<(String, IpAddr)>, Box<dyn std::error::Error>> {
+    let Some(r) = Some(12) else {
+        e.addr_info
+            .iter()
+            .filter(|ai| ai.scope.as_deref() == Some("global"))
+            .filter_map(|ai| ai.broadcast)
+    };
+    let entries = get_ip_addr_entries()?;
+    let mut out = Vec::new();
+    for e in entries {
+        for ai in e.addr_info {
+            if let Some(b) = ai.broadcast {
+                out.push((e.ifname.clone(), b));
+            }
+        }
+    }
+    Ok(out)
+}

scripts/init/openwrt/update_tailscale

@@ -15,7 +15,7 @@ start() {
   RETRY_COUNT=0
 
   # shellcheck disable=SC2016
-  nohup sh -c '
+  sh -c '
 while [ "$RETRY_COUNT" -lt "$MAX_RETRIES" ]; do
   if fn; then
     echo "[update_tailscale] Success at $(date)" >>"$LOGFILE"

scripts/init/openwrt/update_wakey

@@ -2,12 +2,12 @@
 START=66
 
 start() {
-  LOGFILE=/var/log/update_wakey.log
-  MAX_RETRIES=10
-  RETRY_COUNT=0
+    LOGFILE=/var/log/update_wakey.log
+    MAX_RETRIES=10
+    RETRY_COUNT=0
 
-  # shellcheck disable=SC2016
-  nohup sh -c '
+    # shellcheck disable=SC2016
+    sh -c '
   while [ "$RETRY_COUNT" -lt "$MAX_RETRIES" ]; do
     if /etc/ldlda_help/update_wakey.sh; then
       echo "[update_wakey] Success at $(date)" >>"$LOGFILE"

src/dhcpparse.rs

@@ -2,7 +2,8 @@
 const MAC_NAME_CACHE: &str = "/tmp/wakey_mac_names.json";
 
 /// Load MAC->name cache from disk
-async fn load_mac_name_cache() -> io::Result<std::collections::BTreeMap<String, String>> {
+pub(crate) async fn load_mac_name_cache() -> io::Result<std::collections::BTreeMap<String, String>>
+{
     match tokio::fs::read_to_string(MAC_NAME_CACHE).await {
         Ok(s) => serde_json::from_str(&s).map_err(io::Error::other),
         Err(e) if e.kind() == ErrorKind::NotFound => Ok(Default::default()),

src/main.rs

@@ -1,7 +1,14 @@
-use axum::{
-    Router,
-    routing::{get, post},
-};
+//! braindead version v0.1.x
+//!
+//! # whats next
+//!
+//! for version 2 i hope to have:
+//!
+//! 1. idk reworked frontend;
+//! 2. incorporate ip -j;
+//! 3. small 1-5 second caching;
+
+use axum::{Router, routing::get};
 use tokio::net::TcpListener;
 mod arpparse;
 pub mod assets;
@@ -10,18 +17,15 @@ mod route;
 mod utils;
 use std::io;
 
-const MACHINE_NAME: &str = "lda.lan";
-
 #[cfg(target_os = "linux")]
 #[tokio::main]
 async fn entry() -> io::Result<()> {
-    use crate::route::{api_router, home_2, home_2_route, wake_handler};
+    use crate::route::{api_router, home_2, home_2_route};
 
     let app = Router::new()
         // .route("/home", get(home))
         .route("/", get(home_2))
         .merge(home_2_route())
-        .route("/wake", post(wake_handler))
         // .route("/status", get(get_status_2))
         .nest("/api", api_router());
 

src/route.rs

@@ -1,99 +0,0 @@
-pub mod api;
-pub mod devs;
-pub mod dhcp;
-pub mod status;
-pub mod wake;
-
-pub use crate::route::api::{DeviceQuery, api_router};
-use crate::{
-    assets::{self},
-    utils::{ping::_ping_ip, wake::wake},
-};
-
-use axum::{
-    Router,
-    http::{StatusCode, header},
-    response::{Html, IntoResponse},
-    routing::get,
-};
-use axum_extra::extract::Query;
-
-use crate::utils::route::serve_js;
-use crate::{MACHINE_NAME, utils::_status_build};
-
-pub async fn wake_handler(
-    Query(DeviceQuery { name, .. }): Query<DeviceQuery>,
-) -> axum::response::Result<impl IntoResponse> {
-    match wake(name.as_deref().unwrap_or(MACHINE_NAME)).await {
-        Ok(0) => Err((StatusCode::NOT_FOUND, "No packets sent!").into()),
-        Ok(x) => Ok((
-            StatusCode::ACCEPTED,
-            format!("{x} packet{s} sent!", s = if x > 1 { "s" } else { "" }),
-        )),
-        _ => Err((StatusCode::GATEWAY_TIMEOUT, "Wake failed").into()),
-    }
-}
-
-pub async fn _get_status_2(q: Query<DeviceQuery>) -> Html<String> {
-    let name = match q {
-        Query(DeviceQuery {
-            name: Some(name), ..
-        }) => name,
-        _ => MACHINE_NAME.to_string(),
-    };
-    Html(_status_build(&name).await)
-}
-
-pub async fn _home() -> Html<String> {
-    Html(format!(
-        r#"
-      <html>
-        <body>
-        <p><a href="/home_2">Alternate UI</a></p>
-        <p>the machine is {}! <a href="/status">Status</a></p>
-          <form method="POST" action="/wake">
-            <button type="submit">Wake LDA</button>
-          </form>
-        </body>
-      </html>
-    "#,
-        if _ping_ip((MACHINE_NAME, 22)).await {
-            "on"
-        } else {
-            "off"
-        } // match get_ips(MACHINE_NAME).await {
-          //     Ok(ips) => {
-          //         // let addrs: Vec<SocketAddr> = ips.into_iter().map(|ip|(ip, 22).into()).collect();
-          //     }
-          //     Err(_) => "off",
-          // }
-    ))
-}
-pub async fn home_2() -> Html<&'static str> {
-    Html(assets::HOME_2_HTML)
-}
-pub fn home_2_route() -> Router {
-    use assets::*;
-    Router::new()
-        .route("/home_2", get(|| async { Html(HOME_2_HTML) }))
-        .route("/home_2/", get(|| async { Html(HOME_2_HTML) }))
-        .route("/home_2.html", get(|| async { Html(HOME_2_HTML) }))
-        .route(
-            "/home_2/styles.css",
-            get(|| async {
-                (
-                    [
-                        (header::CONTENT_TYPE, "text/css; charset=utf-8"),
-                        (header::CACHE_CONTROL, "public, max-age=300"),
-                    ],
-                    home_2::STYLES_CSS,
-                )
-            }),
-        )
-        .route("/home_2/main.js", get(|| serve_js(home_2::MAIN_JS)))
-        .route("/home_2/leases.js", get(|| serve_js(home_2::LEASES_JS)))
-        .route("/home_2/status.js", get(|| serve_js(home_2::STATUS_JS)))
-        .route("/home_2/utils.js", get(|| serve_js(home_2::UTILS_JS)))
-        .route("/home_2/wake.js", get(|| serve_js(home_2::WAKE_JS)))
-        .route("/home_2/dom.js", get(|| serve_js(home_2::DOM_JS)))
-}

src/route/api.rs

@@ -1,32 +1,63 @@
+use crate::route::error::ApiError;
+use crate::utils::query_parser::{QueryType, parse_query};
 use axum::Json;
 use axum::http::StatusCode;
 use axum::response::IntoResponse;
-use axum::routing::post;
-use axum::{Router, extract::Path, response::Redirect, routing::get};
+use axum::{extract::Path, response::Redirect};
 
-use crate::utils::route;
+use crate::route::status::{DeviceQuery, Filters, NamePath};
+use crate::utils::query::get_ips;
 
 // Smart redirect: accept IP, MAC, dev, or NUD state and redirect to /api/status accordingly
 pub async fn status_smart_redirect(
     Path(q): Path<String>,
 ) -> axum::response::Result<Redirect, impl IntoResponse> {
-    match serde_html_form::to_string(route::status_smart_redirect(q).await) {
+    // no less bullshit
+    let query = match parse_query(q) {
+        QueryType::Ip(ip_addr) => DeviceQuery {
+            filter: Filters {
+                ips: vec![ip_addr],
+                ..Default::default()
+            },
+            ..Default::default()
+        },
+        QueryType::Mac(mac_addr) => DeviceQuery {
+            filter: Filters {
+                macs: vec![mac_addr],
+                ..Default::default()
+            },
+            ..Default::default()
+        },
+        QueryType::Dev(s) => DeviceQuery {
+            filter: Filters {
+                devs: vec![s],
+                ..Default::default()
+            },
+            ..Default::default()
+        },
+        QueryType::Nud(nudstate) => DeviceQuery {
+            filter: Filters {
+                nuds: vec![nudstate],
+                ..Default::default()
+            },
+            ..Default::default()
+        },
+        QueryType::Unknown(n) => DeviceQuery {
+            name: Some(n),
+            ..Default::default()
+        },
+    };
+    match serde_html_form::to_string(query) {
         Ok(e) => Ok(Redirect::to(&format!("/api/status?{e}"))),
         Err(e) => Err((
             StatusCode::BAD_GATEWAY,
-            Json(StatusError {
+            Json(ApiError {
                 error: e.to_string(),
-                ..Default::default()
             }),
         )),
     }
 }
 
-pub use crate::route::devs::*;
-pub use crate::route::dhcp::*;
-pub use crate::route::status::*;
-pub use crate::route::wake::*;
-
 pub async fn status_redirect(Path(NamePath { name }): Path<NamePath>) -> Redirect {
     Redirect::permanent(&format!(
         "/api/status?name={name}",
@@ -34,12 +65,14 @@ pub async fn status_redirect(Path(NamePath { name }): Path<NamePath>) -> Redirec
     ))
 }
 
-pub fn api_router() -> Router {
-    Router::new()
-        .route("/status/{name}", get(status_redirect))
-        .route("/status", get(get_status_json))
-        .route("/dhcp_leases", get(get_dhcp_leases))
-        .route("/smart/{q}", get(status_smart_redirect))
-        .route("/devs", get(devs_router))
-        .route("/wake", post(wake_multi))
+pub async fn ip(Path(name): Path<String>) -> impl IntoResponse {
+    get_ips(&name).await.map_or_else(
+        |e| {
+            ApiError {
+                error: e.to_string(),
+            }
+            .into_response()
+        },
+        |ips| Json(ips.collect::<Vec<_>>()).into_response(),
+    )
 }

src/route/dhcp.rs

@@ -1,4 +1,8 @@
-use crate::{dhcpparse, route::api::StatusError, utils::parse::boolish_str};
+use crate::{
+    dhcpparse::read_dhcp_leases_with_names,
+    route::error::ApiError,
+    utils::{parse::boolish_str, query::enrich_leases_with_nud_state},
+};
 use axum::{Json, extract::Query, http::StatusCode, response::IntoResponse};
 
 // DHCP lease endpoints
@@ -14,19 +18,18 @@ pub async fn get_dhcp_leases(Query(raw): Query<DhcpLeasesQueryRaw>) -> impl Into
         .map(boolish_str)
         .unwrap_or(false);
 
-    match dhcpparse::read_dhcp_leases_with_names().await {
+    match read_dhcp_leases_with_names().await {
         Ok(leases_with_names) => {
             if !include_state {
                 return (StatusCode::OK, Json(leases_with_names)).into_response();
             }
-            let out = crate::utils::query::enrich_leases_with_nud_state(leases_with_names).await;
+            let out = enrich_leases_with_nud_state(leases_with_names).await;
             (StatusCode::OK, Json(out)).into_response()
         }
         Err(e) => (
             StatusCode::BAD_GATEWAY,
-            Json(StatusError {
+            Json(ApiError {
                 error: e.to_string(),
-                ..Default::default()
             }),
         )
             .into_response(),

src/route/error.rs

@@ -0,0 +1,17 @@
+use axum::{
+    Json,
+    http::StatusCode,
+    response::{IntoResponse, Response},
+};
+use serde::Serialize;
+
+#[derive(Debug, Serialize)]
+pub struct ApiError {
+    pub error: String,
+}
+
+impl IntoResponse for ApiError {
+    fn into_response(self) -> Response {
+        (StatusCode::INTERNAL_SERVER_ERROR, Json(self)).into_response()
+    }
+}

src/route/mod.rs

@@ -0,0 +1,60 @@
+pub mod api;
+pub mod devs;
+pub mod dhcp;
+pub mod error;
+pub mod status;
+pub mod wake;
+
+use crate::assets;
+use crate::route::api::ip;
+use crate::route::api::status_redirect;
+use crate::route::api::status_smart_redirect;
+use crate::route::devs::devs_router;
+use crate::route::dhcp::get_dhcp_leases;
+use crate::route::status::get_status_json;
+use crate::route::wake::wake_multi;
+
+use axum::routing::post;
+use axum::{Router, http::header, response::Html, routing::get};
+
+use crate::utils::route::serve_js;
+
+pub async fn home_2() -> Html<&'static str> {
+    Html(assets::HOME_2_HTML)
+}
+pub fn home_2_route() -> Router {
+    use assets::*;
+    Router::new()
+        .route("/home_2", get(|| async { Html(HOME_2_HTML) }))
+        .route("/home_2/", get(|| async { Html(HOME_2_HTML) }))
+        .route("/home_2.html", get(|| async { Html(HOME_2_HTML) }))
+        .route(
+            "/home_2/styles.css",
+            get(|| async {
+                (
+                    [
+                        (header::CONTENT_TYPE, "text/css; charset=utf-8"),
+                        (header::CACHE_CONTROL, "public, max-age=300"),
+                    ],
+                    home_2::STYLES_CSS,
+                )
+            }),
+        )
+        .route("/home_2/main.js", get(|| serve_js(home_2::MAIN_JS)))
+        .route("/home_2/leases.js", get(|| serve_js(home_2::LEASES_JS)))
+        .route("/home_2/status.js", get(|| serve_js(home_2::STATUS_JS)))
+        .route("/home_2/utils.js", get(|| serve_js(home_2::UTILS_JS)))
+        .route("/home_2/wake.js", get(|| serve_js(home_2::WAKE_JS)))
+        .route("/home_2/dom.js", get(|| serve_js(home_2::DOM_JS)))
+}
+
+pub fn api_router() -> Router {
+    Router::new()
+        .route("/status/{name}", get(status_redirect))
+        .route("/status", get(get_status_json))
+        .route("/dhcp_leases", get(get_dhcp_leases))
+        .route("/smart/{q}", get(status_smart_redirect))
+        .route("/devs", get(devs_router))
+        .route("/wake", post(wake_multi))
+        .route("/ips/{name}", get(ip))
+}

src/route/status.rs

@@ -1,30 +1,21 @@
-use crate::{
-    arpparse::NUDState,
-    utils::parse::{de_many, serialize_macs},
-};
+use crate::route::error::ApiError;
 use axum::{Json, http::StatusCode, response::IntoResponse};
 use axum_extra::extract::Query;
 use macaddr::MacAddr;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
-use std::collections::HashSet;
 use std::net::IpAddr;
 
+use crate::arpparse::NUDState;
+use crate::utils::parse::de_many;
+use crate::utils::parse::serialize_macs;
+use crate::utils::query::get_macs;
+
 #[derive(Debug, Default, Clone, Hash, Deserialize, Serialize)]
 pub struct DeviceQuery {
     pub name: Option<String>,
-    #[serde(default, deserialize_with = "de_many::vec_from_strs")]
-    pub ip: Vec<IpAddr>,
-    #[serde(
-        default,
-        deserialize_with = "de_many::vec_from_strs",
-        serialize_with = "serialize_macs"
-    )]
-    pub mac: Vec<MacAddr>,
-    #[serde(default, deserialize_with = "de_many::vec_from_strs")]
-    pub dev: Vec<String>,
-    #[serde(default, deserialize_with = "de_many::vec_from_strs")]
-    pub nud: Vec<NUDState>,
+    #[serde(flatten)]
+    pub filter: Filters,
 }
 
 #[derive(Debug, Default, Clone, Hash, Deserialize)]
@@ -40,21 +31,23 @@ pub struct Status<T> {
     pub filters: Filters,
 }
 
-#[derive(Debug, Default, Serialize)]
+#[derive(Debug, Default, Clone, Hash, Serialize, Deserialize)]
 pub struct Filters {
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub ip: Vec<IpAddr>,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub dev: Vec<String>,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub nud: Vec<NUDState>,
+    #[serde(default, deserialize_with = "de_many::vec_from_strs")]
+    pub ips: Vec<IpAddr>,
+    #[serde(default, deserialize_with = "de_many::vec_from_strs")]
+    pub devs: Vec<String>,
+    #[serde(default, deserialize_with = "de_many::vec_from_strs")]
+    pub nuds: Vec<NUDState>,
     #[serde(
-        skip_serializing_if = "Vec::is_empty",
+        default,
+        deserialize_with = "de_many::vec_from_strs",
         serialize_with = "serialize_macs"
     )]
-    pub mac: Vec<MacAddr>,
+    pub macs: Vec<MacAddr>,
 }
 
+#[deprecated = "use ApiError"]
 #[skip_serializing_none]
 #[derive(Debug, Serialize, Default)]
 pub struct StatusError {
@@ -65,54 +58,32 @@ pub struct StatusError {
 pub async fn get_status_json(
     Query(DeviceQuery {
         name,
-        ip,
-        dev,
-        nud,
-        mac,
+        filter:
+            Filters {
+                ips,
+                devs,
+                nuds,
+                macs,
+            },
         ..
     }): Query<DeviceQuery>,
 ) -> impl IntoResponse {
-    fn to_opts<T: Clone>(slice: &[T]) -> Vec<Option<T>> {
-        if slice.is_empty() {
-            vec![None]
-        } else {
-            slice.iter().cloned().map(Some).collect()
-        }
-    }
-    let ips_opt = if ip.is_empty() {
-        None
-    } else {
-        Some(ip.clone())
-    };
-    let dev_opts: Vec<Option<String>> = to_opts(&dev);
-    let nud_opts: Vec<Option<NUDState>> = to_opts(&nud);
-    let filters = Filters {
-        ip,
-        dev,
-        nud,
-        mac: mac.clone(),
-    };
-    let mut tasks = Vec::new();
-    for d in &dev_opts {
-        for n in &nud_opts {
-            tasks.push(crate::utils::query::get_macs(
-                name.as_deref(),
-                ips_opt.as_deref(),
-                d.as_deref(),
-                *n,
-            ));
-        }
-    }
-    // why try join all?
-    match futures::future::try_join_all(tasks)
-        .await
-        .map(|v| v.into_iter().flatten().collect::<Vec<_>>())
+    match get_macs(
+        &name.iter().collect::<Vec<_>>(),
+        &ips,
+        &devs.iter().collect::<Vec<_>>(),
+        &nuds,
+        &macs,
+    )
+    .await
     {
-        Ok(mut table) => {
-            if !mac.is_empty() {
-                let wanted: HashSet<MacAddr> = mac.into_iter().collect();
-                table.retain(|row| row.mac.map(|m| wanted.contains(&m)).unwrap_or(false));
-            }
+        Ok(table) => {
+            let filters = Filters {
+                ips,
+                devs,
+                nuds,
+                macs,
+            };
             (
                 StatusCode::OK,
                 Json(Status {
@@ -125,8 +96,7 @@ pub async fn get_status_json(
         }
         Err(error) => (
             StatusCode::BAD_GATEWAY,
-            Json(StatusError {
-                name,
+            Json(ApiError {
                 error: error.to_string(),
             }),
         )

src/route/wake.rs

@@ -23,9 +23,8 @@ pub struct WakeResult {
 #[skip_serializing_none]
 #[derive(Debug, Serialize, Clone, Copy)]
 pub struct WakeTargetResult {
-    pub ip: Option<IpAddr>,
-    #[serde(serialize_with = "ser_opm")]
-    pub mac: Option<MacAddr>,
+    #[serde(flatten)]
+    pub target: WakeTarget,
     pub status: WakeTargetStatus,
 }
 
@@ -41,11 +40,11 @@ pub enum WakeTargetStatus {
 }
 
 #[skip_serializing_none]
-#[derive(Debug, Deserialize, Clone, Copy)]
+#[derive(Debug, Serialize, Deserialize, Clone, Copy)]
 pub struct WakeTarget {
     #[serde(default)]
     pub ip: Option<IpAddr>,
-    #[serde(default, deserialize_with = "des_opm")]
+    #[serde(default, serialize_with = "ser_opm", deserialize_with = "des_opm")]
     pub mac: Option<MacAddr>,
 }
 
@@ -82,21 +81,15 @@ pub async fn wake_multi_split(
         .await?;
     sock.set_broadcast(true)?;
 
-    Ok(
-        futures::future::join_all(targets.into_iter().map(async |c| {
-            if c.is_incomplete() {
-                c.to_incomplete()
-            } else {
-                wake_one(
-                    &sock,
-                    c.try_into().expect("complete struct failed to try_into"),
-                )
-                .await
-                .into()
-            }
-        }))
-        .await,
-    )
+    let iter = targets.into_iter().map(async |c| {
+        if c.is_incomplete() {
+            c.to_incomplete()
+        } else {
+            let t = c.try_into().expect("complete struct failed to try_into");
+            wake_one(&sock, t).await.into()
+        }
+    });
+    Ok(futures::future::join_all(iter).await)
 }
 /* #[derive(Debug, Serialize)]
 pub struct WakeStatusLine {

src/utils.rs

@@ -1,64 +0,0 @@
-// pub const LDA_MACS: [[u8; 6]; 2] = [
-//     // ether
-//     [0x04, 0x7c, 0x16, 0x79, 0x6d, 0xee],
-//     // wifi
-//     [0xbc, 0x09, 0x1b, 0xec, 0x65, 0xd0],
-// ];
-
-/// is it time to lookup host lda.lan for this...
-// pub static LDA_MACS_2: LazyLock<[MacAddr; 2]> = LazyLock::new(|| LDA_MACS.map(MacAddr::from));
-pub mod wake;
-
-use crate::utils::query::_get_macs_2_1;
-
-pub mod cmd;
-pub mod error;
-/// generic so you can do "123.45.67.89:22" or "lda.lan:22" as an input
-// this is so bad
-pub mod ping;
-pub mod query;
-pub mod route;
-
-// no custom ip deserializer needed when using axum_extra::extract::Query
-// but we add a generic one to ignore blanks and accept OneOrMany
-pub(crate) mod parse;
-
-pub async fn _status_build(machine_name: &str) -> String {
-    let formatted_macs = match _get_macs_2_1(machine_name).await {
-        Ok(table) => {
-            let the: String = table
-                .iter()
-                .map(|(ip, mac, state)| {
-                    let mac_str = // if let Some(mac) = mac {
-                        mac.to_string()
-                    // } else {
-                    //     "None".into()
-                    // }
-                    ;
-                    format!(
-                        "<tr><td>{ip}</td><td>{mac_str}</td><td>{state}</td></tr>",
-                        state = state._dumber_state()
-                    )
-                })
-                .collect();
-            format!(
-                r#"<p>info of {machine_name}:</p>
-<table>
-<tr><th>IP</th><th>MAC</th><th>State</th></tr>
-{the}
-</table>"#
-            )
-        }
-        Err(e) => format!("<p>errors getting table for {machine_name}: {e}</p>"),
-    };
-
-    format!(
-        r#"
-<html>
-<body>
-{formatted_macs}
-</body>
-</html>     
-"#,
-    )
-}

src/utils/mod.rs

@@ -0,0 +1,23 @@
+// pub const LDA_MACS: [[u8; 6]; 2] = [
+//     // ether
+//     [0x04, 0x7c, 0x16, 0x79, 0x6d, 0xee],
+//     // wifi
+//     [0xbc, 0x09, 0x1b, 0xec, 0x65, 0xd0],
+// ];
+
+/// is it time to lookup host lda.lan for this...
+// pub static LDA_MACS_2: LazyLock<[MacAddr; 2]> = LazyLock::new(|| LDA_MACS.map(MacAddr::from));
+pub mod wake;
+
+pub mod cmd;
+pub mod error;
+/// generic so you can do "123.45.67.89:22" or "lda.lan:22" as an input
+// this is so bad
+pub mod ping;
+pub mod query;
+pub mod query_parser;
+pub mod route;
+
+// no custom ip deserializer needed when using axum_extra::extract::Query
+// but we add a generic one to ignore blanks and accept OneOrMany
+pub(crate) mod parse;

src/utils/ping.rs

@@ -7,7 +7,7 @@ use tokio::{
     time::timeout,
 };
 
-use crate::{arpparse::NUDState, utils::query::get_macs};
+use crate::{arpparse::NUDState, utils::query::get_mac};
 
 pub async fn _ping_ip<T: ToSocketAddrs>(addr: T) -> bool {
     timeout(Duration::from_secs(1), TcpStream::connect(addr))
@@ -19,7 +19,7 @@ pub async fn _ping_ip_2<T: ToSocketAddrs>(_addr: T) -> bool {
 }
 
 pub async fn _ping_ip_3<T: Into<IpAddr>>(addr: T) -> u8 {
-    match get_macs(None, Some(&[addr.into()]), None, None).await {
+    match get_mac(Some(addr.into()), None, &[] as &[NUDState]).await {
         Err(_) => 0,
         Ok(l) => l
             .into_iter()

src/utils/query/dev.rs

@@ -1,10 +1,20 @@
-use std::collections::HashSet;
+use std::{collections::HashSet, fs};
 
 pub fn get_dev() -> HashSet<String> {
     let mut devs: HashSet<String> = HashSet::new();
     if let Ok(rd) = std::fs::read_dir("/sys/class/net") {
         for e in rd.flatten() {
-            if let Ok(name) = e.file_name().into_string()
+            if e.file_type()
+                .map(|ft| {
+                    if ft.is_symlink() {
+                        // true
+                        fs::metadata(e.path()).map(|m| m.is_dir()).unwrap_or(false)
+                    } else {
+                        ft.is_dir()
+                    }
+                })
+                .unwrap_or(false)
+                && let Ok(name) = e.file_name().into_string()
                 && name != "lo"
                 && !name.is_empty()
             {

src/utils/query/leases.rs

@@ -1,5 +1,6 @@
 use crate::arpparse::NUDState;
 use crate::dhcpparse::DhcpLeaseLine;
+use crate::utils::query::get_macs;
 use serde_with::skip_serializing_none;
 use std::net::IpAddr;
 
@@ -14,11 +15,10 @@ pub struct DhcpLeaseOut {
 
 /// Enrich DHCP leases with NUD state and rank using get_macs
 pub async fn enrich_leases_with_nud_state(leases: Vec<DhcpLeaseLine>) -> Vec<DhcpLeaseOut> {
-    use crate::utils::query::macs::get_macs;
     let ips: Vec<IpAddr> = leases.iter().map(|l| l.ip).collect();
     let mut map: std::collections::HashMap<IpAddr, (NUDState, u8)> =
         std::collections::HashMap::new();
-    if let Ok(rows) = get_macs(None, Some(&ips), None, None).await {
+    if let Ok(rows) = get_macs(&[] as &[&str], &ips, &[] as &[&str], &[], &[]).await {
         for row in rows {
             let state = row.state;
             let r = state.rank();

src/utils/query/macs.rs

@@ -1,13 +1,14 @@
+use macaddr::MacAddr;
+
 use crate::arpparse::{self, IpNeighLine, NUDState};
 use crate::utils::{
     cmd::exec_command,
-    error::{self, Error, Result},
+    error::{self, Result},
 };
-use macaddr::MacAddr;
 use std::collections::HashSet;
 use std::net::IpAddr;
 
-pub async fn get_ips(machine_name: &str) -> error::Result<impl Iterator<Item = IpAddr>> {
+pub async fn get_ips(machine_name: &str) -> Result<impl Iterator<Item = IpAddr>> {
     Ok(tokio::net::lookup_host((machine_name, 0))
         .await
         .map_err(|e| error::Error::DnsResolve {
@@ -17,92 +18,102 @@ pub async fn get_ips(machine_name: &str) -> error::Result<impl Iterator<Item = I
         .map(|c| c.ip()))
 }
 
-pub async fn _get_macs_2_1(machine_name: &str) -> Result<HashSet<(IpAddr, MacAddr, NUDState)>> {
-    Ok(get_macs_1(machine_name)
-        .await?
-        .into_iter()
-        .filter_map(
-            |IpNeighLine {
-                 ip,
-                 dev: _,
-                 mac,
-                 state,
-             }| mac.map(|mac| (ip, mac, state)),
-        )
-        .collect())
-}
-
-pub async fn get_macs_2_mac(machine_name: &str) -> Result<HashSet<MacAddr>> {
-    Ok(get_macs_1(machine_name)
-        .await?
-        .into_iter()
-        .filter_map(
-            |IpNeighLine {
-                 ip: _,
-                 dev: _,
-                 mac,
-                 state: _,
-             }| mac,
-        )
-        .collect())
-}
-
-pub async fn get_macs_1(machine_name: &str) -> Result<Vec<arpparse::IpNeighLine>> {
-    let dev = "br-lan";
-    let ips = get_ips(machine_name).await?;
-    let futures = ips.map(|ip| {
-        let ip = ip.to_canonical();
-        async move {
-            let cmd = "ip";
-            let args = ["neigh", "show", "to", &ip.to_string(), "dev", dev];
-            let o = exec_command(cmd, args).await?;
-            if !o.status.success() {
-                return Err(Error::CommandFailed {
-                    cmd,
-                    args: args.iter().map(ToString::to_string).collect(),
-                    status: o.status.code(),
-                    stderr: String::from_utf8_lossy(&o.stderr).into(),
-                });
-            };
-            Ok(String::from_utf8_lossy(&o.stdout)
-                .lines()
-                .flat_map(arpparse::parse_ip_neigh_line)
-                .collect::<Vec<_>>())
-        }
-    });
-    let res = futures::future::try_join_all(futures).await?;
-    Ok(res.into_iter().flatten().collect())
-}
-
+// #[deprecated(
+//     since = "0.1.5",
+//     note = "just call once everything with get mac
+//     and then filter it bro WHY DO YOU EVEN DO TS"
+// )]
+// good now
+//
+// Current logic: When filtering by exactly 1 dev/mac, exclude entries missing that field.
+// This is because missing dev/mac usually means the entry is incomplete/transient.
+//
+// when there is only one MACs (getmac got some), the result will not have them fields.
+// so there are three cases:
+//
+// 1. dont got nothing: take all of them (macset.is_empty())
+// 2. exactly one: pre-filtered by ip, everything matches,
+// devset.len() != 1 returns false, but then it works????
+// OH THIS fuckass code i added it in the get_mac
+// 3. devset.len() > 1. if none then absolutely not match,
+// if some then check with the set; thats normal
 pub async fn get_macs(
-    machine_name: Option<&str>,
-    ips: Option<&[IpAddr]>,
-    dev: Option<&str>,
-    state: Option<NUDState>,
+    machine_names: &[impl AsRef<str>],
+    ips: &[IpAddr],
+    devs: &[impl AsRef<str>],
+    state: &[NUDState],
+    macs: &[MacAddr],
 ) -> Result<Vec<IpNeighLine>> {
-    let ip_list: Option<Vec<IpAddr>> =
-        ips.map(|slice| slice.iter().copied().map(|ip| ip.to_canonical()).collect());
-    let ip_list = match (ip_list, machine_name) {
-        (Some(list), _) => list,
-        (None, Some(name)) => get_ips(name).await?.collect(),
-        (None, None) => Vec::new(),
-    };
-    let run_one = |to_ip: Option<IpAddr>| get_mac(to_ip, dev, state);
-    if !ip_list.is_empty() {
-        let futures = ip_list.into_iter().map(|ip| run_one(Some(ip)));
-        let res = futures::future::try_join_all(futures).await?;
-        Ok(res.into_iter().flatten().collect())
+    let mut ip_set: HashSet<IpAddr> = ips.iter().map(|ip| ip.to_canonical()).collect();
+    let ip_m: HashSet<IpAddr> = futures::future::try_join_all(
+        machine_names
+            .iter()
+            .map(|c| async { get_ips(c.as_ref()).await }),
+    )
+    .await?
+    .into_iter()
+    .flatten()
+    .collect();
+    let ip_all = if ip_set.is_empty() && ip_m.is_empty() {
+        None
+    } else if ip_set.is_empty() {
+        Some(ip_m)
+    } else if ip_m.is_empty() {
+        Some(ip_set)
     } else {
-        run_one(None).await
-    }
+        Some({
+            ip_set.retain(|c| ip_m.contains(c)); // inline AHHH
+            ip_set
+        })
+    };
+
+    let opt_dev = if devs.len() > 1 {
+        None
+    } else {
+        devs.iter().next().map(AsRef::as_ref)
+    };
+
+    let run_one = |to_ip: Option<IpAddr>| get_mac(to_ip, opt_dev, state);
+
+    let mut ip_filtered = if let Some(something) = ip_all {
+        if something.len() == 1 {
+            run_one(something.into_iter().next()).await?
+        } else {
+            run_one(None)
+                .await?
+                .into_iter()
+                .filter(|c| something.contains(&c.ip))
+                .collect()
+        }
+    } else {
+        run_one(None).await?
+    };
+
+    // Apply additional filters if any were provided
+    if !devs.is_empty() || !macs.is_empty() || !state.is_empty() {
+        let devset: HashSet<_> = devs.iter().map(AsRef::as_ref).collect();
+        let macset: HashSet<_> = macs.iter().collect();
+
+        ip_filtered.retain(|entry| {
+            // Dev filter: if we're filtering by dev, entry must have a dev AND it must be in the set
+            let dev_ok =
+                devset.is_empty() || entry.dev.as_deref().is_some_and(|d| devset.contains(d));
+
+            // MAC filter: if we're filtering by MAC, entry must have a MAC AND it must be in the set
+            let mac_ok = macset.is_empty() || entry.mac.is_some_and(|m| macset.contains(&m));
+
+            dev_ok && mac_ok
+        })
+    };
+    Ok(ip_filtered)
 }
 
 /// the atomic get_macs. handle ONE thing only.
 pub async fn get_mac(
     ip: Option<IpAddr>,
     dev: Option<&str>,
-    state: Option<NUDState>,
-) -> error::Result<Vec<IpNeighLine>> {
+    state: &[NUDState],
+) -> Result<Vec<IpNeighLine>> {
     let mut args: Vec<String> = vec!["neigh".into(), "show".into()];
     if let Some(ip) = ip {
         args.push("to".into());
@@ -112,7 +123,7 @@ pub async fn get_mac(
         args.push("dev".into());
         args.push(d.to_string());
     }
-    if let Some(nud) = state {
+    for nud in state {
         args.push("nud".into());
         args.push(nud.as_ip_neigh_arg().into());
     }
@@ -136,7 +147,9 @@ pub async fn get_mac(
     Ok(rows)
 }
 
-/* pub async fn _get_macs_good(
+/*
+/// get macs where you just run ip neigh then rust handles the filtering (faster than get mac)
+pub async fn get_macs_rust(
     machine_names: Option<&str>,
     ips: Option<&[IpAddr]>,
     devs: Option<&[&str]>,

src/utils/query_parser.rs

@@ -0,0 +1,44 @@
+use std::net::IpAddr;
+
+use macaddr::MacAddr;
+
+use crate::{arpparse::NUDState, utils::query::dev::has_dev};
+
+pub enum QueryType {
+    Ip(IpAddr),
+    Mac(MacAddr),
+    Dev(String),
+    Nud(NUDState),
+    Unknown(String),
+}
+
+pub fn parse_query(q: String) -> QueryType {
+    let s = if cfg!(feature = "very-smart-parsing") {
+        crate::utils::parse::extract_host(&q)
+    } else {
+        q.trim()
+    };
+    // 1) IP
+    let ip = if cfg!(feature = "very-smart-parsing") {
+        crate::utils::parse::parse_numeric_ipv4(s).or_else(|| s.parse::<IpAddr>().ok())
+    } else {
+        s.parse::<IpAddr>().ok()
+    };
+    if let Some(ip) = ip {
+        return QueryType::Ip(ip);
+    }
+    // 2) MAC
+    if let Ok(mac) = s.parse::<MacAddr>() {
+        return QueryType::Mac(mac);
+    }
+    // 3) NUD state (reachable, stale, ...)
+    if let Ok(state) = s.parse::<NUDState>() {
+        return QueryType::Nud(state);
+    }
+    // 4) Known device? prefer dev first
+    if has_dev(s) {
+        return QueryType::Dev(s.to_string());
+    }
+    // Default: name last // it will fail also
+    QueryType::Unknown(s.to_string())
+}

src/utils/route.rs

@@ -1,9 +1,4 @@
-use std::net::IpAddr;
-
 use axum::{http::header, response::IntoResponse};
-use macaddr::MacAddr;
-
-use crate::{arpparse::NUDState, route::DeviceQuery, utils::query::dev::has_dev};
 
 pub async fn serve_js(content: &'static str) -> impl IntoResponse {
     (
@@ -14,59 +9,3 @@ pub async fn serve_js(content: &'static str) -> impl IntoResponse {
         content,
     )
 }
-
-pub async fn status_smart_redirect(q: String) -> DeviceQuery {
-    let s = if cfg!(feature = "very-smart-parsing") {
-        crate::utils::parse::extract_host(&q)
-    } else {
-        q.trim()
-    };
-    // 1) IP
-    let ip = if cfg!(feature = "very-smart-parsing") {
-        crate::utils::parse::parse_numeric_ipv4(s).or_else(|| s.parse::<IpAddr>().ok())
-    } else {
-        s.parse::<IpAddr>().ok()
-    };
-    if let Some(ip) = ip {
-        let ip = vec![ip];
-        return DeviceQuery {
-            ip,
-            ..Default::default()
-        };
-    }
-    // 2) MAC
-    if let Ok(mac) = s.parse::<MacAddr>() {
-        let mac = vec![mac];
-        return DeviceQuery {
-            mac,
-            ..Default::default()
-        };
-    }
-    // 3) NUD state (reachable, stale, ...)
-    if let Ok(state) = s.parse::<NUDState>() {
-        let nud = vec![state];
-        return DeviceQuery {
-            nud,
-            ..Default::default()
-        };
-    }
-    // 4) Known device? prefer dev first
-    if has_dev(s) {
-        return DeviceQuery {
-            dev: vec![s.to_string()],
-            ..Default::default()
-        };
-    }
-    // 5) Try DNS: if it resolves, treat as name
-    if tokio::net::lookup_host((s, 0)).await.is_ok() {
-        return DeviceQuery {
-            name: Some(s.to_string()),
-            ..Default::default()
-        };
-    }
-    // Default: name last // it will fail also
-    DeviceQuery {
-        name: Some(s.to_string()),
-        ..Default::default()
-    }
-}

src/utils/wake/impls.rs

@@ -22,11 +22,19 @@ impl TryFrom<RouteWakeTarget> for WakeTarget {
     }
 }
 
-impl From<WakeTargetResult> for RouteWakeResult {
-    fn from(WakeTargetResult { ip, mac, status }: WakeTargetResult) -> Self {
+impl From<WakeTarget> for RouteWakeTarget {
+    fn from(WakeTarget { ip, mac }: WakeTarget) -> Self {
         Self {
             ip: Some(ip),
             mac: Some(mac),
+        }
+    }
+}
+
+impl From<WakeTargetResult> for RouteWakeResult {
+    fn from(WakeTargetResult { target, status }: WakeTargetResult) -> Self {
+        Self {
+            target: target.into(),
             status: status.into(),
         }
     }
@@ -35,8 +43,7 @@ impl From<WakeTargetResult> for RouteWakeResult {
 impl RouteWakeTarget {
     pub fn to_incomplete(self) -> RouteWakeResult {
         RouteWakeResult {
-            ip: self.ip,
-            mac: self.mac,
+            target: self,
             status: RouteWakeStatus::Incomplete,
         }
     }

src/utils/wake/mod.rs

@@ -5,35 +5,6 @@ use futures::TryFutureExt;
 use macaddr::MacAddr;
 use tokio::net::UdpSocket;
 
-use crate::utils::query::get_macs_2_mac;
-
-pub async fn wake(machine_name: &str) -> io::Result<u32> {
-    let suh = UdpSocket::bind("0.0.0.0:0").await?;
-    suh.set_broadcast(true)?;
-    let /* mut */ macs = get_macs_2_mac(machine_name).await.unwrap_or_default();
-    // macs.extend(*LDA_MACS_2);
-    let mut sent_ok = 0;
-    for mac in macs {
-        let mb = mac.as_bytes();
-
-        let mut pac = [0; 6 + 6 * 16]; // 6x FF + 16x mac6
-        pac[..6].fill(0xff);
-        for i in 1..=16 {
-            pac[i * 6..(i + 1) * 6].copy_from_slice(mb);
-        }
-
-        match suh
-            .send_to(&pac, (IpAddr::from([192, 168, 100, 255]), 9))
-            .await
-        {
-            Ok(n) if n == pac.len() => sent_ok += 1,
-            Ok(n) => eprintln!("partial send ({n}/{})", pac.len()),
-            Err(e) => eprintln!("send error: {e}"),
-        }
-    }
-    Ok(sent_ok)
-}
-
 #[derive(Debug, Clone, Copy, Hash)]
 pub struct WakeTarget {
     pub ip: IpAddr,
@@ -41,8 +12,7 @@ pub struct WakeTarget {
 }
 #[derive(Debug, Clone, Copy, Hash)]
 pub struct WakeTargetResult {
-    pub ip: IpAddr,
-    pub mac: MacAddr,
+    pub target: WakeTarget,
     pub status: WakeStatus,
 }
 #[derive(Debug, Clone, Copy, Hash)]
@@ -56,18 +26,18 @@ impl WakeTarget {
         Self { ip, mac }
     }
     fn good(self) -> WakeTargetResult {
-        WakeTargetResult::new(self.ip, self.mac, WakeStatus::Success)
+        WakeTargetResult::new(self, WakeStatus::Success)
     }
     fn bad(self) -> WakeTargetResult {
-        WakeTargetResult::new(self.ip, self.mac, WakeStatus::WrongSize)
+        WakeTargetResult::new(self, WakeStatus::WrongSize)
     }
     fn errored(self) -> WakeTargetResult {
-        WakeTargetResult::new(self.ip, self.mac, WakeStatus::NonexistentAddress)
+        WakeTargetResult::new(self, WakeStatus::NonexistentAddress)
     }
 }
 impl WakeTargetResult {
-    fn new(ip: IpAddr, mac: MacAddr, status: WakeStatus) -> Self {
-        Self { ip, mac, status }
+    fn new(target: WakeTarget, status: WakeStatus) -> Self {
+        Self { target, status }
     }
 }
 

static/home_2.html

@@ -27,7 +27,7 @@
       <div class="row muted" style="gap: 16px">
         <span
           >Uses query
-          <span title="available keys: name, ip, mac, dev, nud"
+          <span title="available keys: name, ips, macs, devs, nuds"
             >(?name=...)</span
           >
           on this page to view the status.<!-- and header (X-Target-Name) so either extractor

static/home_2/leases.js

@@ -1,5 +1,17 @@
 import { elLeases } from "./dom.js";
 
+/**
+ * 
+ * @param {{
+ *          expires_epoch: Number
+ *          rank?: Number
+ *          ip: String
+ *          mac: String
+ *          nud_state?: String
+ *          name?: String
+ *      }[]} leases 
+ * @returns 
+ */
 export function renderLeases(leases) {
   if (!elLeases) return;
   if (!Array.isArray(leases) || leases.length === 0) {

static/home_2/status.js

@@ -2,6 +2,7 @@ import { elHtml, elLog, setPill, qs, pill } from "./dom.js";
 import { rankState } from "./utils.js";
 import { merge_wake_data, translate_wake_message } from "./wake.js";
 
+// IpNeighLine
 const status_map = {
   ip: "ip",
   mac: "mac",
@@ -9,8 +10,14 @@ const status_map = {
   dev: "interface",
 };
 export const status_array = Object.keys(status_map);
-export const filter_array = ["ip", "dev", "nud", "mac"];
+// Filters
+export const filter_array = ["ips", "devs", "nuds", "macs"];
 
+/**
+ * 
+ * @param {String} name 
+ * @returns {URL}
+ */
 function buildStatusUrl(name) {
   const hasExtraFilters = filter_array.some((k) => qs.getAll(k).length);
   if (name && !hasExtraFilters) {
@@ -25,6 +32,25 @@ function buildStatusUrl(name) {
   return u;
 }
 
+/**
+ * 
+ * @param {{
+ *          has_wake?: true
+ *          table: {
+ *              wake_status?: Boolean
+ *              ips: String
+ *              dev: String
+ *              mac: String
+ *              state: String
+ *              }[]
+ *          filters: {
+ *              ips?: String[]
+ *              devs?: String[]
+ *              nuds?: String[]
+ *              macs?: String[]
+ *              }
+ *          }} data 
+ */
 export function renderStatus(data) {
   const tbl = document.createElement("table");
   tbl.className = "table";
@@ -82,12 +108,51 @@ export function renderStatus(data) {
     if (r >= 5) setPill("ok", "online");
     else if (r >= 2) setPill("warn", "maybe");
     else setPill("bad", "offline");
-    if (data.filters.nud?.length > 0) pill.textContent += " (filtered)";
+    if (data.filters.nuds?.length > 0) pill.textContent += " (filtered)";
   } else {
     setPill("warn", "unknown");
   }
 }
-
+/**
+ * @param {String} name 
+ * @param {Boolean} render 
+ * @param {{
+ *          ip: String,
+ *          mac: String,
+ *          status: 
+ * "incomplete" | "succeed" | "nonexistent_address" | "wrong_size" 
+ *          }} data_wake
+ * @returns {{
+ *          has_wake: false
+ *          table: {
+ *              ip: String
+ *              dev: String
+ *              mac: String
+ *              state: String
+ *              }[]
+ *          filters: {
+ *              ips?: String[]
+ *              devs?: String[]
+ *              nuds?: String[]
+ *              macs?: String[]
+ *              }
+ *          } | {
+ *          has_wake: true
+ *          table: {
+ *              wake_status: Boolean
+ *              ips: String
+ *              dev: String
+ *              mac: String
+ *              state: String
+ *              }[]
+ *          filters: {
+ *              ips?: String[]
+ *              devs?: String[]
+ *              nuds?: String[]
+ *              macs?: String[]
+ *              }
+ *          }}
+ */
 export async function fetchStatus(name, render = true, data_wake) {
   setPill("warn", "checking…");
   const u = buildStatusUrl(name);
@@ -97,6 +162,7 @@ export async function fetchStatus(name, render = true, data_wake) {
     if (!r.ok) {
       let msg = String(r.status);
       try {
+        /** @type {{error: string}} */
         const err = await r.clone().json();
         msg = err.error || JSON.stringify(err);
       } catch {
@@ -106,6 +172,26 @@ export async function fetchStatus(name, render = true, data_wake) {
       setPill("bad", "error");
       return;
     }
+
+    /**
+     * this one does not have data wake
+     *  @type {{
+     *      table: {
+     *          ip: String
+     *          dev: String
+     *          mac: String
+     *          state: String
+     *          wake_status?: String
+     *          }[]
+     *      filters: {
+     *          ips?: String[]
+     *          devs?: String[]
+     *          nuds?: String[]
+     *          macs?: String[]
+     *      }
+     *      has_wake?: true
+     *  }} 
+     */
     const data = await r.json();
 
     if (data_wake) {

static/home_2/styles.css

@@ -15,6 +15,13 @@ body {
   padding: 0;
   font-family: system-ui, Segoe UI, Roboto, Helvetica, Arial, sans-serif;
 }
+
+@media screen and (max-width: 768px) {
+  wrap {
+    margin-inline: 8px;
+  }
+}
+
 body {
   display: flex;
   min-height: 100dvh;

static/home_2/wake.js

@@ -1,6 +1,9 @@
 import { elHtml, elLog, setPill } from "./dom.js";
 import { fetchStatus, renderStatus } from "./status.js";
 
+/**
+ * @param {String} name just plain name
+ */
 export async function sendWake(name) {
   const data = await fetchStatus(name, false);
   if (!data) return; // can not proceed; theres nothing.
@@ -51,8 +54,29 @@ export async function sendWake(name) {
 
 /**
  *
- * @param {Array} table
- * @param {Array} wake
+ * @param {{
+ *          ip: String
+ *          dev: String
+ *          mac: String
+ *          state: String
+ *          }[]} table
+ * @param {{
+ *          ip: String,
+ *          mac: String,
+ *          status: "incomplete" | "succeed" | "nonexistent_address" | "wrong_size" 
+ *          }[]} wake
+ * @returns {{
+ *          ip: String
+ *          dev: String
+ *          mac: String
+ *          state: String
+ *          }[] | {
+ *          ip: String
+ *          dev: String
+ *          mac: String
+ *          state: String
+ *          wake_status: boolean
+ *          }[]}
  */
 export function merge_wake_data(table, wake) {
   if (!wake) return table;
@@ -90,7 +114,11 @@ export function merge_wake_data(table, wake) {
   return return_array;
 }
 
-
+/**
+ * 
+ * @param {"incomplete" | "succeed" | "nonexistent_address" | "wrong_size" | any} wake_msg 
+ * @returns {string}
+ */
 export function translate_wake_message(wake_msg) {
   switch (wake_msg) {
     case "incomplete":