Builders for the sys handlers

ivmarkov · ivmarkov · commit fcea7dc20831 · 2026-05-18T06:58:55.000Z
diff --git a/bloat-check/src/bin/bloat-check.rs b/bloat-check/src/bin/bloat-check.rs
@@ -653,7 +653,7 @@ fn dm_handler<'a>(
     wifi_diag: &'a dyn WifiDiag,
     net_ctl: &'a AppNetCtl,
 ) -> AppDmHandler<'a> {
-    endpoints::wifi_sys_handler(&true, &(), &(), wifi_diag, &(), &(), net_ctl, rand)
+    endpoints::WifiSysHandlerBuilder::new(net_ctl, wifi_diag).build(rand)
         .chain(
             EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
             Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
diff --git a/examples/src/bin/bridge.rs b/examples/src/bin/bridge.rs
@@ -208,7 +208,9 @@ fn dm_handler<'a, OH: OnOffHooks, LH: LevelControlHooks>(
 ) -> impl DataModelHandler + 'a {
     (
         NODE,
-        endpoints::eth_sys_handler(&false, &(), &SysNetifs, &(), &(), rand)
+        endpoints::EthSysHandlerBuilder::new()
+            .netif_diag(&SysNetifs)
+            .build(rand)
             // The next chain is the handler for the "aggregator" endpoint 1.
             //
             // Note how the descriptor cluster is a bit different compared to the normal ones.
diff --git a/examples/src/bin/camera_tests.rs b/examples/src/bin/camera_tests.rs
@@ -686,7 +686,9 @@ fn dm_handler<'a>(
 ) -> impl DataModelHandler + 'a {
     (
         NODE,
-        endpoints::eth_sys_handler(&false, &(), &SysNetifs, &(), &(), rand)
+        endpoints::EthSysHandlerBuilder::new()
+            .netif_diag(&SysNetifs)
+            .build(rand)
             .chain(
                 EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
                 Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
diff --git a/examples/src/bin/chip_tool_tests.rs b/examples/src/bin/chip_tool_tests.rs
@@ -619,7 +619,10 @@ fn dm_handler<'a, OH: OnOffHooks, LH: LevelControlHooks>(
 ) -> impl DataModelHandler + 'a {
     (
         node,
-        endpoints::eth_sys_handler(&false, gen_diag, &SysNetifs, &(), &(), rand)
+        endpoints::EthSysHandlerBuilder::new()
+            .gen_diag(gen_diag)
+            .netif_diag(&SysNetifs)
+            .build(rand)
             // Groups handler at the root endpoint. The library-level
             // `with_*_sys()` chain in `rs-matter/src/dm/endpoints.rs`
             // intentionally does *not* bind Groups at root anymore —
diff --git a/examples/src/bin/dimmable_light.rs b/examples/src/bin/dimmable_light.rs
@@ -274,7 +274,9 @@ fn dm_handler<'a, LH: LevelControlHooks, OH: OnOffHooks>(
 ) -> impl DataModelHandler + 'a {
     (
         NODE,
-        endpoints::eth_sys_handler(&false, &(), &SysNetifs, &(), &(), rand)
+        endpoints::EthSysHandlerBuilder::new()
+            .netif_diag(&SysNetifs)
+            .build(rand)
             .chain(
                 EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
                 Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
diff --git a/examples/src/bin/media_player.rs b/examples/src/bin/media_player.rs
@@ -187,7 +187,9 @@ fn dm_handler<'a, OH: OnOffHooks, LH: LevelControlHooks>(
 ) -> impl DataModelHandler + 'a {
     (
         NODE,
-        endpoints::eth_sys_handler(&false, &(), &SysNetifs, &(), &(), rand)
+        endpoints::EthSysHandlerBuilder::new()
+            .netif_diag(&SysNetifs)
+            .build(rand)
             .chain(
                 EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
                 Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
diff --git a/examples/src/bin/onoff_light.rs b/examples/src/bin/onoff_light.rs
@@ -210,7 +210,9 @@ fn dm_handler<'a, OH: OnOffHooks, LH: LevelControlHooks>(
 ) -> impl DataModelHandler + 'a {
     (
         NODE,
-        endpoints::eth_sys_handler(&false, &(), &SysNetifs, &(), &(), rand)
+        endpoints::EthSysHandlerBuilder::new()
+            .netif_diag(&SysNetifs)
+            .build(rand)
             .chain(
                 EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
                 Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
diff --git a/examples/src/bin/onoff_light_bt.rs b/examples/src/bin/onoff_light_bt.rs
@@ -280,7 +280,9 @@ where
 {
     (
         NODE,
-        endpoints::wifi_sys_handler(&true, &(), &UnixNetifs, wifi_diag, &(), &(), net_ctl, rand)
+        endpoints::WifiSysHandlerBuilder::new(net_ctl, wifi_diag)
+            .netif_diag(&UnixNetifs)
+            .build(rand)
             .chain(
                 EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
                 Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
diff --git a/examples/src/bin/onoff_light_work_stealing.rs b/examples/src/bin/onoff_light_work_stealing.rs
@@ -255,7 +255,9 @@ fn dm_handler<'a>(
     mut rand: impl RngCore + Copy,
     on_off: on_off::OnOffHandler<'a, TestOnOffDeviceLogic, NoLevelControl>,
 ) -> AppDmHandler<'a> {
-    endpoints::eth_sys_handler(&false, &(), &SysNetifs, &(), &(), rand)
+    endpoints::EthSysHandlerBuilder::new()
+        .netif_diag(&SysNetifs)
+        .build(rand)
         .chain(
             EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
             Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
diff --git a/examples/src/bin/speaker.rs b/examples/src/bin/speaker.rs
@@ -184,7 +184,9 @@ fn dm_handler<'a, LH: LevelControlHooks, OH: OnOffHooks>(
 ) -> impl DataModelHandler + 'a {
     (
         NODE,
-        endpoints::eth_sys_handler(&false, &(), &SysNetifs, &(), &(), rand)
+        endpoints::EthSysHandlerBuilder::new()
+            .netif_diag(&SysNetifs)
+            .build(rand)
             .chain(
                 EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
                 Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
diff --git a/examples/src/bin/webrtc_camera.rs b/examples/src/bin/webrtc_camera.rs
@@ -1398,7 +1398,9 @@ fn dm_handler<'a>(
 ) -> impl DataModelHandler + 'a {
     (
         NODE,
-        endpoints::eth_sys_handler(&false, &(), &UnixNetifs, &(), &(), rand)
+        endpoints::EthSysHandlerBuilder::new()
+            .netif_diag(&UnixNetifs)
+            .build(rand)
             .chain(
                 EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
                 rs_matter::dm::Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
diff --git a/rs-matter/src/dm/endpoints.rs b/rs-matter/src/dm/endpoints.rs
@@ -305,3 +305,248 @@ where
         ),
     )
 }
+
+// ---- Sys-handler builders ----------------------------------------------------
+//
+// Thin builders over the `eth_sys_handler` / `wifi_sys_handler` /
+// `thread_sys_handler` free fns: each cluster-data hook is a setter, unset
+// ones fall back to the canonical no-op default (`&true` for `CommPolicy`,
+// `&()` for every other trait — `bool: CommPolicy` and `(): GenDiag` /
+// `NetifDiag` / `TimeSync` / `SwDiag` are already impls in the crate). New
+// hooks can be added later by extending one struct + adding a setter, with
+// no churn on existing call sites.
+
+/// Builder for an Ethernet root-endpoint system handler.
+///
+/// Unset hooks fall back to no-op defaults: `&true` for `CommPolicy`
+/// (commissioning open / allowed) and `&()` for every other trait
+/// (reports nothing / no-op).
+///
+/// ```ignore
+/// let h = EthSysHandlerBuilder::new()
+///     .gen_diag(&my_gen_diag)
+///     .netif_diag(&SysNetifs)
+///     .build(rand);
+/// ```
+pub struct EthSysHandlerBuilder<'a> {
+    comm_policy: &'a dyn CommPolicy,
+    gen_diag: &'a dyn GenDiag,
+    netif_diag: &'a dyn NetifDiag,
+    time_sync: &'a dyn TimeSync,
+    sw_diag: &'a dyn SwDiag,
+}
+
+impl<'a> EthSysHandlerBuilder<'a> {
+    /// Create a builder with all hooks defaulted to their no-op providers.
+    pub const fn new() -> Self {
+        Self {
+            comm_policy: &true,
+            gen_diag: &(),
+            netif_diag: &(),
+            time_sync: &(),
+            sw_diag: &(),
+        }
+    }
+
+    /// Set the `CommPolicy` hook (commissioning window policy).
+    pub const fn comm_policy(mut self, comm_policy: &'a dyn CommPolicy) -> Self {
+        self.comm_policy = comm_policy;
+        self
+    }
+
+    /// Set the `GenDiag` hook (General Diagnostics data provider).
+    pub const fn gen_diag(mut self, gen_diag: &'a dyn GenDiag) -> Self {
+        self.gen_diag = gen_diag;
+        self
+    }
+
+    /// Set the `NetifDiag` hook (network-interface enumeration).
+    pub const fn netif_diag(mut self, netif_diag: &'a dyn NetifDiag) -> Self {
+        self.netif_diag = netif_diag;
+        self
+    }
+
+    /// Set the `TimeSync` hook (Time Synchronization data provider).
+    pub const fn time_sync(mut self, time_sync: &'a dyn TimeSync) -> Self {
+        self.time_sync = time_sync;
+        self
+    }
+
+    /// Set the `SwDiag` hook (Software Diagnostics data provider).
+    pub const fn sw_diag(mut self, sw_diag: &'a dyn SwDiag) -> Self {
+        self.sw_diag = sw_diag;
+        self
+    }
+
+    /// Build the Ethernet system handler.
+    pub fn build<R: RngCore>(self, rand: R) -> EthSysHandler<'a> {
+        eth_sys_handler(
+            self.comm_policy,
+            self.gen_diag,
+            self.netif_diag,
+            self.time_sync,
+            self.sw_diag,
+            rand,
+        )
+    }
+}
+
+impl Default for EthSysHandlerBuilder<'_> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+/// Builder for a Wi-Fi root-endpoint system handler.
+///
+/// `net_ctl` and `wifi_diag` are required (no sensible default) and supplied
+/// to [`Self::new`]; everything else falls back to no-op defaults.
+pub struct WifiSysHandlerBuilder<'a, T> {
+    comm_policy: &'a dyn CommPolicy,
+    gen_diag: &'a dyn GenDiag,
+    netif_diag: &'a dyn NetifDiag,
+    wifi_diag: &'a dyn WifiDiag,
+    time_sync: &'a dyn TimeSync,
+    sw_diag: &'a dyn SwDiag,
+    net_ctl: T,
+}
+
+impl<'a, T> WifiSysHandlerBuilder<'a, T>
+where
+    T: NetCtl + NetCtlStatus,
+{
+    /// Create a builder. `net_ctl` and `wifi_diag` are required; every other
+    /// hook defaults to a no-op provider.
+    pub const fn new(net_ctl: T, wifi_diag: &'a dyn WifiDiag) -> Self {
+        Self {
+            comm_policy: &true,
+            gen_diag: &(),
+            netif_diag: &(),
+            wifi_diag,
+            time_sync: &(),
+            sw_diag: &(),
+            net_ctl,
+        }
+    }
+
+    /// Set the `CommPolicy` hook.
+    pub const fn comm_policy(mut self, comm_policy: &'a dyn CommPolicy) -> Self {
+        self.comm_policy = comm_policy;
+        self
+    }
+
+    /// Set the `GenDiag` hook.
+    pub const fn gen_diag(mut self, gen_diag: &'a dyn GenDiag) -> Self {
+        self.gen_diag = gen_diag;
+        self
+    }
+
+    /// Set the `NetifDiag` hook.
+    pub const fn netif_diag(mut self, netif_diag: &'a dyn NetifDiag) -> Self {
+        self.netif_diag = netif_diag;
+        self
+    }
+
+    /// Set the `TimeSync` hook.
+    pub const fn time_sync(mut self, time_sync: &'a dyn TimeSync) -> Self {
+        self.time_sync = time_sync;
+        self
+    }
+
+    /// Set the `SwDiag` hook.
+    pub const fn sw_diag(mut self, sw_diag: &'a dyn SwDiag) -> Self {
+        self.sw_diag = sw_diag;
+        self
+    }
+
+    /// Build the Wi-Fi system handler.
+    pub fn build<R: RngCore>(self, rand: R) -> WifiSysHandler<'a, T> {
+        wifi_sys_handler(
+            self.comm_policy,
+            self.gen_diag,
+            self.netif_diag,
+            self.wifi_diag,
+            self.time_sync,
+            self.sw_diag,
+            self.net_ctl,
+            rand,
+        )
+    }
+}
+
+/// Builder for a Thread root-endpoint system handler.
+///
+/// `net_ctl` and `thread_diag` are required (no sensible default) and supplied
+/// to [`Self::new`]; everything else falls back to no-op defaults.
+pub struct ThreadSysHandlerBuilder<'a, T> {
+    comm_policy: &'a dyn CommPolicy,
+    gen_diag: &'a dyn GenDiag,
+    netif_diag: &'a dyn NetifDiag,
+    thread_diag: &'a dyn ThreadDiag,
+    time_sync: &'a dyn TimeSync,
+    sw_diag: &'a dyn SwDiag,
+    net_ctl: T,
+}
+
+impl<'a, T> ThreadSysHandlerBuilder<'a, T>
+where
+    T: NetCtl + NetCtlStatus,
+{
+    /// Create a builder. `net_ctl` and `thread_diag` are required; every
+    /// other hook defaults to a no-op provider.
+    pub const fn new(net_ctl: T, thread_diag: &'a dyn ThreadDiag) -> Self {
+        Self {
+            comm_policy: &true,
+            gen_diag: &(),
+            netif_diag: &(),
+            thread_diag,
+            time_sync: &(),
+            sw_diag: &(),
+            net_ctl,
+        }
+    }
+
+    /// Set the `CommPolicy` hook.
+    pub const fn comm_policy(mut self, comm_policy: &'a dyn CommPolicy) -> Self {
+        self.comm_policy = comm_policy;
+        self
+    }
+
+    /// Set the `GenDiag` hook.
+    pub const fn gen_diag(mut self, gen_diag: &'a dyn GenDiag) -> Self {
+        self.gen_diag = gen_diag;
+        self
+    }
+
+    /// Set the `NetifDiag` hook.
+    pub const fn netif_diag(mut self, netif_diag: &'a dyn NetifDiag) -> Self {
+        self.netif_diag = netif_diag;
+        self
+    }
+
+    /// Set the `TimeSync` hook.
+    pub const fn time_sync(mut self, time_sync: &'a dyn TimeSync) -> Self {
+        self.time_sync = time_sync;
+        self
+    }
+
+    /// Set the `SwDiag` hook.
+    pub const fn sw_diag(mut self, sw_diag: &'a dyn SwDiag) -> Self {
+        self.sw_diag = sw_diag;
+        self
+    }
+
+    /// Build the Thread system handler.
+    pub fn build<R: RngCore>(self, rand: R) -> ThreadSysHandler<'a, T> {
+        thread_sys_handler(
+            self.comm_policy,
+            self.gen_diag,
+            self.netif_diag,
+            self.thread_diag,
+            self.time_sync,
+            self.sw_diag,
+            self.net_ctl,
+            rand,
+        )
+    }
+}
diff --git a/rs-matter/tests/commissioning.rs b/rs-matter/tests/commissioning.rs
@@ -131,7 +131,9 @@ fn dm_handler<'a, OH: OnOffHooks, LH: LevelControlHooks>(
 ) -> impl DataModelHandler + 'a {
     (
         NODE,
-        endpoints::eth_sys_handler(&false, &(), &UnixNetifs, &(), &(), rand)
+        endpoints::EthSysHandlerBuilder::new()
+            .netif_diag(&UnixNetifs)
+            .build(rand)
             .chain(
                 EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
                 Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
diff --git a/rs-matter/tests/common/e2e/im/handler.rs b/rs-matter/tests/common/e2e/im/handler.rs
@@ -23,7 +23,7 @@ use rs_matter::dm::clusters::app::on_off::{
 };
 use rs_matter::dm::clusters::desc::{self, ClusterHandler as _, DescHandler};
 use rs_matter::dm::devices::{DEV_TYPE_ON_OFF_LIGHT, DEV_TYPE_ROOT_NODE};
-use rs_matter::dm::endpoints::{eth_sys_handler, EthSysHandler, ROOT_ENDPOINT_ID};
+use rs_matter::dm::endpoints::{EthSysHandler, EthSysHandlerBuilder, ROOT_ENDPOINT_ID};
 use rs_matter::dm::{
     Async, AsyncHandler, ChainedHandler, Dataver, EmptyHandler, Endpoint, EpClMatcher,
     InvokeContext, InvokeReply, MatchContext, Metadata, Node, ReadContext, ReadReply, WriteContext,
@@ -66,7 +66,8 @@ impl<'a, OH: OnOffHooks, LH: LevelControlHooks> E2eTestHandler<'a, OH, LH> {
     };
 
     pub fn new(mut rand: impl RngCore + Copy, on_off: on_off::OnOffHandler<'a, OH, LH>) -> Self {
-        let handler = eth_sys_handler(&false, &(), &(), &(), &(), rand)
+        let handler = EthSysHandlerBuilder::new()
+            .build(rand)
             .chain(
                 EpClMatcher::new(Some(ROOT_ENDPOINT_ID), Some(echo_cluster::ID)),
                 Async(EchoHandler::new(2, Dataver::new_rand(&mut rand))),

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,9 @@ where`
`280`	`280`	`{`
`281`	`281`	`(`
`282`	`282`	`NODE,`
`283`		`- endpoints::wifi_sys_handler(&true, &(), &UnixNetifs, wifi_diag, &(), &(), net_ctl, rand)`
	`283`	`+ endpoints::WifiSysHandlerBuilder::new(net_ctl, wifi_diag)`
	`284`	`+ .netif_diag(&UnixNetifs)`
	`285`	`+ .build(rand)`
`284`	`286`	`.chain(`
`285`	`287`	`EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),`
`286`	`288`	`Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),`