Feature Flags and shit codex did idfk

ipjs/Cargo.toml

@@ -5,6 +5,10 @@ version = "0.0.2"
 edition = "2024"
 publish = ["gitea"]
 
+[features]
+default = []
+experimental-nl = ["dep:rtnetlink"]
+
 [dependencies]
 macaddr = { version = "1", features = ["serde", "serde_std"] }
 strum = { version = "0", features = ["derive", "strum_macros"] }
@@ -13,7 +17,15 @@ serde = { version = "1", features = ["derive"] }
 serde_with = { version = "3", features = ["json"] }
 thiserror = "2"
 anyhow = "1"
-tokio = { version = "1", features = ["fs", "process", "rt-multi-thread", "io-util", "macros"] }
-rtnetlink = "0"
+tokio = { version = "1", features = [
+    "fs",
+    "process",
+    "rt-multi-thread",
+    "io-util",
+    "macros",
+] }
 futures = "0"
 
+
+[target.'cfg(unix)'.dependencies]
+rtnetlink = { version = "0", optional = true }

ipjs/src/lib.rs

@@ -13,7 +13,6 @@
 //! i also need to see devices and idk MAYBE maybe not MAYBE UHHHHHH maybe broadcast
 //!
 //! LOWK if this were to be calls to kernel or some bullshit then PLEASE because doing ts parsing its hell cuh
-
 pub mod subcommands;
 pub mod utils;
 

ipjs/src/subcommands/address/mod.rs

@@ -5,8 +5,10 @@
 //! lowk why its free but its indirection and its ass
 
 pub mod json;
+#[cfg(all(unix, feature = "experimental-nl"))]
 pub mod nl;
 
+pub use crate::subcommands::Backend;
 use crate::utils::serialize::mac::option_mac;
 use macaddr::MacAddr;
 use serde::{Deserialize, Serialize};
@@ -40,3 +42,18 @@ pub struct AddrInfo {
     pub label: Option<String>,
     // many more exist; we only take what we need
 }
+
+pub async fn get(dev: Option<&str>) -> anyhow::Result<Vec<AddrOutput>> {
+    get_with_backend(Backend::Json, dev).await
+}
+
+pub async fn get_with_backend(
+    backend: Backend,
+    dev: Option<&str>,
+) -> anyhow::Result<Vec<AddrOutput>> {
+    match backend {
+        Backend::Json => json::get(dev).await,
+        #[cfg(all(unix, feature = "experimental-nl"))]
+        Backend::Netlink => nl::get(dev).await,
+    }
+}

ipjs/src/subcommands/address/nl.rs

@@ -1,5 +1,5 @@
 //! i said i aint doing ts no more why am i still here
-
+#![cfg(unix)]
 use futures::TryStreamExt;
 
 use crate::subcommands::address::AddrOutput;

ipjs/src/subcommands/mod.rs

@@ -1,2 +1,9 @@
 pub mod address;
 pub mod neighbor;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Backend {
+    Json,
+    #[cfg(all(unix, feature = "experimental-nl"))]
+    Netlink,
+}

ipjs/src/subcommands/neighbor/mod.rs

@@ -5,8 +5,10 @@
 //! yes. this is a real call.
 
 pub mod json;
+#[cfg(all(unix, feature = "experimental-nl"))]
 pub mod nl;
 
+pub use crate::subcommands::Backend;
 use crate::utils::serialize::mac::option_mac;
 use std::net::IpAddr;
 
@@ -80,3 +82,28 @@ pub struct NeighborItem {
     #[serde(default)]
     pub state: Vec<NUDState>,
 }
+
+pub async fn get(
+    ip: Option<IpAddr>,
+    dev: Option<&str>,
+    nud: &[NUDState],
+) -> anyhow::Result<Vec<NeighborItem>> {
+    get_with_backend(Backend::Json, ip, dev, nud).await
+}
+
+pub async fn get_with_backend(
+    backend: Backend,
+    ip: Option<IpAddr>,
+    dev: Option<&str>,
+    nud: &[NUDState],
+) -> anyhow::Result<Vec<NeighborItem>> {
+    match backend {
+        Backend::Json => json::get(ip, dev, nud).await,
+        #[cfg(all(unix, feature = "experimental-nl"))]
+        Backend::Netlink => {
+            let ips: Vec<IpAddr> = ip.into_iter().collect();
+            let devs: Vec<&str> = dev.into_iter().collect();
+            nl::get(&ips, &devs, nud, &[]).await
+        }
+    }
+}

ipjs/src/subcommands/neighbor/nl.rs

@@ -1,5 +1,5 @@
 //! rtnetlink-based neighbor table query. One syscall, filter in userspace.
-
+#![cfg(unix)]
 use std::{
     collections::{HashMap, HashSet},
     net::IpAddr,

ipjs/tests/test.rs

@@ -2,16 +2,17 @@ use std::collections::HashSet;
 
 use lda_ipjs::subcommands::{address, neighbor};
 
+#[cfg(all(unix, feature = "experimental-nl"))]
 #[tokio::test] // ← Use tokio::test instead of manual #[tokio::main]
 async fn ball1() -> anyhow::Result<()> {
-    let result = neighbor::nl::get(&[], &[] as &[&str], &[], &[]).await?;
+    let result = neighbor::get_with_backend(neighbor::Backend::Netlink, None, None, &[]).await?;
     println!("netlink results: {:?}", result);
     Ok(()) // ← Don't force error, let it succeed
 }
 
 #[tokio::test]
 async fn ball2() -> anyhow::Result<()> {
-    let result = neighbor::json::get(None, None, &[]).await?;
+    let result = neighbor::get_with_backend(neighbor::Backend::Json, None, None, &[]).await?;
     println!("json results: {:?}", result);
     Ok(())
 }
@@ -91,30 +92,34 @@ impl TypeName for serde_json::Value {
 #[tokio::test]
 async fn ball_compare_backends() -> anyhow::Result<()> {
     println!("=== JSON Backend ===");
-    let json_result = neighbor::json::get(None, None, &[]).await?;
+    let json_result = neighbor::get_with_backend(neighbor::Backend::Json, None, None, &[]).await?;
     println!("Got {} entries from JSON", json_result.len());
 
-    println!("\n=== Netlink Backend ===");
-    let nl_result = neighbor::nl::get(&[], &[] as &[&str], &[], &[]).await?;
-    println!("Got {} entries from netlink", nl_result.len());
+    #[cfg(all(unix, feature = "experimental-nl"))]
+    {
+        println!("\n=== Netlink Backend ===");
+        let nl_result =
+            neighbor::get_with_backend(neighbor::Backend::Netlink, None, None, &[]).await?;
+        println!("Got {} entries from netlink", nl_result.len());
 
-    // Compare counts
-    if json_result.len() != nl_result.len() {
+        // Compare counts
+        if json_result.len() != nl_result.len() {
+            println!(
+                "\n⚠️ Count mismatch! JSON: {}, Netlink: {}",
+                json_result.len(),
+                nl_result.len()
+            );
+        } else {
+            println!("\n✅ Both backends returned same count");
+        }
+        let a: HashSet<neighbor::NeighborItem> = HashSet::from_iter(json_result);
+        let b: HashSet<neighbor::NeighborItem> = HashSet::from_iter(nl_result);
         println!(
-            "\n⚠️ Count mismatch! JSON: {}, Netlink: {}",
-            json_result.len(),
-            nl_result.len()
+            "istg {len1} == {len2} or else",
+            len1 = a.len(),
+            len2 = b.len()
         );
-    } else {
-        println!("\n✅ Both backends returned same count");
     }
-    let a: HashSet<neighbor::NeighborItem> = HashSet::from_iter(json_result);
-    let b: HashSet<neighbor::NeighborItem> = HashSet::from_iter(nl_result);
-    println!(
-        "istg {len1} == {len2} or else",
-        len1 = a.len(),
-        len2 = b.len()
-    );
 
     Ok(())
 }
@@ -126,7 +131,7 @@ async fn ball_compare_backends() -> anyhow::Result<()> {
 
 #[tokio::test]
 async fn ipjas() -> anyhow::Result<()> {
-    let cuh = address::json::get(None).await?;
+    let cuh = address::get_with_backend(address::Backend::Json, None).await?;
     println!("{cuh:#?}");
     Ok(())
 }

src/compat.rs

@@ -0,0 +1,145 @@
+use serde::Serialize;
+use wakey_core::parse::mac;
+use wakey_core::{
+    DeviceFilters, DhcpLeaseWithState, NeighborEntry, Status, WakeResult, WakeTargetResult,
+};
+
+#[derive(Debug, Clone, Serialize)]
+pub struct LegacyStatusRow {
+    pub ip: std::net::IpAddr,
+    pub dev: Option<String>,
+    #[serde(with = "mac::option_mac")]
+    pub mac: Option<macaddr::MacAddr>,
+    pub state: wakey_core::NeighborState,
+}
+
+#[derive(Debug, Clone, Serialize)]
+pub struct LegacyStatusResponse {
+    pub name: Option<String>,
+    pub table: Vec<LegacyStatusRow>,
+    pub filters: DeviceFilters,
+}
+
+#[derive(Debug, Clone, Serialize)]
+pub struct LegacyLeaseRow {
+    pub expires_epoch: u64,
+    pub ip: std::net::IpAddr,
+    #[serde(with = "mac")]
+    pub mac: macaddr::MacAddr,
+    pub name: Option<String>,
+    pub nud_state: Option<wakey_core::NeighborState>,
+}
+
+#[derive(Debug, Clone, Serialize)]
+pub struct LegacyWakeResult {
+    pub result: Vec<LegacyWakeResultRow>,
+}
+
+#[derive(Debug, Clone, Copy, Serialize)]
+pub struct LegacyWakeResultRow {
+    #[serde(flatten)]
+    pub target: wakey_core::WakeTarget,
+    pub status: wakey_core::WakeStatus,
+}
+
+pub fn legacy_status_from_domain(status: Status<NeighborEntry>) -> LegacyStatusResponse {
+    LegacyStatusResponse {
+        name: status.name,
+        table: status.table.into_iter().map(legacy_status_row).collect(),
+        filters: status.filters,
+    }
+}
+
+pub fn legacy_status_row(row: NeighborEntry) -> LegacyStatusRow {
+    LegacyStatusRow {
+        ip: row.ip,
+        dev: row.dev,
+        mac: row.mac,
+        state: row.state,
+    }
+}
+
+pub fn legacy_leases_from_domain(leases: Vec<DhcpLeaseWithState>) -> Vec<LegacyLeaseRow> {
+    leases.into_iter().map(legacy_lease_row).collect()
+}
+
+pub fn legacy_lease_row(lease: DhcpLeaseWithState) -> LegacyLeaseRow {
+    LegacyLeaseRow {
+        expires_epoch: lease.lease_line.expires_epoch,
+        ip: lease.lease_line.ip,
+        mac: lease.lease_line.mac,
+        name: lease.lease_line.name,
+        nud_state: lease.nud_state,
+    }
+}
+
+pub fn legacy_wake_from_domain(result: WakeResult) -> LegacyWakeResult {
+    LegacyWakeResult {
+        result: result.result.into_iter().map(legacy_wake_row).collect(),
+    }
+}
+
+pub fn legacy_wake_row(row: WakeTargetResult) -> LegacyWakeResultRow {
+    LegacyWakeResultRow {
+        target: row.target,
+        status: row.status,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::net::{IpAddr, Ipv4Addr};
+    use wakey_core::{DhcpLease, NeighborState, WakeStatus, WakeTarget};
+
+    #[test]
+    fn maps_status_to_legacy_shape() {
+        let status = Status {
+            name: Some("pc".into()),
+            table: vec![NeighborEntry {
+                ip: IpAddr::V4(Ipv4Addr::new(192, 168, 1, 10)),
+                dev: Some("br-lan".into()),
+                mac: Some("aa:bb:cc:dd:ee:ff".parse().expect("mac")),
+                state: NeighborState::Reachable,
+            }],
+            filters: DeviceFilters::default(),
+        };
+        let legacy = legacy_status_from_domain(status);
+        assert_eq!(legacy.name.as_deref(), Some("pc"));
+        assert_eq!(legacy.table.len(), 1);
+        assert_eq!(legacy.table[0].state, NeighborState::Reachable);
+    }
+
+    #[test]
+    fn maps_leases_to_legacy_shape() {
+        let leases = vec![DhcpLeaseWithState {
+            lease_line: DhcpLease {
+                expires_epoch: 42,
+                ip: IpAddr::V4(Ipv4Addr::LOCALHOST),
+                mac: "aa:bb:cc:dd:ee:ff".parse().expect("mac"),
+                name: Some("pc".into()),
+            },
+            nud_state: Some(NeighborState::Reachable),
+        }];
+        let legacy = legacy_leases_from_domain(leases);
+        assert_eq!(legacy.len(), 1);
+        assert_eq!(legacy[0].name.as_deref(), Some("pc"));
+        assert_eq!(legacy[0].nud_state, Some(NeighborState::Reachable));
+    }
+
+    #[test]
+    fn maps_wake_to_legacy_shape() {
+        let result = WakeResult {
+            result: vec![WakeTargetResult {
+                target: WakeTarget {
+                    ip: Some(IpAddr::V4(Ipv4Addr::LOCALHOST)),
+                    mac: Some("aa:bb:cc:dd:ee:ff".parse().expect("mac")),
+                },
+                status: WakeStatus::Succeed,
+            }],
+        };
+        let legacy = legacy_wake_from_domain(result);
+        assert_eq!(legacy.result.len(), 1);
+        assert_eq!(legacy.result[0].status, WakeStatus::Succeed);
+    }
+}

src/lib.rs

@@ -1,4 +1,5 @@
 pub mod arpparse;
+pub mod compat;
 pub mod dhcpparse;
 pub mod route;
 pub mod utils;
@@ -17,40 +18,42 @@ use wakey_core::{
 pub type StatusResponse = Status<NeighborEntry>;
 
 pub async fn resolve_query(input: impl Into<String>) -> Result<DeviceQuery> {
-    Ok(match wakey_linux::devices::classify_query(input.into()).await {
-        QueryInput::Ip(ip_addr) => DeviceQuery {
-            filter: DeviceFilters {
-                ips: vec![ip_addr],
+    Ok(
+        match wakey_linux::devices::classify_query(input.into()).await {
+            QueryInput::Ip(ip_addr) => DeviceQuery {
+                filter: DeviceFilters {
+                    ips: vec![ip_addr],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
-            ..Default::default()
-        },
-        QueryInput::Mac(mac_addr) => DeviceQuery {
-            filter: DeviceFilters {
-                macs: vec![mac_addr],
+            QueryInput::Mac(mac_addr) => DeviceQuery {
+                filter: DeviceFilters {
+                    macs: vec![mac_addr],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
-            ..Default::default()
-        },
-        QueryInput::Dev(dev) => DeviceQuery {
-            filter: DeviceFilters {
-                devs: vec![dev],
+            QueryInput::Dev(dev) => DeviceQuery {
+                filter: DeviceFilters {
+                    devs: vec![dev],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
-            ..Default::default()
-        },
-        QueryInput::Nud(state) => DeviceQuery {
-            filter: DeviceFilters {
-                nuds: vec![state],
+            QueryInput::Nud(state) => DeviceQuery {
+                filter: DeviceFilters {
+                    nuds: vec![state],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            QueryInput::Name(name) => DeviceQuery {
+                name: Some(name),
                 ..Default::default()
             },
-            ..Default::default()
         },
-        QueryInput::Name(name) => DeviceQuery {
-            name: Some(name),
-            ..Default::default()
-        },
-    })
+    )
 }
 
 pub async fn get_status(query: DeviceQuery) -> Result<StatusResponse> {
@@ -117,16 +120,14 @@ pub async fn get_ips(name: impl AsRef<str>) -> Result<Vec<std::net::IpAddr>> {
 pub fn http_app(static_root: std::path::PathBuf) -> Router {
     Router::new()
         .nest("/api", route::api_router())
-        .fallback_service(
-            axum::routing::get_service(
-                ServeDir::new(static_root)
-                    .append_index_html_on_directories(true)
-                    .precompressed_br()
-                    .precompressed_deflate()
-                    .precompressed_gzip()
-                    .precompressed_zstd(),
-            ),
-        )
+        .fallback_service(axum::routing::get_service(
+            ServeDir::new(static_root)
+                .append_index_html_on_directories(true)
+                .precompressed_br()
+                .precompressed_deflate()
+                .precompressed_gzip()
+                .precompressed_zstd(),
+        ))
 }
 
 pub async fn serve_http(addr: SocketAddr, static_root: std::path::PathBuf) -> io::Result<()> {
@@ -161,7 +162,10 @@ mod tests {
     #[tokio::test]
     async fn resolve_query_parses_ip() {
         let query = resolve_query("192.168.1.10").await.expect("resolve query");
-        assert_eq!(query.filter.ips, vec![IpAddr::V4(Ipv4Addr::new(192, 168, 1, 10))]);
+        assert_eq!(
+            query.filter.ips,
+            vec![IpAddr::V4(Ipv4Addr::new(192, 168, 1, 10))]
+        );
     }
 
     #[tokio::test]

src/route/dhcp.rs

@@ -13,7 +13,11 @@ pub async fn get_dhcp_leases(
     let include_state = include_state.as_deref().map(boolish_str).unwrap_or(false);
 
     match crate::get_leases(include_state).await {
-        Ok(leases) => (StatusCode::OK, Json(leases)).into_response(),
+        Ok(leases) => (
+            StatusCode::OK,
+            Json(crate::compat::legacy_leases_from_domain(leases)),
+        )
+            .into_response(),
         Err(e) => ApiError {
             error: e.to_string(),
             code: StatusCode::BAD_GATEWAY,

src/route/status.rs

@@ -1,11 +1,15 @@
 use crate::route::error::ApiError;
 use axum::{Json, http::StatusCode, response::IntoResponse};
 use axum_extra::extract::Query;
-pub use wakey_core::{DeviceQuery, NamePath, Status};
+pub use wakey_core::{DeviceQuery, NamePath};
 
 pub async fn get_status_json(Query(query): Query<DeviceQuery>) -> impl IntoResponse {
     match crate::get_status(query).await {
-        Ok(status) => (StatusCode::OK, Json(status)).into_response(),
+        Ok(status) => (
+            StatusCode::OK,
+            Json(crate::compat::legacy_status_from_domain(status)),
+        )
+            .into_response(),
         Err(error) => ApiError {
             code: StatusCode::BAD_GATEWAY,
             error: error

src/route/wake.rs

@@ -1,10 +1,14 @@
 use crate::route::error::ApiError;
 use axum::{extract::Json, http::StatusCode, response::IntoResponse};
-pub use wakey_core::{WakeResult, WakeTarget};
+pub use wakey_core::WakeTarget;
 
 pub async fn wake_multi(Json(req): Json<Vec<WakeTarget>>) -> impl IntoResponse {
     match crate::wake_targets(req).await {
-        Ok(result) => (StatusCode::OK, Json(result)).into_response(),
+        Ok(result) => (
+            StatusCode::OK,
+            Json(crate::compat::legacy_wake_from_domain(result)),
+        )
+            .into_response(),
         Err(error) => {
             let error = format!("Error: {}", error);
             ApiError::ise(error).into_response()

wakey-linux/Cargo.toml

@@ -15,3 +15,4 @@ wakey-core = { path = "../wakey-core" }
 path = "../ipjs"
 registry = "gitea"
 version = "*"
+features = ["experimental-nl"]

wakey-linux/src/devices.rs

@@ -46,14 +46,59 @@ pub async fn get_neighbors(
     let nud_filter: Vec<neighbor::NUDState> = state.iter().copied().map(to_ipjs_state).collect();
     let dev_strs: Vec<&str> = devs.iter().map(AsRef::as_ref).collect();
 
-    let results = neighbor::nl::get(&ip_filter, &dev_strs, &nud_filter, macs)
-        .await
-        .context("rtnetlink failed")?
-        .into_iter()
-        .map(map_neighbor_item)
-        .collect();
+    #[cfg(unix)]
+    {
+        let results = neighbor::nl::get(&ip_filter, &dev_strs, &nud_filter, macs)
+            .await
+            .context("rtnetlink failed")?
+            .into_iter()
+            .map(map_neighbor_item)
+            .collect();
+        Ok(results)
+    }
 
-    Ok(results)
+    #[cfg(not(unix))]
+    {
+        let mut results = Vec::new();
+        if ip_filter.is_empty() {
+            let dev = dev_strs.first().copied();
+            results = neighbor::get_with_backend(neighbor::Backend::Json, None, dev, &nud_filter)
+                .await
+                .context("ip -j neigh failed")?
+                .into_iter()
+                .map(map_neighbor_item)
+                .collect();
+        } else {
+            for ip in &ip_filter {
+                let dev = dev_strs.first().copied();
+                let mut rows = neighbor::get_with_backend(
+                    neighbor::Backend::Json,
+                    Some(*ip),
+                    dev,
+                    &nud_filter,
+                )
+                .await
+                .with_context(|| format!("ip -j neigh failed for {ip}"))?
+                .into_iter()
+                .map(map_neighbor_item)
+                .collect::<Vec<_>>();
+                results.append(&mut rows);
+            }
+        }
+
+        if !dev_strs.is_empty() {
+            results.retain(|row| row.dev.as_deref().is_some_and(|d| dev_strs.contains(&d)));
+        }
+        if !macs.is_empty() {
+            let mac_set: HashSet<macaddr::MacAddr> = macs.iter().copied().collect();
+            results.retain(|row| row.mac.is_some_and(|m| mac_set.contains(&m)));
+        }
+        if !ip_filter.is_empty() {
+            let ip_set: HashSet<IpAddr> = ip_filter.iter().copied().collect();
+            results.retain(|row| ip_set.contains(&row.ip));
+        }
+        Ok(results)
+    }
 }
 
 pub async fn query_status(query: &DeviceQuery) -> Result<Vec<NeighborEntry>> {