Skip to content

Update to latest rs-matter which features inband persistence #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivmarkov merged 1 commit into from
Apr 6, 2026
Merged

Update to latest rs-matter which features inband persistence #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ rust-version = "1.77"

[patch.crates-io]
#rs-matter = { git = "https://github.com/project-chip/rs-matter" }
rs-matter = { git = "https://github.com/sysgrok/rs-matter", branch = "next" }
#rs-matter = { git = "https://github.com/sysgrok/rs-matter", branch = "next" }
rs-matter = { git = "https://github.com/sysgrok/rs-matter", branch = "inband-persistence" }
#rs-matter = { path = "../rs-matter/rs-matter" }
#edge-nal = { git = "https://github.com/sysgrok/edge-net" }
#edge-nal-std = { git = "https://github.com/sysgrok/edge-net" }
Expand Down
24 changes: 13 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,24 +66,24 @@ use core::pin::pin;

use log::info;

use rs_matter::crypto::{default_crypto, Crypto};
use rs_matter::dm::clusters::on_off::test::TestOnOffDeviceLogic;
use rs_matter::dm::clusters::on_off::OnOffHooks;
use rs_matter::dm::devices::test::DAC_PRIVKEY;
use rs_matter_stack::eth::EthMatterStack;
use rs_matter_stack::matter::crypto::{default_crypto, Crypto};
use rs_matter_stack::matter::dm::clusters::desc;
use rs_matter_stack::matter::dm::clusters::desc::ClusterHandler as _;
use rs_matter_stack::matter::dm::clusters::on_off;
use rs_matter_stack::matter::dm::clusters::on_off::test::TestOnOffDeviceLogic;
use rs_matter_stack::matter::dm::clusters::on_off::OnOffHooks;
use rs_matter_stack::matter::dm::devices::test::DAC_PRIVKEY;
use rs_matter_stack::matter::dm::devices::test::{TEST_DEV_ATT, TEST_DEV_COMM, TEST_DEV_DET};
use rs_matter_stack::matter::dm::devices::DEV_TYPE_ON_OFF_LIGHT;
use rs_matter_stack::matter::dm::networks::unix::UnixNetifs;
use rs_matter_stack::matter::dm::{Async, Dataver, Endpoint, Node};
use rs_matter_stack::matter::dm::{EmptyHandler, EpClMatcher};
use rs_matter_stack::matter::error::Error;
use rs_matter_stack::matter::persist::DirKvBlobStore;
use rs_matter_stack::matter::utils::init::InitMaybeUninit;
use rs_matter_stack::matter::{clusters, devices};
use rs_matter_stack::mdns::ZeroconfMdns;
use rs_matter_stack::persist::DirKvBlobStore;

use static_cell::StaticCell;

Expand Down Expand Up @@ -146,10 +146,12 @@ fn main() -> Result<(), Error> {
Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
);

// Create the persister & load any previously saved state
let persist = futures_lite::future::block_on(
stack.create_persist_with_comm_window(&crypto, DirKvBlobStore::new_default()),
)?;
// Create the KV BLOB store and load any previously saved state of `rs-matter`
let mut kv = DirKvBlobStore::new_default();
futures_lite::future::block_on(stack.startup(&crypto, &mut kv))?;

// Wrap the KV BLOB store as a shared reference, so that it can be used both by `rs-matter` and the user
let kv = stack.create_shared_kv(kv)?;

// Run the Matter stack with our handler
// Using `pin!` is completely optional, but reduces the size of the final future
Expand All @@ -160,12 +162,12 @@ fn main() -> Result<(), Error> {
UnixNetifs,
// Will use the mDNS implementation based on the `zeroconf` crate
ZeroconfMdns,
// Will persist in `<tmp-dir>/rs-matter`
&persist,
// The crypto provider
&crypto,
// Our `AsyncHandler` + `AsyncMetadata` impl
(NODE, handler),
// Will persist in `<tmp-dir>/rs-matter`
&kv,
// No user task future to run
(),
));
Expand Down
24 changes: 13 additions & 11 deletions examples/light.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@ use core::pin::pin;

use log::info;

use rs_matter::crypto::{default_crypto, Crypto};
use rs_matter::dm::clusters::on_off::test::TestOnOffDeviceLogic;
use rs_matter::dm::clusters::on_off::OnOffHooks;
use rs_matter::dm::devices::test::DAC_PRIVKEY;
use rs_matter_stack::ble::BluerGattPeripheral;
use rs_matter_stack::matter::crypto::{default_crypto, Crypto};
use rs_matter_stack::matter::dm::clusters::desc::{ClusterHandler as _, DescHandler};
use rs_matter_stack::matter::dm::clusters::net_comm::NetworkType;
use rs_matter_stack::matter::dm::clusters::on_off;
use rs_matter_stack::matter::dm::clusters::on_off::test::TestOnOffDeviceLogic;
use rs_matter_stack::matter::dm::clusters::on_off::OnOffHooks;
use rs_matter_stack::matter::dm::devices::test::DAC_PRIVKEY;
use rs_matter_stack::matter::dm::devices::test::{TEST_DEV_ATT, TEST_DEV_COMM, TEST_DEV_DET};
use rs_matter_stack::matter::dm::devices::DEV_TYPE_ON_OFF_LIGHT;
use rs_matter_stack::matter::dm::networks::unix::UnixNetifs;
use rs_matter_stack::matter::dm::networks::wireless::NoopWirelessNetCtl;
use rs_matter_stack::matter::dm::{Async, Dataver, Endpoint, Node};
use rs_matter_stack::matter::dm::{EmptyHandler, EpClMatcher};
use rs_matter_stack::matter::error::Error;
use rs_matter_stack::matter::persist::DirKvBlobStore;
use rs_matter_stack::matter::utils::init::InitMaybeUninit;
use rs_matter_stack::matter::{clusters, devices};
use rs_matter_stack::mdns::ZeroconfMdns;
use rs_matter_stack::persist::DirKvBlobStore;
use rs_matter_stack::wireless::PreexistingWireless;
use rs_matter_stack::wireless::WifiMatterStack;

Expand Down Expand Up @@ -96,10 +96,12 @@ fn main() -> Result<(), Error> {
Async(DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
);

// Create the persister & load any previously saved state
let persist = futures_lite::future::block_on(
stack.create_persist_with_comm_window(&crypto, DirKvBlobStore::new_default()),
)?;
// Create the KV BLOB store and load any previously saved state of `rs-matter`
let mut kv = DirKvBlobStore::new_default();
futures_lite::future::block_on(stack.startup(&crypto, &mut kv))?;

// Wrap the KV BLOB store as a shared reference, so that it can be used both by `rs-matter` and the user
let kv = stack.create_shared_kv(kv)?;

// Run the Matter stack with our handler
// Using `pin!` is completely optional, but reduces the size of the final future
Expand All @@ -116,12 +118,12 @@ fn main() -> Result<(), Error> {
// The Bluetooth transport implementation based on the `bluer` crate.
BluerGattPeripheral::new(None),
),
// Will persist in `<tmp-dir>/rs-matter`
&persist,
// The crypto provider, used for all the cryptographic operations of the stack
&crypto,
// Our `AsyncHandler` + `AsyncMetadata` impl
(NODE, handler),
// Will persist in `<tmp-dir>/rs-matter`
&kv,
// No user task to run
(),
));
Expand Down
24 changes: 13 additions & 11 deletions examples/light_eth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ use core::pin::pin;

use log::info;

use rs_matter::crypto::{default_crypto, Crypto};
use rs_matter::dm::clusters::on_off::test::TestOnOffDeviceLogic;
use rs_matter::dm::clusters::on_off::OnOffHooks;
use rs_matter::dm::devices::test::DAC_PRIVKEY;
use rs_matter_stack::eth::EthMatterStack;
use rs_matter_stack::matter::crypto::{default_crypto, Crypto};
use rs_matter_stack::matter::dm::clusters::desc;
use rs_matter_stack::matter::dm::clusters::desc::ClusterHandler as _;
use rs_matter_stack::matter::dm::clusters::on_off;
use rs_matter_stack::matter::dm::clusters::on_off::test::TestOnOffDeviceLogic;
use rs_matter_stack::matter::dm::clusters::on_off::OnOffHooks;
use rs_matter_stack::matter::dm::devices::test::DAC_PRIVKEY;
use rs_matter_stack::matter::dm::devices::test::{TEST_DEV_ATT, TEST_DEV_COMM, TEST_DEV_DET};
use rs_matter_stack::matter::dm::devices::DEV_TYPE_ON_OFF_LIGHT;
use rs_matter_stack::matter::dm::networks::unix::UnixNetifs;
use rs_matter_stack::matter::dm::{Async, Dataver, Endpoint, Node};
use rs_matter_stack::matter::dm::{EmptyHandler, EpClMatcher};
use rs_matter_stack::matter::error::Error;
use rs_matter_stack::matter::persist::DirKvBlobStore;
use rs_matter_stack::matter::utils::init::InitMaybeUninit;
use rs_matter_stack::matter::{clusters, devices};
use rs_matter_stack::mdns::ZeroconfMdns;
use rs_matter_stack::persist::DirKvBlobStore;

use static_cell::StaticCell;

Expand Down Expand Up @@ -94,10 +94,12 @@ fn main() -> Result<(), Error> {
Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
);

// Create the persister & load any previously saved state
let persist = futures_lite::future::block_on(
stack.create_persist_with_comm_window(&crypto, DirKvBlobStore::new_default()),
)?;
// Create the KV BLOB store and load any previously saved state of `rs-matter`
let mut kv = DirKvBlobStore::new_default();
futures_lite::future::block_on(stack.startup(&crypto, &mut kv))?;

// Wrap the KV BLOB store as a shared reference, so that it can be used both by `rs-matter` and the user
let kv = stack.create_shared_kv(kv)?;

// Run the Matter stack with our handler
// Using `pin!` is completely optional, but reduces the size of the final future
Expand All @@ -108,12 +110,12 @@ fn main() -> Result<(), Error> {
UnixNetifs,
// Will use the mDNS implementation based on the `zeroconf` crate
ZeroconfMdns,
// Will persist in `<tmp-dir>/rs-matter`
&persist,
// The crypto provider
&crypto,
// Our `AsyncHandler` + `AsyncMetadata` impl
(NODE, handler),
// Will persist in `<tmp-dir>/rs-matter`
&kv,
// No user task future to run
(),
));
Expand Down
Loading
Loading