diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index f780dc85..ac55b8dd 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -48,6 +48,9 @@ jobs:
       with:
         fetch-depth: 0
 
+    - name: Free Disk Space (Ubuntu)
+      uses: jlumbroso/free-disk-space@main
+
     - name: Set up cargo cache
       uses: actions/cache@v4
       continue-on-error: false
diff --git a/.gitignore b/.gitignore
index db3d5e54..e1c46044 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ target-common/
 .vscode
 femme
 dist/
+*.code-workspace
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..c1a7bcff
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "rust-analyzer.cargo.allTargets": true,
+    "rust-analyzer.check.targets": "wasm32-unknown-unknown"
+}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09b54aa6..19e37059 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,18 @@ Following https://keepachangelog.com/en/1.1.0/ and using
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
-## [Unreleased]
+## [0.9.0] - 2025-02-24
+
+This release is mostly for the start of the student project.
+It is a mostly working version of the dht_storage module, but most of the CLI tools 
+and web-frontend are still missing.
+
+### Added
+- flcrypto: for some basic cryptography wrappers around different types of signatures
+- flmacro: with macros for simplifying the `Send` / `Sync`
+- flmodules::flo handling Fledger Objects
+- flmodules::dht_router implements a routing based on Kademlia
+- flmodules::dht_storage to store FLOs in a distributed hash table
 
 ### Fixed
 - reconnections should work better now, both for libc and wasm
@@ -17,6 +28,16 @@ Following https://keepachangelog.com/en/1.1.0/ and using
 - changed the names of the networking messages
 - added an `Overlay` module to abstract the network handling
 - more changes in names of the messages to remove ambiguities
+- Renamed `Overlay` to `Router`
+  - think how the `Overlay` (should be renamed to `Adapter` or so) can be
+  redone. One possibility is to have the network module using a good
+  `NetworkMessage` which includes the `NetworkWrapper` and can also be used
+  by `Random` and `Loopix`.
+      - Question: how to handle special messages then? Like asking to reshuffle
+      connections in `random` or accessing the providers in `loopix`?
+      - Answer: they can be added as a broker with another message type, which is also
+      added to the broker structure
+        - add an internal message enum to separate them from the outside messages
 
 ## [0.8.0] - 2024-09-09
 
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 00000000..eb989986
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,3959 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "aes-gcm"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
+ "subtle",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc 0.2.169",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+dependencies = [
+ "anstyle",
+ "once_cell",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "arc-swap"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+
+[[package]]
+name = "asn1-rs"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
+dependencies = [
+ "asn1-rs-derive 0.4.0",
+ "asn1-rs-impl 0.1.0",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "asn1-rs"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048"
+dependencies = [
+ "asn1-rs-derive 0.5.1",
+ "asn1-rs-impl 0.2.0",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+ "thiserror 1.0.69",
+ "time",
+]
+
+[[package]]
+name = "asn1-rs-derive"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "synstructure 0.12.6",
+]
+
+[[package]]
+name = "asn1-rs-derive"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
+[[package]]
+name = "asn1-rs-impl"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "asn1-rs-impl"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "backtrace"
+version = "0.3.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc 0.2.169",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets",
+]
+
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bimap"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
+
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
+[[package]]
+name = "bumpalo"
+version = "3.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "ccm"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ae3c82e4355234767756212c570e29833699ab63e6ffd161887314cc5b43847"
+dependencies = [
+ "aead",
+ "cipher",
+ "ctr",
+ "subtle",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "chrono"
+version = "0.4.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap-verbosity-flag"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34c77f67047557f62582784fd7482884697731b2932c7d37ced54bce2312e1e2"
+dependencies = [
+ "clap",
+ "log",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc 0.2.169",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc 0.2.169",
+]
+
+[[package]]
+name = "crc"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "typenum",
+]
+
+[[package]]
+name = "ct-codecs"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
+
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "4.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest",
+ "fiat-crypto",
+ "rustc_version",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
+
+[[package]]
+name = "der"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "der-parser"
+version = "8.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
+dependencies = [
+ "asn1-rs 0.5.2",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+]
+
+[[package]]
+name = "der-parser"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
+dependencies = [
+ "asn1-rs 0.6.2",
+ "displaydoc",
+ "nom",
+ "num-bigint",
+ "num-traits",
+ "rusticata-macros",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der",
+ "digest",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+ "spki",
+]
+
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
+[[package]]
+name = "ed25519-compact"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
+dependencies = [
+ "ct-codecs",
+ "ed25519",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest",
+ "ff",
+ "generic-array",
+ "group",
+ "hkdf",
+ "pem-rfc7468",
+ "pkcs8",
+ "rand_core",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+
+[[package]]
+name = "flarch"
+version = "0.9.0"
+dependencies = [
+ "async-trait",
+ "btparse",
+ "bytes",
+ "chrono",
+ "env_logger",
+ "flmacro",
+ "futures",
+ "js-sys",
+ "log",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde-wasm-bindgen",
+ "serde_json",
+ "serde_with",
+ "serde_yaml",
+ "sha2",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-tungstenite",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-bindgen-test",
+ "wasmtimer",
+ "web-sys",
+ "webrtc",
+]
+
+[[package]]
+name = "flcrypto"
+version = "0.9.0"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "flarch",
+ "flcrypto",
+ "flmacro",
+ "log",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde_with",
+ "sha2",
+ "thiserror 2.0.11",
+ "typetag",
+]
+
+[[package]]
+name = "fledger"
+version = "0.9.0"
+dependencies = [
+ "clap",
+ "clap-verbosity-flag",
+ "env_logger",
+ "flarch",
+ "flcrypto",
+ "flmodules",
+ "flnode",
+ "log",
+ "thiserror 1.0.69",
+ "tokio",
+ "webrtc-util",
+]
+
+[[package]]
+name = "flmacro"
+version = "0.9.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "flmodules"
+version = "0.9.0"
+dependencies = [
+ "async-recursion",
+ "async-stream",
+ "async-trait",
+ "bimap",
+ "bitflags 2.8.0",
+ "btparse",
+ "bytes",
+ "ed25519-compact",
+ "ed25519-dalek",
+ "env_logger",
+ "flarch",
+ "flcrypto",
+ "flmacro",
+ "flmodules",
+ "futures",
+ "getrandom 0.2.15",
+ "itertools",
+ "log",
+ "names",
+ "num-bigint",
+ "rand",
+ "rayon",
+ "reqwest",
+ "rmp-serde",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_with",
+ "serde_yaml",
+ "sha2",
+ "strum_macros",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-stream",
+ "toml",
+ "typetag",
+]
+
+[[package]]
+name = "flnode"
+version = "0.9.0"
+dependencies = [
+ "async-trait",
+ "chrono",
+ "ed25519-compact",
+ "env_logger",
+ "flarch",
+ "flmodules",
+ "futures",
+ "getrandom 0.2.15",
+ "itertools",
+ "log",
+ "names",
+ "rand",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_yaml",
+ "sha2",
+ "thiserror 1.0.69",
+ "tokio",
+ "toml",
+]
+
+[[package]]
+name = "flsignal"
+version = "0.9.0"
+dependencies = [
+ "clap",
+ "clap-verbosity-flag",
+ "env_logger",
+ "flarch",
+ "flmodules",
+ "log",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc 0.2.169",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc 0.2.169",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
+]
+
+[[package]]
+name = "ghash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
+dependencies = [
+ "opaque-debug",
+ "polyval",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "http"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "hyper"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+ "webpki-roots",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.2",
+ "serde",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "interceptor"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4705c00485029e738bea8c9505b5ddb1486a8f3627a953e1e77e6abdf5eef90c"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "log",
+ "portable-atomic",
+ "rand",
+ "rtcp",
+ "rtp",
+ "thiserror 1.0.69",
+ "tokio",
+ "waitgroup",
+ "webrtc-srtp",
+ "webrtc-util",
+]
+
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libc"
+version = "0.2.169"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+
+[[package]]
+name = "libc"
+version = "0.9.0"
+dependencies = [
+ "clap",
+ "flarch",
+ "flmodules",
+ "log",
+ "shared",
+ "tokio",
+]
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minicov"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
+dependencies = [
+ "cc",
+ "walkdir",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+dependencies = [
+ "libc 0.2.169",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "names"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc 0.2.169",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+ "serde",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "oid-registry"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9"
+dependencies = [
+ "asn1-rs 0.6.2",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
+[[package]]
+name = "p384"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc 0.2.169",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pem"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
+dependencies = [
+ "base64 0.22.1",
+ "serde",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "ping"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "flarch",
+ "flmodules",
+ "log",
+ "tokio",
+ "tokio-stream",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "polyval"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "primeorder"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
+dependencies = [
+ "elliptic-curve",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quinn"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
+dependencies = [
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "socket2",
+ "thiserror 2.0.11",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
+dependencies = [
+ "bytes",
+ "getrandom 0.2.15",
+ "rand",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.11",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944"
+dependencies = [
+ "cfg_aliases",
+ "libc 0.2.169",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc 0.2.169",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "rcgen"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
+dependencies = [
+ "pem",
+ "ring",
+ "rustls-pki-types",
+ "time",
+ "x509-parser",
+ "yasna",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "reqwest"
+version = "0.12.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-rustls",
+ "tokio-util",
+ "tower",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "webpki-roots",
+ "windows-registry",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "libc 0.2.169",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
+[[package]]
+name = "rtcp"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
+dependencies = [
+ "bytes",
+ "thiserror 1.0.69",
+ "webrtc-util",
+]
+
+[[package]]
+name = "rtp"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6870f09b5db96f8b9e7290324673259fd15519ebb7d55acf8e7eb044a9ead6af"
+dependencies = [
+ "bytes",
+ "portable-atomic",
+ "rand",
+ "serde",
+ "thiserror 1.0.69",
+ "webrtc-util",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rusticata-macros"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
+dependencies = [
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
+[[package]]
+name = "ryu"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "sdp"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
+dependencies = [
+ "rand",
+ "substring",
+ "thiserror 1.0.69",
+ "url",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.8.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc 0.2.169",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+dependencies = [
+ "core-foundation-sys",
+ "libc 0.2.169",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
+
+[[package]]
+name = "serde"
+version = "1.0.217"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-wasm-bindgen"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.217"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.138"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
+dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.7.1",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+dependencies = [
+ "indexmap 1.9.3",
+ "ryu",
+ "serde",
+ "yaml-rust",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shared"
+version = "0.9.0"
+dependencies = [
+ "async-trait",
+ "flarch",
+ "flmodules",
+ "log",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-stream",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-node"
+version = "0.9.0"
+dependencies = [
+ "env_logger",
+ "flarch",
+ "flmodules",
+ "flnode",
+ "log",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+
+[[package]]
+name = "smol_str"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+dependencies = [
+ "libc 0.2.169",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "stun"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28fad383a1cc63ae141e84e48eaef44a1063e9d9e55bcb8f51a99b886486e01b"
+dependencies = [
+ "base64 0.21.7",
+ "crc",
+ "lazy_static",
+ "md-5",
+ "rand",
+ "ring",
+ "subtle",
+ "thiserror 1.0.69",
+ "tokio",
+ "url",
+ "webrtc-util",
+]
+
+[[package]]
+name = "substring"
+version = "1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "unicode-xid",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "time"
+version = "0.3.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc 0.2.169",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
+dependencies = [
+ "futures-util",
+ "log",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tungstenite",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
+dependencies = [
+ "indexmap 2.7.1",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "tungstenite"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http",
+ "httparse",
+ "log",
+ "rand",
+ "rustls",
+ "rustls-pki-types",
+ "sha1",
+ "thiserror 1.0.69",
+ "utf-8",
+]
+
+[[package]]
+name = "turn"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b000cebd930420ac1ed842c8128e3b3412512dfd5b82657eab035a3f5126acc"
+dependencies = [
+ "async-trait",
+ "base64 0.21.7",
+ "futures",
+ "log",
+ "md-5",
+ "portable-atomic",
+ "rand",
+ "ring",
+ "stun",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-util",
+ "webrtc-util",
+]
+
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "typetag"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
+
+[[package]]
+name = "typetag-impl"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "uuid"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
+dependencies = [
+ "getrandom 0.3.1",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "waitgroup"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292"
+dependencies = [
+ "atomic-waker",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "serde",
+ "serde_json",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wasm-bindgen-test"
+version = "0.3.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
+dependencies = [
+ "js-sys",
+ "minicov",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-bindgen-test-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-test-macro"
+version = "0.3.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "wasm-streams"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "wasmtimer"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
+dependencies = [
+ "futures",
+ "js-sys",
+ "parking_lot",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.26.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "webrtc"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b3a840e31c969844714f93b5a87e73ee49f3bc2a4094ab9132c69497eb31db"
+dependencies = [
+ "arc-swap",
+ "async-trait",
+ "bytes",
+ "cfg-if",
+ "hex",
+ "interceptor",
+ "lazy_static",
+ "log",
+ "portable-atomic",
+ "rand",
+ "rcgen",
+ "regex",
+ "ring",
+ "rtcp",
+ "rtp",
+ "rustls",
+ "sdp",
+ "serde",
+ "serde_json",
+ "sha2",
+ "smol_str",
+ "stun",
+ "thiserror 1.0.69",
+ "time",
+ "tokio",
+ "turn",
+ "url",
+ "waitgroup",
+ "webrtc-data",
+ "webrtc-dtls",
+ "webrtc-ice",
+ "webrtc-mdns",
+ "webrtc-media",
+ "webrtc-sctp",
+ "webrtc-srtp",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-data"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8b7c550f8d35867b72d511640adf5159729b9692899826fe00ba7fa74f0bf70"
+dependencies = [
+ "bytes",
+ "log",
+ "portable-atomic",
+ "thiserror 1.0.69",
+ "tokio",
+ "webrtc-sctp",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-dtls"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86e5eedbb0375aa04da93fc3a189b49ed3ed9ee844b6997d5aade14fc3e2c26e"
+dependencies = [
+ "aes",
+ "aes-gcm",
+ "async-trait",
+ "bincode",
+ "byteorder",
+ "cbc",
+ "ccm",
+ "der-parser 8.2.0",
+ "hkdf",
+ "hmac",
+ "log",
+ "p256",
+ "p384",
+ "portable-atomic",
+ "rand",
+ "rand_core",
+ "rcgen",
+ "ring",
+ "rustls",
+ "sec1",
+ "serde",
+ "sha1",
+ "sha2",
+ "subtle",
+ "thiserror 1.0.69",
+ "tokio",
+ "webrtc-util",
+ "x25519-dalek",
+ "x509-parser",
+]
+
+[[package]]
+name = "webrtc-ice"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4f0ca6d4df8d1bdd34eece61b51b62540840b7a000397bcfb53a7bfcf347c8"
+dependencies = [
+ "arc-swap",
+ "async-trait",
+ "crc",
+ "log",
+ "portable-atomic",
+ "rand",
+ "serde",
+ "serde_json",
+ "stun",
+ "thiserror 1.0.69",
+ "tokio",
+ "turn",
+ "url",
+ "uuid",
+ "waitgroup",
+ "webrtc-mdns",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-mdns"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
+dependencies = [
+ "log",
+ "socket2",
+ "thiserror 1.0.69",
+ "tokio",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-media"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c15b20e98167b22949abc1c20eca7c6d814307d187068fe7a48f0b87a4f6d46"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "rand",
+ "rtp",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "webrtc-sctp"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d850daa68639b9d7bb16400676e97525d1e52b15b4928240ae2ba0e849817a5"
+dependencies = [
+ "arc-swap",
+ "async-trait",
+ "bytes",
+ "crc",
+ "log",
+ "portable-atomic",
+ "rand",
+ "thiserror 1.0.69",
+ "tokio",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-srtp"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbec5da43a62c228d321d93fb12cc9b4d9c03c9b736b0c215be89d8bd0774cfe"
+dependencies = [
+ "aead",
+ "aes",
+ "aes-gcm",
+ "byteorder",
+ "bytes",
+ "ctr",
+ "hmac",
+ "log",
+ "rtcp",
+ "rtp",
+ "sha1",
+ "subtle",
+ "thiserror 1.0.69",
+ "tokio",
+ "webrtc-util",
+]
+
+[[package]]
+name = "webrtc-test-libc"
+version = "0.9.0"
+dependencies = [
+ "flarch",
+ "flmodules",
+ "log",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-stream",
+]
+
+[[package]]
+name = "webrtc-util"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc8d9bc631768958ed97b8d68b5d301e63054ae90b09083d43e2fefb939fd77e"
+dependencies = [
+ "async-trait",
+ "bitflags 1.3.2",
+ "bytes",
+ "ipnet",
+ "lazy_static",
+ "libc 0.2.169",
+ "log",
+ "nix",
+ "portable-atomic",
+ "rand",
+ "thiserror 1.0.69",
+ "tokio",
+ "winapi",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "x25519-dalek"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
+dependencies = [
+ "curve25519-dalek",
+ "rand_core",
+ "serde",
+ "zeroize",
+]
+
+[[package]]
+name = "x509-parser"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69"
+dependencies = [
+ "asn1-rs 0.6.2",
+ "data-encoding",
+ "der-parser 9.0.0",
+ "lazy_static",
+ "nom",
+ "oid-registry",
+ "ring",
+ "rusticata-macros",
+ "thiserror 1.0.69",
+ "time",
+]
+
+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
+
+[[package]]
+name = "yasna"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
+dependencies = [
+ "time",
+]
+
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 00000000..811ff59f
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,13 @@
+[workspace]
+resolver = "2"
+
+members = [
+    "test/signal-fledger",
+    "test/webrtc-libc-wasm/*",
+    "examples/ping",
+    "examples/ping-pong/libc",
+    "fl*",
+    "cli/*",
+]
+
+exclude = ["flbrowser", "test/webrtc-libc-wasm/wasm", "test/fledger-nodejs", "examples/ping-pong/wasm"]
diff --git a/DHT_STORAGE.md b/DHT_STORAGE.md
new file mode 100644
index 00000000..76e335c3
--- /dev/null
+++ b/DHT_STORAGE.md
@@ -0,0 +1,86 @@
+# DHT Storage for webpages
+
+Using the DHT storage module from fledger, you can store data in a decentralized way.
+A first use-case is to store and retrieve webpages from fledger.
+Here is how it works:
+
+1. You create a static version of your website (with [Hugo](https://gohugo.io/), [Jekyll](https://jekyllrb.com/) or others)
+2. You upload it to the fledger network
+3. Your webpage is served from your node while its online, or from other people's node when you're offline
+
+In a future version, fledger will also track how long you're online and how many other pages
+you're serving.
+This will allow a tit-for-tat sharing: the longer and the more other pages you store and serve,
+the longer other nodes wil store and serve your pages.
+
+# Exploring existing domains
+
+To upload your web page to fledger, you can simply go to the [Fledger Web](https://web.fledg.re) to connect
+as a node.
+Choose the _Manage Pages_ tab.
+Fledger will automatically choose the standard root-domain for you.
+You will see all subdomains of the root-domain available and can click
+on any of them for sub-sub domains or the homepage.
+
+## Adding your own homepage
+
+To add your own homepage, you need to create a domain for it.
+Then you can upload files and directories which will be stored
+under this domain.
+Per default, `index.html` or `index.md` is used as the homepage, but
+you can also change this.
+
+### Creating your domain
+
+Each domain can decide whether it wants to accept random sub-domains or
+whether it restricts them to the owner.
+The root-domain accepts any sub-domain, and is selected by default.
+Follow the steps to create your sob-domain and upload your page:
+
+1. Click `Add subdomain`
+2. Enter the desired name - fledger will tell you if the name is available or not
+3. Confirm with `Add`
+
+Please be aware that fledger will create a private key for protecting access to
+your domain.
+If you lose this key, you won't be able to modify the domain anymore.
+
+### Uploading your files
+
+
+
+## Private key storage
+
+The private keys created to protect your domain will be stored directly in your
+browser.
+So if you delete the `localStorage`, you will lose all your private keys and access
+to your domain!
+You can create a backup in the `Profile` tab, and store the json file somewhere safe on
+your harddisk.
+To restore a backup, you can upload it in the `Profile` tab.
+
+## Technical details
+
+Fledger does the following when you set up your own webpage:
+
+1. Creates a `Signer` and stores it locally
+1. Creates and stores an `Identity` as a `FloIdentity`
+1. Creates an `ACE` with the rules `domain.*`, `blob.*` and stores it as a `FloACE`
+1. Creates a `Domain` updatable by the `ACE`
+1. Creates a `FloBlob` with content-type `text/html` and links it with the `Domain`
+
+### Questions
+
+- should the `Domain` point to a home-page?
+- is there a need for a hierarchical storage of the FloBlobs?
+- how to discover the Domain given the name? 
+  - ID of the domain could depend on the hash of the name
+  - a separate DNS system to resolve names to IDs
+- how to discover the pages stored?
+  - Create a list of all domains if they point to a home-page
+  - the home-pages link to the other pages
+  - use sub-domains for different topics in the domains of the users
+- should there be a main-domain with given subdomains (social, blog, tests) that can
+be populated by new users?
+- how to bootstrap the system?
+  - create one page for fledger, and hardcode this ID in the fledger-binary
\ No newline at end of file
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 15fb577f..07ded2dd 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -4,7 +4,7 @@ RUN apt update && apt install -y patchelf ca-certificates
 
 WORKDIR /home
 COPY flarch ./flarch
-COPY flarch_macro ./flarch_macro
+COPY flmacro ./flmacro
 COPY flmodules ./flmodules
 COPY flnode ./flnode
 COPY cli ./cli
diff --git a/Makefile b/Makefile
index 4aad8ba1..cfdd3fcd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-CARGOS := cli/{fledger,flsignal} flarch flarch_macro flbrowser \
-			flmodules flnode test/{fledger-nodejs,signal-fledger,webrtc-libc-wasm/{libc,wasm}} \
-			examples/ping-pong/{wasm,shared,libc}
-MAKE_TESTS := test/{webrtc-libc-wasm,signal-fledger} examples/ping-pong
-CRATES := flarch_macro flarch flmodules flnode
+CARGOS := cli/{fledger,flsignal} flarch flbrowser flcrypto flmacro \
+			flmodules flnode test/signal-fledger \
+			examples/ping-pong/{shared,libc}
+MAKE_TESTS := 
+CRATES := flmacro flarch flmodules flnode
 SHELL := /bin/bash
-PKILL = @ps aux | grep "$1" | grep -v grep | awk '{print $$2}' | xargs -r kill
+PKILL = @/bin/ps aux | grep "$1" | egrep -v "(grep|vscode|rust-analyzer)" | awk '{print $$2}' | xargs -r kill
 
 cargo_check:
 	for c in ${CARGOS}; do \
@@ -87,8 +87,8 @@ build_local: build_local_web build_cli
 serve_two: kill build_cli
 	( cd cli && cargo run --bin flsignal -- -vv ) &
 	sleep 4
-	( cd cli && ( cargo run --bin fledger -- --config fledger/flnode -vv -s ws://localhost:8765 & \
-		cargo run --bin fledger -- --config fledger/flnode2 -vv -s ws://localhost:8765 & ) )
+	( cd cli && ( cargo run --bin fledger -- --config fledger/flnode --log-dht-storage -vv -s ws://localhost:8765 & \
+		cargo run --bin fledger -- --config fledger/flnode2 --log-dht-storage -vv -s ws://localhost:8765 & ) )
 
 serve_local: kill build_local_web serve_two
 	cd flbrowser && trunk serve --features local &
diff --git a/README.md b/README.md
index 07d72fe4..a8c99a14 100644
--- a/README.md
+++ b/README.md
@@ -24,10 +24,11 @@ But of course there are many more things you can do:
 
 On the technical side, Fledger has / will have:
 - Gossip-based sharing of information
+- Data storage using a distributed hash table
 - Proof-of-participation to distribute _Mana_ to participants (instead of miners)
 - Different consensus layers, depending on the need: implicit trust, ledger based
 
-So the goal is to be able to serve both short-term online users like browsers,
+The goal is to be able to serve both short-term online users like browsers,
 but also long-term users who have a server where they can run a fledger node.
 The system is set up to be 0-configuration and fast.
 
@@ -37,15 +38,28 @@ What it will never do:
 
 ## State of Fledger
 
-There has been a big rewrite of the first version of Fledger with the goal to:
-- provide libraries for the webrtc-connections
-- separate the different functionalities as standalone modules
-- start implementing a real gossip-based chat application
+As of February 2025, fledger has:
+- a generic WebRTC network library
+- gossip-based distribution of messages
+- data storage using distributed hash tables
+- a simple cryptographic layer for various types of signatures, including
+  "N out of T" signatures
 
 The code is written in a way that it can run in a wasm environment on
 browser or node, as well as in a libc environment.
 Some of the code can also be reused in other projects.
 
+### Student Semester Projects
+
+With the support from prof. Bryan Ford's [DEDIS](https://dedis.epfl.ch) lab, one semester
+student project was finished in Autumn '24, and a new one started in Spring '25:
+
+- Derya Cögendez worked on [Churning Mixers](https://c4dt.epfl.ch/wp-content/uploads/2025/01/2025-01-derya_cogendez_churning_mixers.pdf) with the experimental repo here: [student_24_fledger](https://github.com/dedis/student_24_fledger)
+- Yohan Max Abehssera started to work in Feb. 2025 on `Fair Sharing` to implement a tit-for-tat
+  sharing mechanism for the [DHTStorage](./flmodules/src/dht_storage/) module
+
+## Project Directory
+
 ### Library Crates
 
 A set of _shared_ crates implement the basic functionality, without the actual implementation
@@ -55,7 +69,7 @@ of the network code:
 - [flnode](./flnode) - a generic implementation of a fledger-node, mostly connecting all
   _flmodules_ together and with the network
 - [flarch](./flarch) - architecture dependant implementations for some async tools
-- [flarch_module](./flarch_module) - macro for easier definitions of `async_trait(?Send)`
+- [flmacro](./flmacro) - macro for easier definitions of `async_trait(?Send)`
 
 ### Binaries
 
@@ -75,13 +89,12 @@ These are the actual implementations of the WebRTC and Websocket for wasm and li
 ## Next steps
 
 The following next steps are in the pipeline:
-- Create a nicer display of the chat, perhaps with markdown display of messages
+- Create storage nodes that can serve data
 - Create a minimum consensus for people to try it out in the browser at
 https://web.fledg.re
-- Create two chains: identity chain for nodes, and a first worker chain
+- Create a nicer display of the chat, perhaps with markdown display of messages
 - Add WASM smart contracts
 - Add sharding to have more than one worker chain
-- Create storage nodes that can serve data
 
 # Running it
 
@@ -90,6 +103,20 @@ instructions.
 
 ## Running it on a server
 
+### Using Docker
+
+If you want to use docker, you can download the `docker-compose.yaml` file and use this to
+run two nodes on your server:
+
+```bash
+curl https://raw.githubusercontent.com/ineiti/fledger/refs/heads/main/examples/docker-compose/docker-compose.flnode.yaml
+docker compose up -d
+```
+
+It will initialize the servers, connect to the network, and start participating in sharing the data.
+
+### Using Devbox
+
 Supposing you have [devbox](https://www.jetify.com/devbox/docs/installing_devbox/) installed, you can run:
 
 ```bash
@@ -131,6 +158,12 @@ version of devbox.
 I suggest you use the `1YiB.rust-bundle` extension in VisualCode, which makes it easier
 to use rust.
 
+## Add new Modules
+
+If you want to add a new module, you can use the [template](./flmodules/src/template/) module
+by copying it, and changing the name.
+You will find information about how to add a new module in the [flmodules/README.md](./flmodules/README.md).
+
 # License
 
 This project is licensed under MIT or Apache2.
diff --git a/WIP.md b/WIP.md
index f9d28c69..1cd60161 100644
--- a/WIP.md
+++ b/WIP.md
@@ -1,20 +1,85 @@
 # Work in progress
 
+This file is in place of github issues, as currently I'm mostly developing on my own.
+
+## Removing Broker and replace it with BrokerIO
+
+- update documentation
+  - `flmoduls::network`
+
 ## Current high-level goal
 
+- Store a webpage in fledger
+
 ## Current concrete goal
 
+### User-facing
+
+Implement [DHT_STORAGE.md](./DHT_STORAGE.md).
+
+### DHT_storage
+
+1. Link it correctly to DHT_router
+  - implement and test the `DHTStorage(In|Out)` messages for interaction with local modules
+  - Implement and test the `MessageNodeDirect` messages to automatically update the FLOs stored
+2. Store up to 1MB of data
+3. Delete oldest/farthest data
+4. Re-arranged everything to fit it better - probably should create a diagram to make sure it
+still makes sense...
+5. Implement the case when not all Flos are stored in all nodes, searching in other nodes, synching
+   cuckoo-IDs, remove furthest (shallowest) flos if memory is full
+
+TODO:
+- verify Flos when they enter the system
+- when new FloMetas enter the system, check which are the most probable to be kept:
+  - choose the closest (with the highest depth) not-yet-stored Flos for synching
+- Add a timeout to FloCuckoos when they are purged from the system
+- Add a timeout for Flos to purge them from the system
+
+### Testing
+
+Test in `flmodules/test/webpage.rs`:
+- complete, including cuckoos, limited memory.
+Make the following tests work again:
+- `make cargo_test`
+- `examples/ping-pong`
+- `test/webrtc-libc-wasm`
+
+
+### Crypto
+
+Have working `Identities` (`Identity`), and `Condition`s.
+
+TODO:
+- finish access::test_badge
+
+### Flo
+
+Uses real signatures and verifications now
+
+TODO:
+- Clean up the mess - it's still too much stuff calling criss-cross each other.
+- Where are the Verifiers stored? 
+- There must be something shady going on with regard
+  to the verifierIDs which definitely don't match the FloID.
+- Store all necessary data for verification in the Flo itself
+
+### DHT_router
+
+-- seems to be more or less OK, at least if it's usable by DHT_storage --
+
+1. KBucket.active is only be populated once a node has been confirmed.
+  - Needs more testing if nodes fail and how they will be replaced
+
+TODO:
+- should it also store one kademlia per realm?
+  - active nodes are stored in their own vec
+  - each realm-kademlia looks in these nodes first to populate the buckets
+
 # TODO
 
 ## Features
 
-- Needed for semester project:
-  - Import library for html serving with callbacks for loading of elements
-  - Easy simulation 
-    - w/o network
-    - local network
-    - network with bw and delay -> on Deterlab
-
 ## Bugs
 
 - flmodules/web_proxy has horrible error handling - too many `expect`s
@@ -24,6 +89,11 @@
 
 ## Cleanups / improvements
 
+- flnode/src/node.rs changes:
+  - instead of calling `update`, use the `template` version with a tap and a watcher
+  - add the timer as an argument to the brokers which need it and remove the `add_timer` method
+- rewrite the flmodules/src/\*/broker.rs :
+  - move dht_storage way of broker.rs/message.rs to other brokers, too
 - yaml files are stored as .toml
   - make sure old files can be read as .toml
   - save new files as .yaml
@@ -31,16 +101,7 @@
 - serde_yaml is deprecated
   - use serde_yaml_ng with singleton_map_recursive
 - use matchbox from https://github.com/johanhelsing/matchbox
-- rewrite the flmodules/src/*/broker.rs :
-  - the returned broker should only represent the actual i/o messages
-  - add an internal message enum to separate them from the outside messages
-  - think how the `Overlay` (should be renamed to `Adapter` or so) can be
-  redone. One possibility is to have the network module using a good
-  `NetworkMessage` which includes the `NetworkWrapper` and can also be used
-  by `Random` and `Loopix`.
-    - Question: how to handle special messages then? Like asking to reshuffle
-    connections in `random` or accessing the providers in `loopix`?
-- Clean up broker / network:
+- Clean up broker:
   - Remove `Destination::{All,Others,This}` - Test it
     only `Destination::All` is ever used
   - Replace `process` with `async-task`
@@ -50,14 +111,45 @@
 
 ## Reaching out
 
-- Sign up for dev6
+Added fledger to blog: https://ineiti.ch/projects/fledger/
+
+# Some things done
+
+### Done
+- Look at all TODOs
+- make all tests pass again
+- also compile for wasm
+- replace `add_subsystem(Subsystem::Handler` with `add_handler`
+- `BrokerIO`
+  - be renamed to `Broker`? Yes
+  - look which `add_translate` are actually used
+    -    4 add_translator_dire
+    -    7 add_translator_link
+    -    4 add_translator_i_ti
+    -    19 add_translator_o_ti
+    -    4 add_translator_o_to
+  - use `add_translator_link`
+- unify `flmodules/*/broker.rs`:
+  - make sure no trailing `.into()` for the messages are left
+- unify `flmodules/*/broker.rs`:
+  - naming: is it a verb? Subject?
+  - rename `(From|To)Router` and `(From|To)*` into `Router(In|Out)` and `*(In|Out)`
+  - add `type BrokerSome = Broker<SomeIn, SomeOut>`
+  - always return a structure
+    - should it `add_translate` with a `Self::translate...` method, or in-line with `Box::new`?
+  - same functionality:
+    - structure creates broker and `add_handler` the `message` structure
+    - `message` structure takes zero or more of: config, DataStorage, `tokio::sync::watch<Stats>` and is a `Subsystem::Handler`
+    - `core` does the core business
+- [flmodules::random_connections::messages] 0x6000007c4ab0 Dropping message to unconnected node f88f09414a048f67
+  - fixed it, but there might still be some random droppings around. Keeping the log for the moment.
 
 # Dates
 
-2022-09-12:
+2024-09-12:
 - update to latest versions of wasm libraries
 
-2022-09-09:
+2024-09-09:
 - Clean up broker / network:
   - change enums with `((a, b))` arguments to simple `(a, b)` arguments
   - remove `Destination` from `SubsystemListener`
@@ -238,4 +330,4 @@
 2022-01-05:
 - moved modules to their own crate with 'raw' and 'message' modules
 - started working on the 'gossip' module
-- next steps: finish 'gossip' module as a generic module, then add the 'message' code
\ No newline at end of file
+- next steps: finish 'gossip' module as a generic module, then add the 'message' code
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
deleted file mode 100644
index 3594665d..00000000
--- a/cli/Cargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[workspace]
-
-resolver = "2"
-
-members = [
-    "fledger",
-    "flsignal",
-]
diff --git a/cli/fledger/Cargo.toml b/cli/fledger/Cargo.toml
index 7446c86f..0d13dc89 100644
--- a/cli/fledger/Cargo.toml
+++ b/cli/fledger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fledger"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 authors = ["Linus Gasser <linus@gasser.blue>"]
 description = "The fledger server as a CLI"
@@ -12,9 +12,10 @@ keywords = ["network", "signalling", "webrtc"]
 categories = ["network-programming"]
 
 [dependencies]
-flarch = { path = "../../flarch", version = "0.8" }
-flmodules = { path = "../../flmodules", version = "0.8" }
-flnode = { path = "../../flnode", version = "0.8" }
+flarch = { path = "../../flarch", version = "0.9" }
+flmodules = { path = "../../flmodules", version = "0.9" }
+flnode = { path = "../../flnode", version = "0.9" }
+flcrypto = { path = "../../flcrypto", version = "0.9" }
 
 clap = "4"
 clap-verbosity-flag = "2"
diff --git a/cli/fledger/src/main.rs b/cli/fledger/src/main.rs
index 3775de3c..b7ca5982 100644
--- a/cli/fledger/src/main.rs
+++ b/cli/fledger/src/main.rs
@@ -1,36 +1,95 @@
-use clap::Parser;
+use std::error::Error;
+
+use clap::{Parser, Subcommand};
 
 use flarch::{
     data_storage::{DataStorage, DataStorageFile},
     tasks::wait_ms,
     web_rtc::connection::{ConnectionConfig, HostLogin, Login},
 };
-use flmodules::network::{network_broker_start, signal::SIGNAL_VERSION};
+use flcrypto::access::Condition;
+use flmodules::{
+    dht_storage::core::RealmConfig,
+    flo::{crypto::Rules, realm::FloRealm},
+    network::{broker::NetworkIn, network_start, signal::SIGNAL_VERSION},
+};
 use flnode::{node::Node, version::VERSION_STRING};
 
 /// Fledger node CLI binary
 #[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
+#[command(author, version, about, long_about = None)]
 struct Args {
     /// Path to the configuration directory
-    #[clap(short, long, default_value = "./flnode")]
+    #[arg(short, long, default_value = "./flnode")]
     config: String,
 
     /// Set the name of the node - reverts to a random value if not given
-    #[clap(short, long)]
+    #[arg(short, long)]
     name: Option<String>,
 
     /// Uptime interval - to stress test disconnections
-    #[clap(short, long)]
+    #[arg(short, long)]
     uptime_sec: Option<usize>,
 
     /// Signalling server URL
-    #[clap(short, long, default_value = "wss://signal.fledg.re")]
+    #[arg(short, long, default_value = "wss://signal.fledg.re")]
     signal_url: String,
 
     /// Verbosity of the logger
     #[clap(flatten)]
     verbosity: clap_verbosity_flag::Verbosity,
+
+    /// Log frequency in seconds
+    #[arg(long, default_value = "5")]
+    log_freq: u32,
+
+    /// Log gossip messages
+    #[arg(long, default_value = "false")]
+    log_gossip: bool,
+
+    /// Log random router
+    #[arg(long, default_value = "false")]
+    log_random: bool,
+
+    /// Log countdown router
+    #[arg(long, default_value = "false")]
+    log_countdown: bool,
+
+    /// Log dht-storage stats
+    #[arg(long, default_value = "false")]
+    log_dht_storage: bool,
+
+    #[command(subcommand)]
+    command: Option<Commands>,
+}
+
+#[derive(Subcommand, Debug)]
+enum Commands {
+    /// Handles Realms
+    Realm {
+        #[command(subcommand)]
+        command: RealmCommands,
+    },
+    /// Lists cryptographic keys stored
+    Crypto {},
+    /// Prints the statistics of the different modules and then quits
+    Stats {},
+}
+
+#[derive(Subcommand, Debug)]
+enum RealmCommands {
+    /// List available realms
+    List,
+    /// Creates a new realm
+    Create {
+        /// The name of the new realm.
+        name: String,
+        /// The maximum size of the sum of all the objects in the realm. The actual
+        /// size will be bigger, as the data is serialized.
+        max_space: Option<u64>,
+        /// The maximum size of a single object in this realm.
+        max_flo_size: Option<u32>,
+    },
 }
 
 #[tokio::main]
@@ -38,13 +97,15 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let args = Args::parse();
 
     let mut logger = env_logger::Builder::new();
-    logger.filter_module("fl", args.verbosity.log_level_filter());
+    logger.filter_module("fl", args.verbosity.clone().log_level_filter());
     logger.parse_env("RUST_LOG");
     logger.try_init().expect("Failed to initialize logger");
 
-    let storage = DataStorageFile::new(args.config, "fledger".into());
-    let mut node_config = Node::get_config(storage.clone())?;
-    args.name.map(|name| node_config.info.name = name);
+    let storage = DataStorageFile::new(args.config.clone(), "fledger".into());
+    let mut node_config = Node::get_config(storage.clone_box())?;
+    args.name
+        .as_ref()
+        .map(|name| node_config.info.name = name.clone());
 
     log::info!(
         "Starting app with version {}/{}",
@@ -53,10 +114,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     );
 
     log::debug!("Connecting to websocket at {}", args.signal_url);
-    let network = network_broker_start(
+    let network = network_start(
         node_config.clone(),
         ConnectionConfig::new(
-            Some(args.signal_url),
+            Some(args.signal_url.clone()),
             None,
             Some(HostLogin {
                 url: "turn:web.fledg.re:3478".into(),
@@ -68,28 +129,147 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         ),
     )
     .await?;
-    let mut node = Node::start(Box::new(storage), node_config, network).await?;
+    let mut node = Node::start(Box::new(storage), node_config, network.broker).await?;
     let nc = &node.node_config.info;
-    log::info!("Starting node {}: {}", nc.get_id(), nc.name);
+    log::info!("Started node {}: {}", nc.get_id(), nc.name);
+
+    match &args.command {
+        Some(cmd) => match cmd {
+            Commands::Realm { command } => match command {
+                RealmCommands::List => list_realms(node, args).await?,
+                RealmCommands::Create {
+                    name,
+                    max_space,
+                    max_flo_size,
+                } => {
+                    log::info!("{name} / {max_space:?} / {max_flo_size:?}");
+                    let fr = FloRealm::new(
+                        name,
+                        Rules::Update(Condition::Verifier(
+                            node.crypto_storage
+                                .get_signer()
+                                .as_ref()
+                                .verifier()
+                                .get_id(),
+                        )),
+                        RealmConfig {
+                            max_space: max_space.unwrap_or(1000000),
+                            max_flo_size: max_flo_size.unwrap_or(10000),
+                        },
+                    )?;
+
+                    log::info!("Connecting to other nodes");
+                    loop_node(&mut node, Some(&args), Some(2)).await?;
+
+                    let mut ds = node.dht_storage.as_mut().expect("Need DHT-Storage").clone();
+                    ds.store_flo(fr.into())?;
+                    ds.propagate()?;
 
-    log::info!("Started successfully");
-    let mut i: i32 = 0;
+                    list_realms(node, args).await?;
+                }
+            },
+            Commands::Crypto {} => todo!(),
+            Commands::Stats {} => todo!(),
+        },
+        None => loop_node(&mut node, Some(&args), None).await?,
+    }
+
+    Ok(())
+}
+
+async fn list_realms(mut node: Node, args: Args) -> Result<(), Box<dyn Error>> {
+    let mut ds = node.dht_storage.as_mut().expect("Need DHT-Storage").clone();
+    log::info!("Waiting for update of data");
+    loop_node(&mut node, Some(&args), Some(20)).await?;
+    log::info!("Requesting sync of DHT-storage and waiting for answers");
+    ds.sync()?;
+    ds.propagate()?;
+    loop_node(&mut node, Some(&args), Some(2)).await?;
+    let rids = ds.get_realm_ids().await?;
+    if rids.len() == 0 {
+        log::info!("No realms found.");
+        return Ok(());
+    }
+    log::info!(
+        "Realm-IDs are: {}",
+        rids.iter()
+            .map(|rid| format!("{rid}"))
+            .collect::<Vec<_>>()
+            .join(" :: ")
+    );
+
+    Ok(())
+}
+
+async fn loop_node(
+    node: &mut Node,
+    args: Option<&Args>,
+    max_count: Option<u32>,
+) -> Result<(), Box<dyn Error>> {
+    let mut i: u32 = 0;
+    node.broker_net
+        .emit_msg_in(NetworkIn::WSUpdateListRequest)?;
     loop {
         i += 1;
-        node.process()
-            .await
-            .err()
-            .map(|e| log::warn!("Couldn't process node: {e:?}"));
-
-        if i % 3 == 2 {
-            log::info!("Nodes are: {:?}", node.nodes_online()?);
-            let ping = &node.ping.as_ref().unwrap().storage;
-            log::info!("Nodes countdowns are: {:?}", ping.stats);
-            log::debug!(
-                "Chat messages are: {:?}",
-                node.gossip.as_ref().unwrap().chat_events()
-            );
-        }
+
         wait_ms(1000).await;
+
+        if let Some(a) = args.as_ref() {
+            a.log(i, node).await?;
+        }
+
+        if let Some(c) = max_count.as_ref() {
+            if c < &i {
+                return Ok(());
+            }
+        }
+    }
+}
+
+impl Args {
+    async fn log(&self, i: u32, node: &mut Node) -> Result<(), Box<dyn Error>> {
+        if i % self.log_freq == self.log_freq - 1 {
+            if self.log_random {
+                log::info!(
+                    "Nodes are: {}",
+                    node.nodes_online()?
+                        .iter()
+                        .map(|n| format!("{}/{}", n.name, n.get_id()))
+                        .collect::<Vec<_>>()
+                        .join(" - ")
+                );
+            }
+
+            if self.log_countdown {
+                let ping = &node.ping.as_ref().unwrap().storage.borrow();
+                log::info!("Nodes countdowns are: {:?}", ping.stats);
+            }
+
+            if self.log_gossip {
+                log::debug!(
+                    "Chat messages are: {:?}",
+                    node.gossip.as_ref().unwrap().chat_events()
+                );
+            }
+
+            if self.log_dht_storage {
+                if let Some(ds) = node.dht_storage.as_mut() {
+                    let rids = ds.get_realm_ids().await?;
+                    if rids.len() == 0 {
+                        log::info!("No realms found.");
+                        return Ok(());
+                    }
+                    log::info!(
+                        "Realm-IDs are: {}",
+                        rids.iter()
+                            .map(|rid| format!("{rid}"))
+                            .collect::<Vec<_>>()
+                            .join(" :: ")
+                    );
+                }
+            }
+        }
+
+        Ok(())
     }
 }
diff --git a/cli/flsignal/Cargo.toml b/cli/flsignal/Cargo.toml
index e67e91b0..359dc4c2 100644
--- a/cli/flsignal/Cargo.toml
+++ b/cli/flsignal/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flsignal"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 authors = ["Linus Gasser <linus@gasser.blue>"]
 description = "The signalling server as a CLI"
@@ -12,8 +12,8 @@ keywords = ["network", "signalling", "webrtc"]
 categories = ["network-programming"]
 
 [dependencies]
-flmodules = {path = "../../flmodules", version = "0.8"}
-flarch = {path = "../../flarch", version = "0.8"}
+flmodules = {path = "../../flmodules", version = "0.9"}
+flarch = {path = "../../flarch", version = "0.9"}
 
 clap = "4"
 clap-verbosity-flag = "2"
diff --git a/cli/flsignal/src/main.rs b/cli/flsignal/src/main.rs
index 0858b7ac..691eddac 100644
--- a/cli/flsignal/src/main.rs
+++ b/cli/flsignal/src/main.rs
@@ -1,6 +1,6 @@
 use clap::Parser;
-use flmodules::network::signal::{SignalServer, SignalMessage, SignalOutput};
 use flarch::web_rtc::web_socket_server::WebSocketServer;
+use flmodules::network::signal::{SignalOut, SignalServer};
 
 /// Fledger signalling server
 #[derive(Parser, Debug)]
@@ -22,12 +22,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let wss = WebSocketServer::new(8765).await?;
     let mut signal_server = SignalServer::new(wss, 2).await?;
-    let (msgs, _) = signal_server.get_tap_sync().await?;
+    let (msgs, _) = signal_server.get_tap_out_sync().await?;
 
     log::info!("Started listening on port 8765");
     for msg in msgs {
         log::debug!("{:?}", msg);
-        if matches!(msg, SignalMessage::Output(SignalOutput::Stopped)) {
+        if matches!(msg, SignalOut::Stopped) {
             log::error!("Server stopped working - exiting");
             return Ok(());
         }
diff --git a/devbox.json b/devbox.json
index b4bbf376..0bb524d8 100644
--- a/devbox.json
+++ b/devbox.json
@@ -20,13 +20,12 @@
     "trunk":     "latest",
     "wasm-pack": "latest",
     "nodejs":    "18",
-    "procps":    "latest",
     "vscode":    "latest"
   },
   "shell": {
     "init_hook": [
-      "if [ ! -d $RUSTUP_HOME/toolchains/stable* ]; then rustup default stable; fi",
-      "if [ ! -d $RUSTUP_HOME/toolchains/stable*/lib/rustlib/wasm32-unknown-unknown ]; then rustup target add wasm32-unknown-unknown; fi",
+      "if [ -z \"$(echo $RUSTUP_HOME/toolchains/stable*)\" ]; then rustup default stable; fi",
+      "if [ -z \"$(echo $RUSTUP_HOME/toolchains/stable*/lib/rustlib/wasm32-unknown-unknown)\" ]; then rustup target add wasm32-unknown-unknown; fi",
       "alias ls='ls --color'"
     ],
     "scripts": {
@@ -35,6 +34,12 @@
       ],
       "fledger": [
         "cd cli && cargo run -p fledger"
+      ],
+      "code": [
+        "Code --user-data-dir .vscode ."
+      ],
+      "clean": [
+  "make clean"
       ]
     }
   },
diff --git a/devbox.lock b/devbox.lock
index 89366eb1..e6e998b7 100644
--- a/devbox.lock
+++ b/devbox.lock
@@ -3,346 +3,342 @@
   "packages": {
     "darwin.apple_sdk.frameworks.CoreServices": {
       "resolved": "github:NixOS/nixpkgs/75a52265bda7fd25e06e3a67dee3f0354e73243c#darwin.apple_sdk.frameworks.CoreServices",
-      "source": "nixpkg"
+      "source": "nixpkg",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "path": "/nix/store/j343fncqfbb6wdlrwj6dnfmvx4hi1zki-apple-framework-CoreServices-11.0.0",
+              "default": true
+            }
+          ]
+        }
+      }
     },
     "darwin.apple_sdk.frameworks.Security": {
       "resolved": "github:NixOS/nixpkgs/75a52265bda7fd25e06e3a67dee3f0354e73243c#darwin.apple_sdk.frameworks.Security",
-      "source": "nixpkg"
+      "source": "nixpkg",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "path": "/nix/store/9jbhn62ld50znjqxll0q5gq9i4disc1s-apple-framework-Security-11.0.0",
+              "default": true
+            }
+          ]
+        }
+      }
     },
     "darwin.apple_sdk.frameworks.SystemConfiguration": {
       "resolved": "github:NixOS/nixpkgs/75a52265bda7fd25e06e3a67dee3f0354e73243c#darwin.apple_sdk.frameworks.SystemConfiguration",
-      "source": "nixpkg"
+      "source": "nixpkg",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "path": "/nix/store/jaxmz1dvsz8il7nkxwzw8xfxac3sfz5v-apple-framework-SystemConfiguration-11.0.0",
+              "default": true
+            }
+          ]
+        }
+      }
     },
     "git@latest": {
-      "last_modified": "2024-08-14T11:41:26Z",
-      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#git",
+      "last_modified": "2025-02-07T11:26:36Z",
+      "resolved": "github:NixOS/nixpkgs/d98abf5cf5914e5e4e9d57205e3af55ca90ffc1d#git",
       "source": "devbox-search",
-      "version": "2.45.2",
+      "version": "2.47.2",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/0hiwlijxhs9mvigjfsggl5rkr4gpk52q-git-2.45.2",
+              "path": "/nix/store/9z3jhc0rlj3zaw8nd1zka9vli6w0q11g-git-2.47.2",
               "default": true
             },
             {
               "name": "doc",
-              "path": "/nix/store/rfzz8cr3hsk7gr35dk7hcbrfyqyxjibn-git-2.45.2-doc"
+              "path": "/nix/store/rh151iwgy4h8yv8kxd5facw57cyj0bav-git-2.47.2-doc"
             }
           ],
-          "store_path": "/nix/store/0hiwlijxhs9mvigjfsggl5rkr4gpk52q-git-2.45.2"
+          "store_path": "/nix/store/9z3jhc0rlj3zaw8nd1zka9vli6w0q11g-git-2.47.2"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/psrwvc0d56phgxn35dam0mkl6793ii4m-git-2.45.2",
+              "path": "/nix/store/gx5y37qcfqdvn0h6swjd04dmqjjh3nk7-git-2.47.2",
               "default": true
             },
             {
               "name": "debug",
-              "path": "/nix/store/5hhh66s7rvqj321mp6dqshsrh16prycr-git-2.45.2-debug"
+              "path": "/nix/store/8vfpmf3vjgzl2psip76p0f9h11sb6y3p-git-2.47.2-debug"
             },
             {
               "name": "doc",
-              "path": "/nix/store/xymplxcmd2snjikl6z7i45v2mrn1ghbl-git-2.45.2-doc"
+              "path": "/nix/store/c25mq3q83dvw3k5pb0qr5333g3cycylq-git-2.47.2-doc"
             }
           ],
-          "store_path": "/nix/store/psrwvc0d56phgxn35dam0mkl6793ii4m-git-2.45.2"
+          "store_path": "/nix/store/gx5y37qcfqdvn0h6swjd04dmqjjh3nk7-git-2.47.2"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/82ibhj1j82f19d4vwn7z88c9b1zg7xxa-git-2.45.2",
+              "path": "/nix/store/39xx5gx3hxigs1b5ldw5i2jr84vsn3rf-git-2.47.2",
               "default": true
             },
             {
               "name": "doc",
-              "path": "/nix/store/z8q4agw3vfj7vlix8ppswrz900i6bsn3-git-2.45.2-doc"
+              "path": "/nix/store/xmh2djjrnbpiqqgpblrcbavnqh0nv4km-git-2.47.2-doc"
             }
           ],
-          "store_path": "/nix/store/82ibhj1j82f19d4vwn7z88c9b1zg7xxa-git-2.45.2"
+          "store_path": "/nix/store/39xx5gx3hxigs1b5ldw5i2jr84vsn3rf-git-2.47.2"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/p45c31p2qhwjy4vf60v2d2mw9bvvpb67-git-2.45.2",
+              "path": "/nix/store/33g65w5cc9n8fr0hxj84282xmv4l7hyl-git-2.47.2",
               "default": true
             },
             {
               "name": "debug",
-              "path": "/nix/store/avmjkyw7m8qj9ylbziwigahmcyrgyxig-git-2.45.2-debug"
+              "path": "/nix/store/jyz4nvcd3bci4vg2sfsmvrq0fp9mzr5a-git-2.47.2-debug"
             },
             {
               "name": "doc",
-              "path": "/nix/store/qlc68q98b3q3nd7prbdmkmm133vy2bf1-git-2.45.2-doc"
+              "path": "/nix/store/lb4nipdhlwrxdavz7gdkcik6lkz3cbdm-git-2.47.2-doc"
             }
           ],
-          "store_path": "/nix/store/p45c31p2qhwjy4vf60v2d2mw9bvvpb67-git-2.45.2"
+          "store_path": "/nix/store/33g65w5cc9n8fr0hxj84282xmv4l7hyl-git-2.47.2"
         }
       }
     },
+    "github:NixOS/nixpkgs/nixpkgs-unstable": {
+      "resolved": "github:NixOS/nixpkgs/2d068ae5c6516b2d04562de50a58c682540de9bf?lastModified=1740303746&narHash=sha256-XcdiWLEhjJkMxDLKQJ0CCivmYYCvA5MDxu9pMybM5kM%3D"
+    },
     "less@latest": {
-      "last_modified": "2024-08-14T11:41:26Z",
-      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#less",
+      "last_modified": "2025-02-07T11:26:36Z",
+      "resolved": "github:NixOS/nixpkgs/d98abf5cf5914e5e4e9d57205e3af55ca90ffc1d#less",
       "source": "devbox-search",
-      "version": "661",
+      "version": "668",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/jprg2czvy02z67zlz7r3g89m9l96xcj1-less-661",
+              "path": "/nix/store/0jvdg8qg5qf2hzslmyz4wlkvqxcfxz6p-less-668",
               "default": true
             },
             {
               "name": "man",
-              "path": "/nix/store/rcl5xwskryz2ydcv1bildcqp0qhbrdcp-less-661-man",
+              "path": "/nix/store/yk2cm7hrvkc2mcs9xn87lv3plqz1z8v2-less-668-man",
               "default": true
             }
           ],
-          "store_path": "/nix/store/jprg2czvy02z67zlz7r3g89m9l96xcj1-less-661"
+          "store_path": "/nix/store/0jvdg8qg5qf2hzslmyz4wlkvqxcfxz6p-less-668"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/7vw2q5m7qwam9cq5ix0sa81wvpxbv4n4-less-661",
+              "path": "/nix/store/l315xw99jm53gh1jin0h4xrq5knj4dr9-less-668",
               "default": true
             },
             {
               "name": "man",
-              "path": "/nix/store/jj5yk5fksw867y8pchi0d64vz7v0rrgs-less-661-man",
+              "path": "/nix/store/pxmsqna2cz6s5qcbcca167q2p1d4ifnz-less-668-man",
               "default": true
             }
           ],
-          "store_path": "/nix/store/7vw2q5m7qwam9cq5ix0sa81wvpxbv4n4-less-661"
+          "store_path": "/nix/store/l315xw99jm53gh1jin0h4xrq5knj4dr9-less-668"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/wbzfabi4grgl5dircjhf95crawj5f9xp-less-661",
+              "path": "/nix/store/w6pfdkm418p93d4s3lhpzrd6ab6l8sfx-less-668",
               "default": true
             },
             {
               "name": "man",
-              "path": "/nix/store/3ydhdnyb3icxaxsx282vpzad2pxcr6i5-less-661-man",
+              "path": "/nix/store/3kgsi6m4gfpcnbpq7x4dzhbl24i9vbd0-less-668-man",
               "default": true
             }
           ],
-          "store_path": "/nix/store/wbzfabi4grgl5dircjhf95crawj5f9xp-less-661"
+          "store_path": "/nix/store/w6pfdkm418p93d4s3lhpzrd6ab6l8sfx-less-668"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/1hjy5536gvxs11hkzb13f1mwm2p5zjv6-less-661",
+              "path": "/nix/store/m3ddz9mas3cqcx9500rqn59y0f7q9ykd-less-668",
               "default": true
             },
             {
               "name": "man",
-              "path": "/nix/store/0rca3is3i18wv1masgm69nv06d1v3wld-less-661-man",
+              "path": "/nix/store/b60916dlncr25cw15hiy3kzm5x6qgl6b-less-668-man",
               "default": true
             }
           ],
-          "store_path": "/nix/store/1hjy5536gvxs11hkzb13f1mwm2p5zjv6-less-661"
+          "store_path": "/nix/store/m3ddz9mas3cqcx9500rqn59y0f7q9ykd-less-668"
         }
       }
     },
     "libiconv@latest": {
-      "last_modified": "2024-08-14T11:41:26Z",
-      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#libiconv",
+      "last_modified": "2025-02-07T11:26:36Z",
+      "resolved": "github:NixOS/nixpkgs/d98abf5cf5914e5e4e9d57205e3af55ca90ffc1d#libiconv",
       "source": "devbox-search",
-      "version": "99",
+      "version": "2.40",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
-              "name": "out",
-              "path": "/nix/store/4m2zvl17xzbsbpnlgisl5mnwn2d5gdd6-libiconv-99",
+              "path": "/nix/store/msf2qxhv4971d669lmmjfp7kynj34jsy-libiconv-107",
               "default": true
-            },
+            }
+          ]
+        },
+        "aarch64-linux": {
+          "outputs": [
             {
-              "name": "dev",
-              "path": "/nix/store/p8br93anpjh80j2fli7sj4bxf58fxysi-libiconv-99-dev"
+              "name": "out",
+              "path": "/nix/store/pgx7xylvqxbz6npcykm0wvbldv3pa3xd-glibc-iconv-2.40",
+              "default": true
             }
           ],
-          "store_path": "/nix/store/4m2zvl17xzbsbpnlgisl5mnwn2d5gdd6-libiconv-99"
+          "store_path": "/nix/store/pgx7xylvqxbz6npcykm0wvbldv3pa3xd-glibc-iconv-2.40"
         },
-        "x86_64-darwin": {
+        "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/pm7prf7lkm7nqy91ywxmvm2s48v4dqlj-libiconv-99",
+              "path": "/nix/store/ir5078058nmc9rx6w0r4mk7jkzqxjqsz-glibc-iconv-2.40",
               "default": true
-            },
-            {
-              "name": "dev",
-              "path": "/nix/store/r8ag21rmf0v0w696q0axch6k9l1dy8wh-libiconv-99-dev"
             }
           ],
-          "store_path": "/nix/store/pm7prf7lkm7nqy91ywxmvm2s48v4dqlj-libiconv-99"
+          "store_path": "/nix/store/ir5078058nmc9rx6w0r4mk7jkzqxjqsz-glibc-iconv-2.40"
         }
       }
     },
     "nodejs@18": {
-      "last_modified": "2024-08-14T11:41:26Z",
+      "last_modified": "2025-02-07T11:26:36Z",
       "plugin_version": "0.0.2",
-      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#nodejs_18",
+      "resolved": "github:NixOS/nixpkgs/d98abf5cf5914e5e4e9d57205e3af55ca90ffc1d#nodejs_18",
       "source": "devbox-search",
-      "version": "18.20.4",
+      "version": "18.20.6",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/jv2bz2b2pb2iy2q2i5r05b795fqvwai2-nodejs-18.20.4",
+              "path": "/nix/store/23bg0nd47da73sgljxizkg7v9khdw4az-nodejs-18.20.6",
               "default": true
             },
             {
               "name": "libv8",
-              "path": "/nix/store/pzm8crfgfkxrrp459wh3bd7mdlwq8nfs-nodejs-18.20.4-libv8"
+              "path": "/nix/store/dvrqs027ljiya83mys1qv08cjc6fc4h0-nodejs-18.20.6-libv8"
             }
           ],
-          "store_path": "/nix/store/jv2bz2b2pb2iy2q2i5r05b795fqvwai2-nodejs-18.20.4"
+          "store_path": "/nix/store/23bg0nd47da73sgljxizkg7v9khdw4az-nodejs-18.20.6"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/d4jkkmx440krdz5izfy4kbwn3fpx69yp-nodejs-18.20.4",
+              "path": "/nix/store/v9w21arqydxj1hnswv31l2vk7q3cdqq3-nodejs-18.20.6",
               "default": true
             },
             {
               "name": "libv8",
-              "path": "/nix/store/hl54kkx0ydb2hx75ni1l1fr7d0kgxazy-nodejs-18.20.4-libv8"
+              "path": "/nix/store/aikhb8l9qdq6f2fvgcjh6n97y9l6lnrw-nodejs-18.20.6-libv8"
             }
           ],
-          "store_path": "/nix/store/d4jkkmx440krdz5izfy4kbwn3fpx69yp-nodejs-18.20.4"
+          "store_path": "/nix/store/v9w21arqydxj1hnswv31l2vk7q3cdqq3-nodejs-18.20.6"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/r0lkisl0y12p585lfa6a1c0h12zksz10-nodejs-18.20.4",
+              "path": "/nix/store/812qxhp3sz2ilhg9fs02ckbmwpchxd17-nodejs-18.20.6",
               "default": true
             },
             {
               "name": "libv8",
-              "path": "/nix/store/8msf26g4k1j98sfsdyivmjndp2bapdxf-nodejs-18.20.4-libv8"
+              "path": "/nix/store/vwsmzjxmygvkz87v8bz2smvwhxzvsdds-nodejs-18.20.6-libv8"
             }
           ],
-          "store_path": "/nix/store/r0lkisl0y12p585lfa6a1c0h12zksz10-nodejs-18.20.4"
+          "store_path": "/nix/store/812qxhp3sz2ilhg9fs02ckbmwpchxd17-nodejs-18.20.6"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/k9pq7ijgg6jjynmkcn4radvm5pqrrndk-nodejs-18.20.4",
+              "path": "/nix/store/qwzy9qniaywm3dm162si7qvivhqvg5r0-nodejs-18.20.6",
               "default": true
             },
             {
               "name": "libv8",
-              "path": "/nix/store/da3ndzam8hfjd2ad47ddlyzglb71jxaf-nodejs-18.20.4-libv8"
+              "path": "/nix/store/las0nz6smawdmbrgf4z244v96wpixfzk-nodejs-18.20.6-libv8"
             }
           ],
-          "store_path": "/nix/store/k9pq7ijgg6jjynmkcn4radvm5pqrrndk-nodejs-18.20.4"
+          "store_path": "/nix/store/qwzy9qniaywm3dm162si7qvivhqvg5r0-nodejs-18.20.6"
         }
       }
     },
     "openssh@latest": {
-      "last_modified": "2024-08-14T11:41:26Z",
-      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#openssh",
+      "last_modified": "2025-02-07T11:26:36Z",
+      "resolved": "github:NixOS/nixpkgs/d98abf5cf5914e5e4e9d57205e3af55ca90ffc1d#openssh",
       "source": "devbox-search",
-      "version": "9.8p1",
+      "version": "9.9p1",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/yizghhxlspvaszsi4mqnm1sijj1wf6s3-openssh-9.8p1",
+              "path": "/nix/store/ar51njp80pmn8vccn0jpqa221wbjfcnc-openssh-9.9p1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/yizghhxlspvaszsi4mqnm1sijj1wf6s3-openssh-9.8p1"
+          "store_path": "/nix/store/ar51njp80pmn8vccn0jpqa221wbjfcnc-openssh-9.9p1"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/jgvb9mpfyrl0kc1adfx38dsgf8x33w11-openssh-9.8p1",
+              "path": "/nix/store/012rmzna0ji4srjqk8g6j2i0b74zw4im-openssh-9.9p1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/jgvb9mpfyrl0kc1adfx38dsgf8x33w11-openssh-9.8p1"
+          "store_path": "/nix/store/012rmzna0ji4srjqk8g6j2i0b74zw4im-openssh-9.9p1"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/h3q7k4lq8bsxpj87768l092yp1lrp0lm-openssh-9.8p1",
-              "default": true
-            }
-          ],
-          "store_path": "/nix/store/h3q7k4lq8bsxpj87768l092yp1lrp0lm-openssh-9.8p1"
-        },
-        "x86_64-linux": {
-          "outputs": [
-            {
-              "name": "out",
-              "path": "/nix/store/qsl95d22jgnvd2z6l8lkfwbj1gkvim6p-openssh-9.8p1",
-              "default": true
-            }
-          ],
-          "store_path": "/nix/store/qsl95d22jgnvd2z6l8lkfwbj1gkvim6p-openssh-9.8p1"
-        }
-      }
-    },
-    "procps@latest": {
-      "last_modified": "2024-08-14T11:41:26Z",
-      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#procps",
-      "source": "devbox-search",
-      "version": "3.3.17",
-      "systems": {
-        "aarch64-darwin": {
-          "outputs": [
-            {
-              "name": "2008",
-              "path": "/nix/store/r2bmahj4d1r76r7sggc2k0s1p02sp1gp-procps-1003.1-2008",
-              "default": true
-            }
-          ]
-        },
-        "aarch64-linux": {
-          "outputs": [
-            {
-              "name": "out",
-              "path": "/nix/store/qywfynbhf6vh3a37n3512ncrkhzsxmf1-procps-3.3.17",
+              "path": "/nix/store/nfrhrdqg4dczzc42anm6inwig6fawag0-openssh-9.9p1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/qywfynbhf6vh3a37n3512ncrkhzsxmf1-procps-3.3.17"
+          "store_path": "/nix/store/nfrhrdqg4dczzc42anm6inwig6fawag0-openssh-9.9p1"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/rcqvjqwjf8x08p94i689gqd2ga49xqn6-procps-3.3.17",
+              "path": "/nix/store/32s39mc064nvfvmd9daj0s3pqmsfgwj3-openssh-9.9p1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/rcqvjqwjf8x08p94i689gqd2ga49xqn6-procps-3.3.17"
+          "store_path": "/nix/store/32s39mc064nvfvmd9daj0s3pqmsfgwj3-openssh-9.9p1"
         }
       }
     },
     "rustup@latest": {
-      "last_modified": "2024-08-14T11:41:26Z",
+      "last_modified": "2025-02-07T11:26:36Z",
       "plugin_version": "0.0.1",
-      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#rustup",
+      "resolved": "github:NixOS/nixpkgs/d98abf5cf5914e5e4e9d57205e3af55ca90ffc1d#rustup",
       "source": "devbox-search",
       "version": "1.27.1",
       "systems": {
@@ -350,259 +346,259 @@
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/8n1fnihj1lxgwj2gmk54nwshv37d67a4-rustup-1.27.1",
+              "path": "/nix/store/9b8v9lji5gjw5cj7f2nv3l184zyg0m3a-rustup-1.27.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/8n1fnihj1lxgwj2gmk54nwshv37d67a4-rustup-1.27.1"
+          "store_path": "/nix/store/9b8v9lji5gjw5cj7f2nv3l184zyg0m3a-rustup-1.27.1"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/bzmspl6g6lxgqpg64mmbn1q8306rbxn1-rustup-1.27.1",
+              "path": "/nix/store/d2g7zcymlvc5cjqcdpbqgrzzg2swwzik-rustup-1.27.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/bzmspl6g6lxgqpg64mmbn1q8306rbxn1-rustup-1.27.1"
+          "store_path": "/nix/store/d2g7zcymlvc5cjqcdpbqgrzzg2swwzik-rustup-1.27.1"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/6plkfpnj2zvn5dq6ln8r7jh40w7230jh-rustup-1.27.1",
+              "path": "/nix/store/pxbbd2112rlz283k82rsk0mfc9bw0jkb-rustup-1.27.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/6plkfpnj2zvn5dq6ln8r7jh40w7230jh-rustup-1.27.1"
+          "store_path": "/nix/store/pxbbd2112rlz283k82rsk0mfc9bw0jkb-rustup-1.27.1"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/sd66x947abmdpga7b148khk9i4g7kv43-rustup-1.27.1",
+              "path": "/nix/store/dqz7ghl1i46i8nswvkkl3h3jbhxkbchg-rustup-1.27.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/sd66x947abmdpga7b148khk9i4g7kv43-rustup-1.27.1"
+          "store_path": "/nix/store/dqz7ghl1i46i8nswvkkl3h3jbhxkbchg-rustup-1.27.1"
         }
       }
     },
     "trunk@latest": {
-      "last_modified": "2024-08-14T11:41:26Z",
-      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#trunk",
+      "last_modified": "2025-02-12T00:10:52Z",
+      "resolved": "github:NixOS/nixpkgs/83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4#trunk",
       "source": "devbox-search",
-      "version": "0.20.3",
+      "version": "0.21.7",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/8rrdnm5vqd9v61rbxhkrgycbfwjiaykn-trunk-0.20.3",
+              "path": "/nix/store/p1k7f2fp7zx200qrirbrbzanxajy4f2q-trunk-0.21.7",
               "default": true
             }
           ],
-          "store_path": "/nix/store/8rrdnm5vqd9v61rbxhkrgycbfwjiaykn-trunk-0.20.3"
+          "store_path": "/nix/store/p1k7f2fp7zx200qrirbrbzanxajy4f2q-trunk-0.21.7"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/p0wh838rak0aq1aply7hjnz9f4a8r66z-trunk-0.20.3",
+              "path": "/nix/store/4j8cflpbph3m8kgxwjwcvjsr7i8w855r-trunk-0.21.7",
               "default": true
             }
           ],
-          "store_path": "/nix/store/p0wh838rak0aq1aply7hjnz9f4a8r66z-trunk-0.20.3"
+          "store_path": "/nix/store/4j8cflpbph3m8kgxwjwcvjsr7i8w855r-trunk-0.21.7"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/diii5lz9k4nnkgwga1k7biir6dhyh7kn-trunk-0.20.3",
+              "path": "/nix/store/8wfpm2a776zicab7i6bgbmw9q7rwkk05-trunk-0.21.7",
               "default": true
             }
           ],
-          "store_path": "/nix/store/diii5lz9k4nnkgwga1k7biir6dhyh7kn-trunk-0.20.3"
+          "store_path": "/nix/store/8wfpm2a776zicab7i6bgbmw9q7rwkk05-trunk-0.21.7"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/18lj5w1529n3m4znq7k9mq98nd4lxny1-trunk-0.20.3",
+              "path": "/nix/store/a8k6ggnqmv9dzdggxs4krbgcgq6x9s14-trunk-0.21.7",
               "default": true
             }
           ],
-          "store_path": "/nix/store/18lj5w1529n3m4znq7k9mq98nd4lxny1-trunk-0.20.3"
+          "store_path": "/nix/store/a8k6ggnqmv9dzdggxs4krbgcgq6x9s14-trunk-0.21.7"
         }
       }
     },
     "vim@latest": {
-      "last_modified": "2024-08-14T11:41:26Z",
-      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#vim",
+      "last_modified": "2025-02-07T11:26:36Z",
+      "resolved": "github:NixOS/nixpkgs/d98abf5cf5914e5e4e9d57205e3af55ca90ffc1d#vim",
       "source": "devbox-search",
-      "version": "9.1.0595",
+      "version": "9.1.1046",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/s7arni8gjj5b77sw1qv8xpklqazcx9yd-vim-9.1.0595",
+              "path": "/nix/store/rx2i32cjx1y09n3qr5939xxfqjpkrhsr-vim-9.1.1046",
               "default": true
             },
             {
               "name": "xxd",
-              "path": "/nix/store/6i7lgynna1bk44319xiap4a7ymi9v2fm-vim-9.1.0595-xxd",
+              "path": "/nix/store/kbq8w3npsqgdipxc3ml57z67s0gn95yf-vim-9.1.1046-xxd",
               "default": true
             }
           ],
-          "store_path": "/nix/store/s7arni8gjj5b77sw1qv8xpklqazcx9yd-vim-9.1.0595"
+          "store_path": "/nix/store/rx2i32cjx1y09n3qr5939xxfqjpkrhsr-vim-9.1.1046"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/r1b7bp9bn00mx6zp6nziwhv6c9a9zpl7-vim-9.1.0595",
+              "path": "/nix/store/j67dghzznffvqvdg4q676ygw2pif1hw9-vim-9.1.1046",
               "default": true
             },
             {
               "name": "xxd",
-              "path": "/nix/store/5hbsr0fzs0qg7kadbccmkd67ib3chs7p-vim-9.1.0595-xxd",
+              "path": "/nix/store/0jh6sz9n3hrx7rnb44fq3xngya14ds4j-vim-9.1.1046-xxd",
               "default": true
             }
           ],
-          "store_path": "/nix/store/r1b7bp9bn00mx6zp6nziwhv6c9a9zpl7-vim-9.1.0595"
+          "store_path": "/nix/store/j67dghzznffvqvdg4q676ygw2pif1hw9-vim-9.1.1046"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/llqzlc672c9ch6a86zvh76gq5v5jnsv1-vim-9.1.0595",
+              "path": "/nix/store/n4rw363dm6mmi8zrcyzd8k0yhmnyw333-vim-9.1.1046",
               "default": true
             },
             {
               "name": "xxd",
-              "path": "/nix/store/39w4fgmvnqajmn3pw8r0j81zrhpam7n3-vim-9.1.0595-xxd",
+              "path": "/nix/store/kr9p6d9ws269mq9mf0b7al60b687x862-vim-9.1.1046-xxd",
               "default": true
             }
           ],
-          "store_path": "/nix/store/llqzlc672c9ch6a86zvh76gq5v5jnsv1-vim-9.1.0595"
+          "store_path": "/nix/store/n4rw363dm6mmi8zrcyzd8k0yhmnyw333-vim-9.1.1046"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/r2sjxb4zyl5jrb6s9jh78snv0si5h2gy-vim-9.1.0595",
+              "path": "/nix/store/91af2356mvkx4km3ngqi7sgfv6kimnc7-vim-9.1.1046",
               "default": true
             },
             {
               "name": "xxd",
-              "path": "/nix/store/vzbif1ja5r0pscrndhcvfc38y07r33q6-vim-9.1.0595-xxd",
+              "path": "/nix/store/4n2k7vffrqzgm8pxa1a4vdky1hzfyl2d-vim-9.1.1046-xxd",
               "default": true
             }
           ],
-          "store_path": "/nix/store/r2sjxb4zyl5jrb6s9jh78snv0si5h2gy-vim-9.1.0595"
+          "store_path": "/nix/store/91af2356mvkx4km3ngqi7sgfv6kimnc7-vim-9.1.1046"
         }
       }
     },
     "vscode@latest": {
-      "last_modified": "2024-08-16T17:05:30Z",
-      "resolved": "github:NixOS/nixpkgs/d4a7a4d0e066278bfb0d77bd2a7adde1c0ec9e3d#vscode",
+      "last_modified": "2025-02-16T00:50:12Z",
+      "resolved": "github:NixOS/nixpkgs/1dcdd535fef84d4671129a10e7072d56dca9a4d3#vscode",
       "source": "devbox-search",
-      "version": "1.92.2",
+      "version": "1.97.2",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/w1vy2d50lcgvj24vmwl99cz81kvynhaj-vscode-1.92.2",
+              "path": "/nix/store/v42413glqkxd9prq6jbzvwxzzb7vq0ps-vscode-1.97.2",
               "default": true
             }
           ],
-          "store_path": "/nix/store/w1vy2d50lcgvj24vmwl99cz81kvynhaj-vscode-1.92.2"
+          "store_path": "/nix/store/v42413glqkxd9prq6jbzvwxzzb7vq0ps-vscode-1.97.2"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/1glwx946zpqqndf8q4pirg7nwl1zhga1-vscode-1.92.2",
+              "path": "/nix/store/nygpcs0h70wa4381l983xx48r0jlzwld-vscode-1.97.2",
               "default": true
             }
           ],
-          "store_path": "/nix/store/1glwx946zpqqndf8q4pirg7nwl1zhga1-vscode-1.92.2"
+          "store_path": "/nix/store/nygpcs0h70wa4381l983xx48r0jlzwld-vscode-1.97.2"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/zsxk3wcy156yly0401a92dp8c5rwfdcx-vscode-1.92.2",
+              "path": "/nix/store/lc7aslkkymb6sjvj323dcqw7xfjajjhp-vscode-1.97.2",
               "default": true
             }
           ],
-          "store_path": "/nix/store/zsxk3wcy156yly0401a92dp8c5rwfdcx-vscode-1.92.2"
+          "store_path": "/nix/store/lc7aslkkymb6sjvj323dcqw7xfjajjhp-vscode-1.97.2"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/3xm62iszlb6q0fzpgcvyh5fc0p37amhz-vscode-1.92.2",
+              "path": "/nix/store/1wsgcydxm34rbg4n4cm7cy138y0jqvhp-vscode-1.97.2",
               "default": true
             }
           ],
-          "store_path": "/nix/store/3xm62iszlb6q0fzpgcvyh5fc0p37amhz-vscode-1.92.2"
+          "store_path": "/nix/store/1wsgcydxm34rbg4n4cm7cy138y0jqvhp-vscode-1.97.2"
         }
       }
     },
     "wasm-pack@latest": {
-      "last_modified": "2024-08-14T11:41:26Z",
-      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#wasm-pack",
+      "last_modified": "2025-02-07T11:26:36Z",
+      "resolved": "github:NixOS/nixpkgs/d98abf5cf5914e5e4e9d57205e3af55ca90ffc1d#wasm-pack",
       "source": "devbox-search",
-      "version": "0.12.1",
+      "version": "0.13.1",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/bgrah2f4wvxk9m8y201jlpm61wdxvl2h-wasm-pack-0.12.1",
+              "path": "/nix/store/8ng9cb2q3i7n3gxha49lrksrpa70g16c-wasm-pack-0.13.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/bgrah2f4wvxk9m8y201jlpm61wdxvl2h-wasm-pack-0.12.1"
+          "store_path": "/nix/store/8ng9cb2q3i7n3gxha49lrksrpa70g16c-wasm-pack-0.13.1"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/ipidznvb8js05w51xvs58klqhby6yr28-wasm-pack-0.12.1",
+              "path": "/nix/store/mdqzvdybrhivhz4wmvc2k9vsnl6gvq34-wasm-pack-0.13.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/ipidznvb8js05w51xvs58klqhby6yr28-wasm-pack-0.12.1"
+          "store_path": "/nix/store/mdqzvdybrhivhz4wmvc2k9vsnl6gvq34-wasm-pack-0.13.1"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/xpgwwwvag1b3arn7ipv2zrwf75gllkk5-wasm-pack-0.12.1",
+              "path": "/nix/store/ik7phkz2jaikipzrsp2d7iz8xffdq8cs-wasm-pack-0.13.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/xpgwwwvag1b3arn7ipv2zrwf75gllkk5-wasm-pack-0.12.1"
+          "store_path": "/nix/store/ik7phkz2jaikipzrsp2d7iz8xffdq8cs-wasm-pack-0.13.1"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/4mick6d3x1w5ky4szizqwn4l5ry07l5w-wasm-pack-0.12.1",
+              "path": "/nix/store/srjb601ikdig2506j2sqh4w0yga92j6b-wasm-pack-0.13.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/4mick6d3x1w5ky4szizqwn4l5ry07l5w-wasm-pack-0.12.1"
+          "store_path": "/nix/store/srjb601ikdig2506j2sqh4w0yga92j6b-wasm-pack-0.13.1"
         }
       }
     },
     "which@latest": {
-      "last_modified": "2024-08-14T11:41:26Z",
-      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#which",
+      "last_modified": "2025-02-07T11:26:36Z",
+      "resolved": "github:NixOS/nixpkgs/d98abf5cf5914e5e4e9d57205e3af55ca90ffc1d#which",
       "source": "devbox-search",
       "version": "2.21",
       "systems": {
@@ -610,41 +606,41 @@
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/6wqn8h6m6dwgj6rcfwcbgygwql9fr240-which-2.21",
+              "path": "/nix/store/y9i6grgmf838f858cj2myfdbw7377ldp-which-2.21",
               "default": true
             }
           ],
-          "store_path": "/nix/store/6wqn8h6m6dwgj6rcfwcbgygwql9fr240-which-2.21"
+          "store_path": "/nix/store/y9i6grgmf838f858cj2myfdbw7377ldp-which-2.21"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/f0vx9zsf4bkfajiyh5d0vh4cvlcw9sn6-which-2.21",
+              "path": "/nix/store/96p5fxmlqvihdcmcrl8qq1qzlnjb5id1-which-2.21",
               "default": true
             }
           ],
-          "store_path": "/nix/store/f0vx9zsf4bkfajiyh5d0vh4cvlcw9sn6-which-2.21"
+          "store_path": "/nix/store/96p5fxmlqvihdcmcrl8qq1qzlnjb5id1-which-2.21"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/72v7pjm9261gjpsqib25isy8v37mffqk-which-2.21",
+              "path": "/nix/store/pyz0643263cqxq77sm2p291r28lrfb61-which-2.21",
               "default": true
             }
           ],
-          "store_path": "/nix/store/72v7pjm9261gjpsqib25isy8v37mffqk-which-2.21"
+          "store_path": "/nix/store/pyz0643263cqxq77sm2p291r28lrfb61-which-2.21"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/53g1kcxlv9fi3v5zsksg6f5yq3iggszz-which-2.21",
+              "path": "/nix/store/f9qijkp80215dih25df0az32ii31vg27-which-2.21",
               "default": true
             }
           ],
-          "store_path": "/nix/store/53g1kcxlv9fi3v5zsksg6f5yq3iggszz-which-2.21"
+          "store_path": "/nix/store/f9qijkp80215dih25df0az32ii31vg27-which-2.21"
         }
       }
     }
diff --git a/examples/ping-pong/Makefile b/examples/ping-pong/Makefile
index 94933d26..8107e2a4 100644
--- a/examples/ping-pong/Makefile
+++ b/examples/ping-pong/Makefile
@@ -1,5 +1,5 @@
 RUN_WEB := true
-PKILL = @ps aux | grep "$1" | grep -v grep | awk '{print $$2}' | xargs -r kill
+PKILL = @/bin/ps aux | grep "$1" | egrep -v "(grep|vscode|rust-analyzer)" | awk '{print $$2}' | xargs -r kill
 
 all: kill build run
 
diff --git a/examples/ping-pong/libc/Cargo.lock b/examples/ping-pong/libc/Cargo.lock
index bc6917e6..25fff8f7 100644
--- a/examples/ping-pong/libc/Cargo.lock
+++ b/examples/ping-pong/libc/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -73,14 +73,14 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
 dependencies = [
- "libc 0.2.158",
+ "libc 0.2.169",
 ]
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,36 +93,37 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -143,7 +144,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -158,7 +159,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -182,7 +183,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -205,14 +206,25 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -221,24 +233,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -249,23 +261,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
- "libc 0.2.158",
+ "libc 0.2.169",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -315,9 +327,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 dependencies = [
  "serde",
 ]
@@ -340,11 +352,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -354,9 +372,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -372,9 +390,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -397,11 +415,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -424,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.16"
+version = "4.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "3e77c3243bd94243c03672cb5154667347c457ca271254724f9f393aee1c05ff"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -434,9 +458,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7"
 dependencies = [
  "anstream",
  "anstyle",
@@ -446,37 +470,27 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "const-oid"
@@ -491,7 +505,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
- "libc 0.2.158",
+ "libc 0.2.169",
 ]
 
 [[package]]
@@ -502,11 +516,11 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
- "libc 0.2.158",
+ "libc 0.2.169",
 ]
 
 [[package]]
@@ -549,9 +563,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -571,6 +585,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -585,7 +600,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -609,7 +624,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -620,14 +635,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -697,7 +712,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -714,6 +729,17 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
 [[package]]
 name = "ed25519-compact"
 version = "2.1.1"
@@ -721,7 +747,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
- "getrandom",
+ "ed25519",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -753,9 +795,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -763,9 +805,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -780,6 +822,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -801,20 +853,23 @@ name = "flarch"
 version = "0.8.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "wasm-bindgen",
@@ -826,42 +881,68 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
+name = "flcrypto"
+version = "0.8.0"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "flarch",
+ "flmacro",
+ "log",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde_with",
+ "sha2",
+ "thiserror 2.0.11",
+ "typetag",
+]
+
+[[package]]
+name = "flmacro"
 version = "0.8.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "flmodules"
 version = "0.8.0"
 dependencies = [
+ "async-recursion",
  "async-stream",
  "async-trait",
  "bimap",
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "bytes",
  "ed25519-compact",
+ "ed25519-dalek",
  "flarch",
+ "flcrypto",
+ "flmacro",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
+ "num-bigint",
  "rand",
  "reqwest",
+ "rmp-serde",
  "serde",
  "serde_derive",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "strum_macros",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "toml",
+ "typetag",
 ]
 
 [[package]]
@@ -881,9 +962,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -896,9 +977,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -906,15 +987,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -923,38 +1004,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -987,11 +1068,23 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "js-sys",
- "libc 0.2.158",
- "wasi",
+ "libc 0.2.169",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc 0.2.169",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -1004,9 +1097,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "group"
@@ -1027,9 +1120,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "heck"
@@ -1037,12 +1130,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1069,9 +1156,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1103,9 +1190,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "humantime"
@@ -1115,9 +1202,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1134,9 +1221,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http",
@@ -1152,9 +1239,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1165,16 +1252,15 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1193,6 +1279,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1201,12 +1405,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1222,12 +1437,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1254,18 +1469,27 @@ dependencies = [
  "rand",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
  "webrtc-util",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1284,16 +1508,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1305,9 +1530,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libc"
@@ -1327,6 +1552,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1339,9 +1570,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "md-5"
@@ -1376,9 +1607,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1392,22 +1623,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
- "libc 0.2.158",
- "wasi",
+ "libc 0.2.169",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1428,7 +1658,7 @@ checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
- "libc 0.2.158",
+ "libc 0.2.169",
  "memoffset",
  "pin-utils",
 ]
@@ -1451,6 +1681,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1479,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1497,9 +1728,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1509,9 +1740,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1527,9 +1758,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1554,12 +1785,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
- "libc 0.2.158",
+ "libc 0.2.169",
  "redox_syscall",
  "smallvec",
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1585,31 +1822,11 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1641,9 +1858,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1671,18 +1888,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -1691,46 +1908,50 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.15",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
- "libc 0.2.158",
+ "cfg_aliases",
+ "libc 0.2.169",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1741,7 +1962,7 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "libc 0.2.158",
+ "libc 0.2.169",
  "rand_chacha",
  "rand_core",
 ]
@@ -1762,14 +1983,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -1781,18 +2002,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1802,9 +2023,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1813,15 +2034,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -1851,6 +2072,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-util",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -1879,13 +2101,35 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
- "libc 0.2.158",
+ "getrandom 0.2.15",
+ "libc 0.2.169",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rtcp"
 version = "0.11.0"
@@ -1893,7 +2137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1907,7 +2151,7 @@ dependencies = [
  "portable-atomic",
  "rand",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1919,9 +2163,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -1943,9 +2187,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -1970,36 +2214,44 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -2012,19 +2264,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2039,7 +2285,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand",
  "substring",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2063,34 +2309,34 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
- "libc 0.2.158",
+ "libc 0.2.169",
  "security-framework-sys",
 ]
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
- "libc 0.2.158",
+ "libc 0.2.169",
 ]
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2108,20 +2354,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -2131,9 +2377,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2152,15 +2398,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2170,14 +2416,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2270,11 +2516,11 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
- "libc 0.2.158",
+ "libc 0.2.169",
  "windows-sys 0.52.0",
 ]
 
@@ -2294,12 +2540,31 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "stun"
 version = "0.6.0"
@@ -2313,7 +2578,7 @@ dependencies = [
  "rand",
  "ring",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2347,9 +2612,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2358,9 +2623,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -2385,34 +2650,54 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2431,19 +2716,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2456,13 +2751,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
- "libc 0.2.158",
+ "libc 0.2.169",
  "mio",
  "parking_lot",
  "pin-project-lite",
@@ -2473,31 +2768,30 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2522,9 +2816,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2535,9 +2829,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2556,11 +2850,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -2569,14 +2863,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
  "pin-project-lite",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -2596,9 +2890,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -2606,9 +2900,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -2635,7 +2929,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2654,12 +2948,18 @@ dependencies = [
  "rand",
  "ring",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -2667,31 +2967,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typetag"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "typetag-impl"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unicode-ident"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -2711,9 +3020,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2726,6 +3035,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2734,11 +3055,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2781,14 +3102,24 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2796,36 +3127,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2833,33 +3164,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -2867,20 +3199,20 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -2891,9 +3223,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -2905,9 +3237,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2915,9 +3257,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -2950,7 +3292,7 @@ dependencies = [
  "sha2",
  "smol_str",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -2975,7 +3317,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -3011,7 +3353,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -3033,7 +3375,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -3051,7 +3393,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3066,7 +3408,7 @@ dependencies = [
  "bytes",
  "rand",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3082,7 +3424,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3105,7 +3447,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3121,12 +3463,12 @@ dependencies = [
  "bytes",
  "ipnet",
  "lazy_static",
- "libc 0.2.158",
+ "libc 0.2.169",
  "log",
  "nix",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3285,13 +3627,34 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -3318,7 +3681,7 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3340,6 +3703,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3358,7 +3745,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -3378,5 +3786,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/examples/ping-pong/libc/Cargo.toml b/examples/ping-pong/libc/Cargo.toml
index a2d15a08..8918fb0f 100644
--- a/examples/ping-pong/libc/Cargo.toml
+++ b/examples/ping-pong/libc/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 edition = "2021"
 name = "libc"
-version = "0.8.0"
+version = "0.9.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-flarch = {path = "../../../flarch", version = "0.8"}
-flmodules = {path = "../../../flmodules", version = "0.8"}
-shared = {path = "../shared", version = "0.8"}
+flarch = {path = "../../../flarch", version = "0.9"}
+flmodules = {path = "../../../flmodules", version = "0.9"}
+shared = {path = "../shared", version = "0.9"}
 
 clap = {version = "4", features = ["derive"]}
 log = "0.4"
diff --git a/examples/ping-pong/libc/src/main.rs b/examples/ping-pong/libc/src/main.rs
index 0ef95cda..4c8b0c40 100644
--- a/examples/ping-pong/libc/src/main.rs
+++ b/examples/ping-pong/libc/src/main.rs
@@ -1,14 +1,15 @@
 use clap::{Parser, ValueEnum};
 
 use flarch::{start_logging_filter, web_rtc::connection::ConnectionConfig};
-use flmodules::nodeconfig::NodeConfig;
 use flmodules::network::NetworkSetupError;
+use flmodules::nodeconfig::NodeConfig;
 
 use shared::{
-    common::NodeList,
+    common::{NodeList, PingPongIn, PingPongOut},
     event_loop,
     handler::{self, URL},
 };
+use tokio::select;
 
 #[derive(Parser, Debug)]
 struct Args {
@@ -30,28 +31,41 @@ async fn main() -> Result<(), NetworkSetupError> {
 
     let nc = NodeConfig::new();
     let name = nc.info.name.clone();
-    let net = flmodules::network::network_broker_start(nc.clone(), ConnectionConfig::from_signal(URL)).await?;
+    let net =
+        flmodules::network::network_start(nc.clone(), ConnectionConfig::from_signal(URL))
+            .await?;
     let mut list = NodeList::new(vec![]);
 
     let mut pp = match args.code {
-        Code::Handler => handler::PingPong::new(nc.info.get_id(), net).await?,
-        Code::EventLoop => event_loop::start(nc.info.get_id(), net).await?,
+        Code::Handler => handler::PingPong::new(nc.info.get_id(), net.broker).await?,
+        Code::EventLoop => event_loop::start(nc.info.get_id(), net.broker).await?,
     };
-    let (pp_rx, _) = pp.get_tap_sync().await?;
-    for msg in pp_rx {
-        match msg {
-            shared::common::PPMessage::ToNetwork(to, ppmsg) => {
-                log::info!("{name}: Sending {ppmsg:?} to {}", list.get_name(&to))
-            }
-            shared::common::PPMessage::FromNetwork(from, ppmsg) => {
-                log::info!("{name}: Got {ppmsg:?} from {}", list.get_name(&from))
-            }
-            shared::common::PPMessage::List(new_list) => {
-                if list.update(new_list) {
-                    log::info!("{name}: Got new list: {}", list.names());
+    let mut pp_rx = pp.get_tap_in().await?.0;
+    let mut pp_tx = pp.get_tap_out().await?.0;
+    loop {
+        select! {
+            Some(msg) = pp_rx.recv() => {
+                match msg{
+                    PingPongIn::FromNetwork(from, ppmsg) => {
+                        log::info!("{name}: Got {ppmsg:?} from {}", list.get_name(&from))
+                    }
+                    PingPongIn::List(new_list) => {
+                        if list.update(new_list) {
+                            log::info!("{name}: Got new list: {}", list.names());
+                        }
+                    }
+                    _ => {}
+                }
+            },
+            Some(msg) = pp_tx.recv() => {
+                match msg {
+                    PingPongOut::ToNetwork(to, ppmsg) => {
+                        log::info!("{name}: Sending {ppmsg:?} to {}", list.get_name(&to))
+                    }
+                    _ => {}
                 }
-            }
-            _ => {}
+            },
+            else => break, // Exit when all channels close
         }
     }
     Ok(())
diff --git a/examples/ping-pong/shared/Cargo.lock b/examples/ping-pong/shared/Cargo.lock
index b4009f5b..540fad0e 100644
--- a/examples/ping-pong/shared/Cargo.lock
+++ b/examples/ping-pong/shared/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,36 +93,37 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -143,7 +144,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -158,7 +159,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -182,7 +183,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -205,14 +206,25 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -221,24 +233,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -249,23 +261,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -315,9 +327,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 dependencies = [
  "serde",
 ]
@@ -340,11 +352,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -354,9 +372,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -372,9 +390,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -397,11 +415,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -424,19 +448,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "const-oid"
@@ -462,9 +476,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -509,9 +523,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -531,6 +545,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -545,7 +560,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -569,7 +584,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -580,14 +595,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -657,7 +672,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -674,6 +689,17 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
 [[package]]
 name = "ed25519-compact"
 version = "2.1.1"
@@ -681,7 +707,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
- "getrandom",
+ "ed25519",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -713,9 +755,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -723,9 +765,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -740,6 +782,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -761,20 +813,23 @@ name = "flarch"
 version = "0.8.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "wasm-bindgen",
@@ -786,42 +841,68 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
+name = "flcrypto"
+version = "0.8.0"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "flarch",
+ "flmacro",
+ "log",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde_with",
+ "sha2",
+ "thiserror 2.0.11",
+ "typetag",
+]
+
+[[package]]
+name = "flmacro"
 version = "0.8.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "flmodules"
 version = "0.8.0"
 dependencies = [
+ "async-recursion",
  "async-stream",
  "async-trait",
  "bimap",
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "bytes",
  "ed25519-compact",
+ "ed25519-dalek",
  "flarch",
+ "flcrypto",
+ "flmacro",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
+ "num-bigint",
  "rand",
  "reqwest",
+ "rmp-serde",
  "serde",
  "serde_derive",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "strum_macros",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "toml",
+ "typetag",
 ]
 
 [[package]]
@@ -841,9 +922,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -856,9 +937,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -866,15 +947,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -883,38 +964,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -948,10 +1029,22 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -964,9 +1057,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "group"
@@ -987,15 +1080,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hex"
@@ -1023,9 +1116,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1057,9 +1150,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "humantime"
@@ -1069,9 +1162,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1088,9 +1181,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http",
@@ -1106,9 +1199,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1119,16 +1212,15 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1147,6 +1239,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1155,12 +1365,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1176,12 +1397,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1208,18 +1429,27 @@ dependencies = [
  "rand",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
  "webrtc-util",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1238,16 +1468,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1259,9 +1490,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linked-hash-map"
@@ -1269,6 +1500,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1281,9 +1518,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "md-5"
@@ -1318,9 +1555,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1334,22 +1571,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1393,6 +1629,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1421,9 +1658,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1439,9 +1676,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1451,9 +1688,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1469,9 +1706,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1502,6 +1739,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1527,31 +1770,11 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1583,9 +1806,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1613,18 +1836,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -1633,46 +1856,50 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.15",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1704,14 +1931,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -1723,18 +1950,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1744,9 +1971,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1755,15 +1982,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -1793,6 +2020,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-util",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -1821,13 +2049,35 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rtcp"
 version = "0.11.0"
@@ -1835,7 +2085,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1849,7 +2099,7 @@ dependencies = [
  "portable-atomic",
  "rand",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1861,9 +2111,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -1885,9 +2135,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -1912,36 +2162,44 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -1954,19 +2212,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -1981,7 +2233,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand",
  "substring",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2005,7 +2257,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2014,9 +2266,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2024,15 +2276,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2050,20 +2302,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -2073,9 +2325,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2094,15 +2346,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2112,14 +2364,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2212,9 +2464,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2236,12 +2488,31 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "stun"
 version = "0.6.0"
@@ -2255,7 +2526,7 @@ dependencies = [
  "rand",
  "ring",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2289,9 +2560,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2300,9 +2571,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -2327,34 +2598,54 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2373,19 +2664,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2398,9 +2699,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2415,31 +2716,30 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2464,9 +2764,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2477,9 +2777,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2498,11 +2798,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -2511,14 +2811,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
  "pin-project-lite",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -2538,9 +2838,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -2548,9 +2848,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -2577,7 +2877,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2596,12 +2896,18 @@ dependencies = [
  "rand",
  "ring",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -2609,31 +2915,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typetag"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "typetag-impl"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unicode-ident"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -2653,9 +2968,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2668,6 +2983,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2676,11 +3003,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2723,14 +3050,24 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2738,36 +3075,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2775,33 +3112,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -2809,20 +3147,20 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -2833,9 +3171,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -2847,9 +3185,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2857,9 +3205,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -2892,7 +3240,7 @@ dependencies = [
  "sha2",
  "smol_str",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -2917,7 +3265,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -2953,7 +3301,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -2975,7 +3323,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -2993,7 +3341,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3008,7 +3356,7 @@ dependencies = [
  "bytes",
  "rand",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3024,7 +3372,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3047,7 +3395,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3068,7 +3416,7 @@ dependencies = [
  "nix",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3227,13 +3575,34 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -3260,7 +3629,7 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3282,6 +3651,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3300,7 +3693,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -3320,5 +3734,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/examples/ping-pong/shared/Cargo.toml b/examples/ping-pong/shared/Cargo.toml
index b5ca3af7..fea0e7da 100644
--- a/examples/ping-pong/shared/Cargo.toml
+++ b/examples/ping-pong/shared/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 edition = "2021"
 name = "shared"
-version = "0.8.0"
+version = "0.9.0"
 
 [dependencies]
-flmodules = {path = "../../../flmodules", version = "0.8"}
-flarch = {path = "../../../flarch", version = "0.8"}
+flmodules = {path = "../../../flmodules", version = "0.9"}
+flarch = {path = "../../../flarch", version = "0.9"}
 
 async-trait = "0.1"
 log = "0.4"
@@ -15,5 +15,5 @@ tokio = "1"
 tokio-stream = "0.1"
 
 [dev-dependencies]
-flmodules = {path = "../../../flmodules", version = "0.8", features = ["testing"]}
+flmodules = {path = "../../../flmodules", version = "0.9", features = ["testing"]}
 tokio = {version = "1", features = ["rt-multi-thread"]}
diff --git a/examples/ping-pong/shared/src/common.rs b/examples/ping-pong/shared/src/common.rs
index 8048bbe6..a2bd15cc 100644
--- a/examples/ping-pong/shared/src/common.rs
+++ b/examples/ping-pong/shared/src/common.rs
@@ -3,15 +3,8 @@ use serde::{Deserialize, Serialize};
 use flarch::nodeids::NodeID;
 use flmodules::nodeconfig::NodeInfo;
 
-/// A PPMessage includes messages from the network, messages to be sent to
-/// the network, and receiving an updated list from the signalling server.
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub enum PPMessage {
-    /// Contains the destination-id and the message to be sent. The
-    /// user only has to send the 'ping', the PingPong implementation
-    /// automatically sends a 'pong' reply and requests for an updated
-    /// list of nodes.
-    ToNetwork(NodeID, PPMessageNode),
+pub enum PingPongIn {
     /// Contains source-id of the message as well as the message itself.
     /// The user does not have to reply to incoming ping messages.
     FromNetwork(NodeID, PPMessageNode),
@@ -21,6 +14,17 @@ pub enum PPMessage {
     Tick,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+pub enum PingPongOut {
+    /// Contains the destination-id and the message to be sent. The
+    /// user only has to send the 'ping', the PingPong implementation
+    /// automatically sends a 'pong' reply and requests for an updated
+    /// list of nodes.
+    ToNetwork(NodeID, PPMessageNode),
+    /// Request an updated list of nodes
+    WSUpdateListRequest,
+}
+
 /// Every  contact is started with a ping and replied with a pong.
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub enum PPMessageNode {
diff --git a/examples/ping-pong/shared/src/event_loop.rs b/examples/ping-pong/shared/src/event_loop.rs
index 8ae1ea6f..aff6445a 100644
--- a/examples/ping-pong/shared/src/event_loop.rs
+++ b/examples/ping-pong/shared/src/event_loop.rs
@@ -3,14 +3,14 @@ use tokio::select;
 use tokio_stream::StreamExt;
 
 use flarch::{
-    broker::{Broker, BrokerError},
+    broker::{BrokerError, Broker},
     nodeids::NodeID,
     tasks::{spawn_local, Interval},
 };
+use flmodules::network::broker::{BrokerNetwork, NetworkIn, NetworkOut};
 use flmodules::nodeconfig::NodeInfo;
-use flmodules::network::messages::{NetworkIn, NetworkOut, NetworkMessage};
 
-use crate::common::{PPMessage, PPMessageNode};
+use crate::common::{PPMessageNode, PingPongIn, PingPongOut};
 
 /// This is a more straightforward use of the network-broker. It loops over incoming
 /// messages and then sends out new messages by sending it over the network-broker.
@@ -18,8 +18,8 @@ use crate::common::{PPMessage, PPMessageNode};
 /// as a simple channel.
 pub async fn start(
     id: NodeID,
-    net: Broker<NetworkMessage>,
-) -> Result<Broker<PPMessage>, BrokerError> {
+    net: BrokerNetwork,
+) -> Result<Broker<PingPongIn, PingPongOut>, BrokerError> {
     let ret = Broker::new();
 
     let ret_clone = ret.clone();
@@ -36,10 +36,10 @@ pub async fn start(
 /// once a second.
 async fn event_loop(
     id: NodeID,
-    mut net: Broker<NetworkMessage>,
-    mut ret: Broker<PPMessage>,
+    mut net: BrokerNetwork,
+    mut ret: Broker<PingPongIn, PingPongOut>,
 ) -> Result<(), BrokerError> {
-    let (mut tap, _) = net.get_tap().await?;
+    let (mut tap, _) = net.get_tap_out().await?;
     let mut nodes: Vec<NodeInfo> = vec![];
     let mut interval_sec = Interval::new_interval(Duration::from_secs(1));
 
@@ -56,16 +56,16 @@ async fn event_loop(
 /// Requests a new list and sends a ping to all other nodes.
 fn update_list(
     id: NodeID,
-    net: &mut Broker<NetworkMessage>,
+    net: &mut BrokerNetwork,
     nodes: &Vec<NodeInfo>,
 ) -> Result<(), BrokerError> {
-    net.emit_msg(NetworkMessage::Input(NetworkIn::WSUpdateListRequest))?;
+    net.emit_msg_in(NetworkIn::WSUpdateListRequest)?;
     for node in nodes.iter() {
         if node.get_id() != id {
-            net.emit_msg(NetworkMessage::Input(NetworkIn::MessageToNode(
+            net.emit_msg_in(NetworkIn::MessageToNode(
                 node.get_id(),
                 serde_json::to_string(&PPMessageNode::Ping).unwrap(),
-            )))?;
+            ))?;
         }
     }
 
@@ -73,25 +73,25 @@ fn update_list(
 }
 
 fn new_msg(
-    net: &mut Broker<NetworkMessage>,
-    ret: &mut Broker<PPMessage>,
-    msg: Option<NetworkMessage>,
+    net: &mut BrokerNetwork,
+    ret: &mut Broker<PingPongIn, PingPongOut>,
+    msg: Option<NetworkOut>,
 ) -> Result<Option<Vec<NodeInfo>>, BrokerError> {
-    if let Some(NetworkMessage::Output(msg_tap)) = msg {
+    if let Some(msg_tap) = msg {
         match msg_tap {
             NetworkOut::MessageFromNode(from, msg_net) => {
                 if let Ok(msg) = serde_json::from_str::<PPMessageNode>(&msg_net) {
-                    ret.emit_msg(PPMessage::FromNetwork(from, msg.clone()))?;
+                    ret.emit_msg_in(PingPongIn::FromNetwork(from, msg.clone()))?;
                     if msg == PPMessageNode::Ping {
-                        net.emit_msg(NetworkMessage::Input(NetworkIn::MessageToNode(
+                        net.emit_msg_in(NetworkIn::MessageToNode(
                             from,
                             serde_json::to_string(&PPMessageNode::Pong).unwrap(),
-                        )))?;
+                        ))?;
                     }
                 }
             }
             NetworkOut::NodeListFromWS(list) => {
-                ret.emit_msg(PPMessage::List(list.clone()))?;
+                ret.emit_msg_in(PingPongIn::List(list.clone()))?;
                 return Ok(Some(list));
             }
             _ => {}
diff --git a/examples/ping-pong/shared/src/handler.rs b/examples/ping-pong/shared/src/handler.rs
index 437db712..2b755f40 100644
--- a/examples/ping-pong/shared/src/handler.rs
+++ b/examples/ping-pong/shared/src/handler.rs
@@ -1,14 +1,15 @@
 use flarch::{
-    broker::{Broker, BrokerError, Subsystem, SubsystemHandler},
-    nodeids::{NodeID, U256}, platform_async_trait,
+    broker::{Broker, BrokerError, SubsystemHandler},
+    nodeids::{NodeID, U256},
+    platform_async_trait,
 };
 use flmodules::{
+    network::broker::{BrokerNetwork, NetworkIn, NetworkOut},
     nodeconfig::NodeInfo,
-    timer::{TimerBroker, TimerMessage},
+    timer::Timer,
 };
-use flmodules::network::messages::{NetworkIn, NetworkMessage, NetworkOut};
 
-use crate::common::{PPMessage, PPMessageNode};
+use crate::common::{PPMessageNode, PingPongIn, PingPongOut};
 
 /// This only runs on localhost.
 pub const URL: &str = "ws://localhost:8765";
@@ -20,7 +21,6 @@ pub const URL: &str = "ws://localhost:8765";
 /// wasm library.
 pub struct PingPong {
     id: U256,
-    net: Broker<NetworkMessage>,
     nodes: Vec<NodeInfo>,
 }
 
@@ -30,30 +30,35 @@ impl PingPong {
     /// processed to interpret ping's and pong's.
     pub async fn new(
         id: U256,
-        mut net: Broker<NetworkMessage>,
-    ) -> Result<Broker<PPMessage>, BrokerError> {
+        net: BrokerNetwork,
+    ) -> Result<Broker<PingPongIn, PingPongOut>, BrokerError> {
         let mut pp_broker = Broker::new();
         // Interpret network messages and wrap relevant messages to ourselves.
-        net.forward(pp_broker.clone(), Box::new(Self::net_to_pp))
-            .await;
+        pp_broker
+            .add_translator_link(
+                net.clone(),
+                Box::new(|msg| {
+                    Some(match msg {
+                        PingPongOut::ToNetwork(dst, pp_msg) => {
+                            NetworkIn::MessageToNode(dst, serde_json::to_string(&pp_msg).unwrap())
+                        }
+                        PingPongOut::WSUpdateListRequest => NetworkIn::WSUpdateListRequest,
+                    })
+                }),
+                Box::new(Self::net_to_pp),
+            )
+            .await?;
         // Forward "second" ticks, but ignore minute ticks
-        TimerBroker::start()
+        Timer::start()
             .await?
-            .forward(
-                pp_broker.clone(),
-                Box::new(|msg| (msg == TimerMessage::Second).then(|| PPMessage::Tick)),
-            )
-            .await;
+            .tick_second(pp_broker.clone(), PingPongIn::Tick)
+            .await?;
         // Add ourselves as a handler to the broker.
         // Because of rust's ownership protection, this means that this structure is not available
         // anymore to the caller.
         // So the only way to interact with this structure is by sending messages to the broker.
         pp_broker
-            .add_subsystem(Subsystem::Handler(Box::new(Self {
-                id,
-                net,
-                nodes: vec![],
-            })))
+            .add_handler(Box::new(Self { id, nodes: vec![] }))
             .await
             .map(|_| ())?;
         Ok(pp_broker)
@@ -64,39 +69,17 @@ impl PingPong {
     // For MessageFromNode, the enclosed message is interpreted as a PPMessageNode and sent to this
     // broker.
     // All other messages coming from Network are ignored.
-    fn net_to_pp(msg: NetworkMessage) -> Option<PPMessage> {
-        if let NetworkMessage::Output(rep) = msg {
-            match rep {
-                NetworkOut::MessageFromNode(from, node_msg) => {
-                    serde_json::from_str::<PPMessageNode>(&node_msg)
-                        .ok()
-                        .map(|ppm| PPMessage::FromNetwork(from, ppm))
-                }
-                NetworkOut::NodeListFromWS(nodes) => Some(PPMessage::List(nodes)),
-                _ => None,
+    fn net_to_pp(msg: NetworkOut) -> Option<PingPongIn> {
+        match msg {
+            NetworkOut::MessageFromNode(from, node_msg) => {
+                serde_json::from_str::<PPMessageNode>(&node_msg)
+                    .ok()
+                    .map(|ppm| PingPongIn::FromNetwork(from, ppm))
             }
-        } else {
-            None
+            NetworkOut::NodeListFromWS(nodes) => Some(PingPongIn::List(nodes)),
+            _ => None,
         }
     }
-
-    // Sends a generic NetworkIn type message to the network-broker.
-    async fn send_net(&mut self, msg: NetworkIn) {
-        self.net
-            .emit_msg(NetworkMessage::Input(msg.clone()))
-            .err()
-            .map(|e| log::error!("While sending {:?} to net: {:?}", msg, e));
-    }
-
-    // Wraps a PPMessageNode into a json and sends it over the network to the
-    // dst address.
-    async fn send_net_ppm(&mut self, dst: U256, msg: &PPMessageNode) {
-        self.send_net(NetworkIn::MessageToNode(
-            dst,
-            serde_json::to_string(msg).unwrap(),
-        ))
-        .await;
-    }
 }
 
 // Process messages sent to the PPMessage broker:
@@ -104,21 +87,19 @@ impl PingPong {
 // For PPMessageNode::Ping messages, a pong is replied, and an update list request is sent to
 // the signalling server.
 #[platform_async_trait()]
-impl SubsystemHandler<PPMessage> for PingPong {
-    async fn messages(&mut self, msgs: Vec<PPMessage>) -> Vec<PPMessage> {
+impl SubsystemHandler<PingPongIn, PingPongOut> for PingPong {
+    async fn messages(&mut self, msgs: Vec<PingPongIn>) -> Vec<PingPongOut> {
+        let mut out = vec![];
         for msg in msgs {
             log::trace!("{}: got message {:?}", self.id, msg);
 
             match msg {
-                PPMessage::ToNetwork(from, ppm) => {
-                    self.send_net_ppm(from, &ppm).await;
-                }
-                PPMessage::FromNetwork(from, PPMessageNode::Ping) => {
-                    self.send_net_ppm(from, &PPMessageNode::Pong).await;
-                    self.send_net(NetworkIn::WSUpdateListRequest).await;
+                PingPongIn::FromNetwork(from, PPMessageNode::Ping) => {
+                    out.push(PingPongOut::ToNetwork(from, PPMessageNode::Pong));
+                    out.push(PingPongOut::WSUpdateListRequest);
                 }
-                PPMessage::List(list) => self.nodes = list,
-                PPMessage::Tick => {
+                PingPongIn::List(list) => self.nodes = list,
+                PingPongIn::Tick => {
                     let nodes = self
                         .nodes
                         .iter()
@@ -126,15 +107,14 @@ impl SubsystemHandler<PPMessage> for PingPong {
                         .filter(|n| *n != self.id)
                         .collect::<Vec<NodeID>>();
                     for node in nodes {
-                        self.send_net_ppm(node, &PPMessageNode::Ping).await;
+                        out.push(PingPongOut::ToNetwork(node, PPMessageNode::Ping));
                     }
                 }
                 _ => {}
             }
         }
 
-        // All messages are sent directly to the network broker.
-        vec![]
+        out
     }
 }
 
@@ -143,8 +123,9 @@ mod test {
     use std::time::Duration;
 
     use flarch::{broker::Destination, start_logging};
+    use flmodules::network::{broker::NetworkOut, NetworkSetupError};
     use flmodules::nodeconfig::NodeConfig;
-    use flmodules::network::{messages::NetworkOut, NetworkSetupError};
+    use flmodules::testing::network_simul::{NetworkSimul, RouterNode};
 
     use super::*;
 
@@ -162,17 +143,17 @@ mod test {
 
         let nc_src = NodeConfig::new();
         let mut net = Broker::new();
-        let (net_tap, _) = net.get_tap_sync().await?;
+        let (net_tap, _) = net.get_tap_in_sync().await?;
         let mut pp = PingPong::new(nc_src.info.get_id(), net.clone()).await?;
-        let (pp_tap, _) = pp.get_tap_sync().await?;
+        let (pp_tap, _) = pp.get_tap_in_sync().await?;
 
         let nc_dst = NodeConfig::new();
         let dst_id = nc_dst.info.get_id();
 
         // Send a Ping message from src to dst
-        pp.emit_msg_dest(
+        pp.emit_msg_out_dest(
             Destination::NoTap,
-            PPMessage::ToNetwork(dst_id.clone(), PPMessageNode::Ping),
+            PingPongOut::ToNetwork(dst_id.clone(), PPMessageNode::Ping),
         )?;
         assert_eq!(
             node_msg(&dst_id, &PPMessageNode::Ping),
@@ -183,37 +164,30 @@ mod test {
         pp_tap.recv().unwrap();
 
         // Receive a ping message through the network
-        net.emit_msg_dest(
+        net.emit_msg_out_dest(
             Destination::NoTap,
-            NetworkMessage::Output(NetworkOut::MessageFromNode(
+            NetworkOut::MessageFromNode(
                 dst_id.clone(),
                 serde_json::to_string(&PPMessageNode::Ping).unwrap(),
-            )),
+            ),
         )?;
         assert_eq!(
-            PPMessage::FromNetwork(dst_id.clone(), PPMessageNode::Ping),
+            PingPongIn::FromNetwork(dst_id.clone(), PPMessageNode::Ping),
             pp_tap.recv().unwrap()
         );
         assert_eq!(
             node_msg(&dst_id, &PPMessageNode::Pong),
             net_tap.recv().unwrap()
         );
-        assert_eq!(
-            NetworkMessage::Input(NetworkIn::WSUpdateListRequest),
-            net_tap.recv().unwrap()
-        );
+        assert_eq!(NetworkIn::WSUpdateListRequest, net_tap.recv().unwrap());
 
         Ok(())
     }
 
-    fn node_msg(dst: &U256, msg: &PPMessageNode) -> NetworkMessage {
-        NetworkMessage::Input(NetworkIn::MessageToNode(
-            dst.clone(),
-            serde_json::to_string(msg).unwrap(),
-        ))
+    fn node_msg(dst: &U256, msg: &PPMessageNode) -> NetworkIn {
+        NetworkIn::MessageToNode(dst.clone(), serde_json::to_string(msg).unwrap())
     }
 
-    use flmodules::network::testing::NetworkBrokerSimul;
     use tokio::time::sleep;
 
     // Test a simulation of two nodes with the NetworkBrokerSimul
@@ -222,16 +196,24 @@ mod test {
     async fn test_network() -> Result<(), NetworkSetupError> {
         start_logging();
 
-        let mut simul = NetworkBrokerSimul::new().await?;
+        let mut simul = NetworkSimul::new().await?;
 
-        let (nc1, net1) = simul.new_node().await?;
+        let RouterNode {
+            config: nc1,
+            net: net1,
+            ..
+        } = simul.new_node().await?;
         let mut pp1 = PingPong::new(nc1.info.get_id(), net1).await?;
-        let (pp1_tap, _) = pp1.get_tap_sync().await?;
+        let (pp1_tap, _) = pp1.get_tap_out_sync().await?;
         log::info!("PingPong1 is: {}", nc1.info.get_id());
 
-        let (nc2, net2) = simul.new_node().await?;
+        let RouterNode {
+            config: nc2,
+            net: net2,
+            ..
+        } = simul.new_node().await?;
         let mut pp2 = PingPong::new(nc2.info.get_id(), net2).await?;
-        let (pp2_tap, _) = pp2.get_tap_sync().await?;
+        let (pp2_tap, _) = pp2.get_tap_out_sync().await?;
         log::info!("PingPong2 is: {}", nc2.info.get_id());
 
         for _ in 0..3 {
@@ -244,8 +226,14 @@ mod test {
 
             sleep(Duration::from_millis(1000)).await;
 
-            pp1.emit_msg(PPMessage::ToNetwork(nc2.info.get_id(), PPMessageNode::Ping))?;
-            pp2.emit_msg(PPMessage::ToNetwork(nc1.info.get_id(), PPMessageNode::Ping))?;
+            pp1.emit_msg_out(PingPongOut::ToNetwork(
+                nc2.info.get_id(),
+                PPMessageNode::Ping,
+            ))?;
+            pp2.emit_msg_out(PingPongOut::ToNetwork(
+                nc1.info.get_id(),
+                PPMessageNode::Ping,
+            ))?;
         }
 
         Ok(())
diff --git a/examples/ping-pong/wasm/Cargo.lock b/examples/ping-pong/wasm/Cargo.lock
index 9c0769f7..2a095f85 100644
--- a/examples/ping-pong/wasm/Cargo.lock
+++ b/examples/ping-pong/wasm/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,36 +93,37 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -149,7 +150,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -164,7 +165,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -188,7 +189,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -211,14 +212,25 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -227,24 +239,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -255,23 +267,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -321,9 +333,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 dependencies = [
  "serde",
 ]
@@ -352,11 +364,17 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9"
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -366,9 +384,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -384,9 +402,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -415,11 +433,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -442,9 +466,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "console_error_panic_hook"
@@ -480,9 +504,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -527,9 +551,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -549,6 +573,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
  "curve25519-dalek-derive",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -563,7 +588,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -587,7 +612,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -598,14 +623,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -657,13 +682,13 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.18"
+version = "0.99.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -686,7 +711,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -703,6 +728,17 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
 [[package]]
 name = "ed25519-compact"
 version = "2.1.1"
@@ -710,7 +746,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
- "getrandom",
+ "ed25519",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -742,9 +794,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -752,9 +804,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -769,6 +821,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -787,23 +849,26 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "flarch"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen 0.6.5",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "wasm-bindgen",
@@ -815,42 +880,69 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
-version = "0.8.0"
+name = "flcrypto"
+version = "0.9.0"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "flarch",
+ "flmacro",
+ "log",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde_with",
+ "sha2",
+ "thiserror 2.0.11",
+ "typetag",
+]
+
+[[package]]
+name = "flmacro"
+version = "0.9.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "flmodules"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
+ "async-recursion",
  "async-stream",
  "async-trait",
  "bimap",
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
+ "btparse",
  "bytes",
  "ed25519-compact",
+ "ed25519-dalek",
  "flarch",
+ "flcrypto",
+ "flmacro",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
+ "num-bigint",
  "rand",
  "reqwest",
+ "rmp-serde",
  "serde",
  "serde_derive",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "strum_macros",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "toml",
+ "typetag",
 ]
 
 [[package]]
@@ -870,9 +962,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -885,9 +977,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -895,15 +987,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -912,38 +1004,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -977,10 +1069,22 @@ dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -993,9 +1097,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "gloo"
@@ -1073,7 +1177,7 @@ dependencies = [
  "serde",
  "serde-wasm-bindgen 0.5.0",
  "serde_urlencoded",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -1093,7 +1197,7 @@ dependencies = [
  "pin-project",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -1119,7 +1223,7 @@ dependencies = [
  "js-sys",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -1202,9 +1306,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
@@ -1249,9 +1359,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1265,7 +1375,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.1.0",
+ "http 1.2.0",
 ]
 
 [[package]]
@@ -1276,16 +1386,16 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "humantime"
@@ -1295,14 +1405,14 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "httparse",
  "itoa",
@@ -1314,12 +1424,12 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "hyper",
  "hyper-util",
  "rustls",
@@ -1332,29 +1442,28 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "hyper",
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1373,6 +1482,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1381,12 +1608,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1411,12 +1649,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1443,18 +1681,27 @@ dependencies = [
  "rand",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
  "webrtc-util",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1473,16 +1720,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1494,9 +1742,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linked-hash-map"
@@ -1504,6 +1752,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1516,9 +1770,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "md-5"
@@ -1559,9 +1813,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1575,22 +1829,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1634,6 +1887,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1672,9 +1926,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1690,9 +1944,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1702,9 +1956,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1720,9 +1974,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1753,6 +2007,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1780,29 +2040,29 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "dfe2e71e1471fe07709406bf725f710b02927c9c54b2b5b2ec0e8087d97c327d"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1812,7 +2072,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "ping-pong-web"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "console_error_panic_hook",
  "flarch",
@@ -1837,7 +2097,7 @@ checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b"
 dependencies = [
  "futures",
  "rustversion",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -1864,9 +2124,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1928,9 +2188,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
@@ -1954,9 +2214,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -1965,46 +2225,50 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.15",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -2036,14 +2300,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -2055,18 +2319,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2076,9 +2340,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2087,21 +2351,21 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "futures-core",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body",
  "http-body-util",
  "hyper",
@@ -2125,6 +2389,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-util",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -2153,13 +2418,35 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if 1.0.0",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "route-recognizer"
 version = "0.3.1"
@@ -2173,7 +2460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -2187,7 +2474,7 @@ dependencies = [
  "portable-atomic",
  "rand",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -2199,9 +2486,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -2223,9 +2510,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -2250,25 +2537,27 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -2277,15 +2566,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -2298,19 +2587,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2325,7 +2608,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand",
  "substring",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2349,7 +2632,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2358,9 +2641,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2368,15 +2651,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2405,20 +2688,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -2428,9 +2711,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2449,15 +2732,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2467,14 +2750,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2513,7 +2796,7 @@ dependencies = [
 
 [[package]]
 name = "shared"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "async-trait",
  "flarch",
@@ -2567,9 +2850,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2591,12 +2874,31 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "stun"
 version = "0.6.0"
@@ -2610,7 +2912,7 @@ dependencies = [
  "rand",
  "ring",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2644,9 +2946,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2655,9 +2957,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -2682,34 +2984,54 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2728,19 +3050,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2753,9 +3085,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2770,31 +3102,30 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2819,9 +3150,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2832,9 +3163,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2853,11 +3184,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -2866,14 +3197,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
  "pin-project-lite",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -2893,9 +3224,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -2904,20 +3235,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -2937,14 +3268,14 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 1.1.0",
+ "http 1.2.0",
  "httparse",
  "log",
  "rand",
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2963,12 +3294,18 @@ dependencies = [
  "rand",
  "ring",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -2976,31 +3313,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typetag"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "typetag-impl"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unicode-ident"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -3020,9 +3366,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3035,6 +3381,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -3043,11 +3401,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -3090,14 +3448,24 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if 1.0.0",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -3105,36 +3473,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3142,33 +3510,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -3176,13 +3545,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -3198,9 +3567,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -3211,9 +3580,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -3225,9 +3594,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3235,9 +3614,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -3270,7 +3649,7 @@ dependencies = [
  "sha2",
  "smol_str",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -3295,7 +3674,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -3331,7 +3710,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -3353,7 +3732,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -3371,7 +3750,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3386,7 +3765,7 @@ dependencies = [
  "bytes",
  "rand",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3402,7 +3781,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3425,7 +3804,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3446,7 +3825,7 @@ dependencies = [
  "nix",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3617,13 +3996,34 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -3650,7 +4050,7 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3703,7 +4103,7 @@ dependencies = [
  "rustversion",
  "serde",
  "slab",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
  "wasm-bindgen",
@@ -3766,6 +4166,30 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3784,7 +4208,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -3804,5 +4249,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/examples/ping-pong/wasm/Cargo.toml b/examples/ping-pong/wasm/Cargo.toml
index 0e20fd4c..e4a5088a 100644
--- a/examples/ping-pong/wasm/Cargo.toml
+++ b/examples/ping-pong/wasm/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 name = "ping-pong-web"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Anthony Dodd <dodd.anthonyjosiah@gmail.com>"]
 edition = "2021"
 
 [dependencies]
-shared = {path = "../shared", version = "0.8"}
-flmodules = {path = "../../../flmodules", version = "0.8"}
-flarch = {path = "../../../flarch", version = "0.8"}
+shared = { path = "../shared", version = "0.9" }
+flmodules = { path = "../../../flmodules", version = "0.9" }
+flarch = { path = "../../../flarch", features = ["node"], version = "0.9" }
 
 console_error_panic_hook = "0.1.6"
 log = "0.4"
 wasm-logger = "0.2"
-tokio = {version = "1", features = ["time"]}
+tokio = { version = "1", features = ["time"] }
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 js-sys = "0.3"
diff --git a/examples/ping-pong/wasm/src/main.rs b/examples/ping-pong/wasm/src/main.rs
index 388c52f0..bc4a4273 100644
--- a/examples/ping-pong/wasm/src/main.rs
+++ b/examples/ping-pong/wasm/src/main.rs
@@ -5,13 +5,14 @@ static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
 use console_error_panic_hook::set_once as set_panic_hook;
 use flmodules::nodeconfig::NodeConfig;
+use tokio::select;
 use ybc::TileCtx::{Ancestor, Child, Parent};
 use yew::prelude::*;
 
 use flarch::{broker::Broker, tasks::now, web_rtc::connection::ConnectionConfig};
 
 use shared::{
-    common::{NodeList, PPMessage},
+    common::{NodeList, PingPongIn, PingPongOut},
     handler::PingPong,
 };
 
@@ -23,7 +24,7 @@ struct App {
 
 enum AppMessage {
     Init,
-    NewPingPong(Broker<PPMessage>),
+    NewPingPong(Broker<PingPongIn, PingPongOut>),
     NewMessage(String),
 }
 
@@ -49,12 +50,13 @@ impl Component for App {
                 let pp_imp = self.pp_imp;
                 wasm_bindgen_futures::spawn_local(async move {
                     let id = config.info.get_id();
-                    let net = flmodules::network::network_broker_start(
+                    let net = flmodules::network::network_start(
                         config,
                         ConnectionConfig::from_signal(shared::handler::URL),
                     )
                     .await
-                    .expect("Couldn't start network");
+                    .expect("Couldn't start network")
+                    .broker;
 
                     let pp = match pp_imp {
                         true => PingPong::new(id, net)
@@ -73,31 +75,39 @@ impl Component for App {
                 let link = s.link().clone();
                 wasm_bindgen_futures::spawn_local(async move {
                     let mut list = NodeList::new(vec![]);
-                    let (mut tap, _) = pp.get_tap().await.expect("Couldn't get tap");
-                    loop {
-                        match tap.recv().await.expect("Tap has been closed") {
-                            PPMessage::FromNetwork(id, ppmsg) => {
-                                link.send_message(AppMessage::NewMessage(format!(
-                                    "Received {ppmsg:?} from {}",
-                                    list.get_name(&id)
-                                )));
-                            }
-                            PPMessage::ToNetwork(id, ppmsg) => {
-                                link.send_message(AppMessage::NewMessage(format!(
-                                    "Sending {ppmsg:?} to {}",
-                                    list.get_name(&id)
-                                )));
+                    let mut tap_in = pp.get_tap_in().await.expect("Couldn't get tap").0;
+                    let mut tap_out = pp.get_tap_out().await.expect("Couldn't get tap").0;
+                    select! {
+                        Some(msg) = tap_in.recv() => {
+                            match msg{
+                                PingPongIn::FromNetwork(from, ppmsg) => {
+                                    link.send_message(AppMessage::NewMessage(format!(
+                                        "Received {ppmsg:?} from {}",
+                                        list.get_name(&from)
+                                    )));
+                                }
+                                PingPongIn::List(new_list) => {
+                                    if list.update(new_list) {
+                                        link.send_message(AppMessage::NewMessage(format!(
+                                            "list: {}",
+                                            list.names()
+                                        )));
+                                    }
+                                }
+                                _ => {}
                             }
-                            PPMessage::List(new_list) => {
-                                if list.update(new_list) {
+                        },
+                        Some(msg) = tap_out.recv() => {
+                            match msg {
+                                PingPongOut::ToNetwork(to, ppmsg) => {
                                     link.send_message(AppMessage::NewMessage(format!(
-                                        "list: {}",
-                                        list.names()
+                                        "Sending {ppmsg:?} to {}",
+                                        list.get_name(&to)
                                     )));
                                 }
+                                _ => {}
                             }
-                            _ => {}
-                        }
+                        },
                     }
                 })
             }
diff --git a/examples/ping/Cargo.lock b/examples/ping/Cargo.lock
index 4d019c66..d024a8d3 100644
--- a/examples/ping/Cargo.lock
+++ b/examples/ping/Cargo.lock
@@ -546,9 +546,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df"
+checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
 
 [[package]]
 name = "ctr"
@@ -800,7 +800,7 @@ dependencies = [
  "async-trait",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
@@ -823,7 +823,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
+name = "flmacro"
 version = "0.8.0"
 dependencies = [
  "proc-macro2",
@@ -847,6 +847,7 @@ dependencies = [
  "itertools",
  "log",
  "names",
+ "num-bigint",
  "rand",
  "reqwest",
  "serde",
@@ -855,6 +856,7 @@ dependencies = [
  "serde_with",
  "serde_yaml",
  "sha2",
+ "strum_macros",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -1149,9 +1151,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1426,6 +1428,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1982,6 +1985,12 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+
 [[package]]
 name = "ryu"
 version = "1.0.18"
@@ -2258,6 +2267,19 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.72",
+]
+
 [[package]]
 name = "stun"
 version = "0.6.0"
@@ -2514,9 +2536,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
 dependencies = [
  "indexmap 2.4.0",
  "serde",
@@ -2861,9 +2883,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
 dependencies = [
  "rustls-pki-types",
 ]
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
index a6212f69..a33db9cd 100644
--- a/examples/ping/Cargo.toml
+++ b/examples/ping/Cargo.toml
@@ -6,8 +6,8 @@ version = "0.1.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-flarch = {path = "../../flarch", version = "0.8"}
-flmodules = {path = "../../flmodules", version = "0.8"}
+flarch = {path = "../../flarch", version = "0.9"}
+flmodules = {path = "../../flmodules", version = "0.9"}
 
 clap = {version = "4", features = ["derive"]}
 log = "0.4"
diff --git a/examples/ping/src/main.rs b/examples/ping/src/main.rs
index 6c59fad5..757ce166 100644
--- a/examples/ping/src/main.rs
+++ b/examples/ping/src/main.rs
@@ -11,7 +11,7 @@ use flarch::{
     web_rtc::connection::ConnectionConfig,
 };
 use flmodules::nodeconfig::NodeConfig;
-use flmodules::network::messages::NetworkOut;
+use flmodules::network::broker::NetworkOut;
 
 #[derive(Parser, Debug)]
 struct Args {
@@ -47,7 +47,7 @@ async fn ping() -> Result<(), BrokerError> {
     let nc = NodeConfig::new();
     log::info!("Our node-ID is {:?}", nc.info.get_id());
     // Connect to the signalling server and wait for connection requests.
-    let mut net = flmodules::network::network_start(
+    let mut net = flmodules::network::network_webrtc_start(
         nc.clone(),
         ConnectionConfig::from_signal("ws://localhost:8765"),
     )
@@ -82,7 +82,7 @@ async fn server() -> Result<(), BrokerError> {
     // Create a random node-configuration. It uses serde for easy serialization.
     let nc = NodeConfig::new();
     // Connect to the signalling server and wait for connection requests.
-    let mut net = flmodules::network::network_start(
+    let mut net = flmodules::network::network_webrtc_start(
         nc.clone(),
         ConnectionConfig::from_signal("ws://localhost:8765"),
     )
@@ -101,7 +101,7 @@ async fn client(server_id: &str) -> Result<(), BrokerError> {
     // Create a random node-configuration. It uses serde for easy serialization.
     let nc = NodeConfig::new();
     // Connect to the signalling server and wait for connection requests.
-    let mut net = flmodules::network::network_start(
+    let mut net = flmodules::network::network_webrtc_start(
         nc.clone(),
         ConnectionConfig::from_signal("ws://localhost:8765"),
     )
diff --git a/flarch/Cargo.lock b/flarch/Cargo.lock
index 7f824003..de8b59ef 100644
--- a/flarch/Cargo.lock
+++ b/flarch/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,36 +93,37 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -182,7 +183,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -205,18 +206,18 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -227,23 +228,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -287,9 +288,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
 [[package]]
 name = "block-buffer"
@@ -309,11 +310,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -323,9 +330,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 
 [[package]]
 name = "cbc"
@@ -338,9 +345,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -365,9 +372,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -390,19 +397,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "const-oid"
@@ -428,9 +425,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -505,7 +502,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -529,7 +526,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -540,14 +537,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -617,7 +614,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -657,9 +654,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -667,9 +664,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -705,13 +702,16 @@ name = "flarch"
 version = "0.8.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
@@ -730,12 +730,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
+name = "flmacro"
 version = "0.8.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -755,9 +755,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -770,9 +770,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -780,15 +780,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -797,38 +797,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -861,7 +861,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
 ]
 
 [[package]]
@@ -876,9 +888,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "group"
@@ -899,15 +911,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "hex"
@@ -935,9 +941,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -946,9 +952,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "humantime"
@@ -958,9 +964,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -979,6 +985,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -987,12 +1111,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1008,12 +1143,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1049,9 +1184,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1061,16 +1196,17 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1082,9 +1218,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linked-hash-map"
@@ -1092,6 +1228,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1104,9 +1246,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "md-5"
@@ -1135,9 +1277,9 @@ dependencies = [
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1151,22 +1293,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1229,9 +1370,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1247,9 +1388,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1259,9 +1400,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1277,9 +1418,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1310,6 +1451,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1337,9 +1484,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1371,9 +1518,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1401,18 +1548,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1444,14 +1591,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -1463,18 +1610,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1484,9 +1631,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1495,9 +1642,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rfc6979"
@@ -1517,13 +1664,35 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rtcp"
 version = "0.11.0"
@@ -1575,9 +1744,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -1602,19 +1771,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
 [[package]]
 name = "rustls-webpki"
@@ -1627,11 +1795,17 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -1644,19 +1818,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -1695,7 +1863,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -1704,9 +1872,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1714,15 +1882,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -1740,20 +1908,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -1763,15 +1931,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -1781,14 +1949,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -1867,9 +2035,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1891,6 +2059,12 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -1944,9 +2118,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1973,34 +2147,34 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2019,34 +2193,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "tinystr"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
- "tinyvec_macros",
+ "displaydoc",
+ "zerovec",
 ]
 
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2061,23 +2230,22 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
@@ -2099,9 +2267,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2157,32 +2325,17 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -2202,9 +2355,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2217,6 +2370,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2225,11 +2390,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2263,14 +2428,24 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2278,36 +2453,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2315,33 +2490,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -2349,20 +2525,20 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -2374,9 +2550,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2713,6 +2889,27 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -2761,6 +2958,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -2779,7 +3000,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -2799,5 +3041,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/flarch/Cargo.toml b/flarch/Cargo.toml
index 43d6e18c..eb2b05d8 100644
--- a/flarch/Cargo.toml
+++ b/flarch/Cargo.toml
@@ -8,14 +8,15 @@ license = "MIT OR Apache-2.0"
 name = "flarch"
 readme = "README.md"
 repository = "https://github.com/ineiti/fledger"
-version = "0.8.0"
+version = "0.9.0"
 
 [features]
-node = []
+node = ["flmacro/node"]
 
 [dependencies]
-flarch_macro = { version = "0.8", path = "../flarch_macro" }
+flmacro = { version = "0.9", path = "../flmacro" }
 
+bytes = "1.9"
 chrono = "0.4"
 env_logger = "0.11"
 futures = "0.3"
@@ -32,6 +33,8 @@ serde_yaml = "0.8"
 serde_json = "1"
 serde = { version = "1", features = ["derive"] }
 sha2 = "0.10"
+rmp-serde = "1"
+btparse = "0.2"
 
 # For libc
 [target.'cfg(target_family="unix")'.dependencies]
diff --git a/flarch/README.md b/flarch/README.md
index 34c55328..c415138c 100644
--- a/flarch/README.md
+++ b/flarch/README.md
@@ -11,9 +11,63 @@ The following methods / structures are available:
   - `interval(dur: Duration)` - creates a stream that will send the expected time of resolution every `dur`
   - `Interval` - a stream created by `interval`
 
-By default the crate compiles for `libc`.
-
 ## Features
 
-- `wasm` compiles for the wasm target
-- `node` compiles for the node target
\ No newline at end of file
+- `node` compiles for the node target
+
+# Broker
+
+I wanted to create a common code for both the libc- and wasm-implementation for
+Fledger.
+Unfortunately it is difficult by the fact that libc allows to use threads
+(and sometimes needs them), so some structures need to have the `Send` and `Sync`
+traits.
+But these traits are not available for all necessary websys-modules!
+So I came up with the idea of linking all modules using a `Broker` system.
+
+In short, all input and output for a module are defined as messages.
+Then each module handles incoming messages and produces outgoing messages.
+Modules can be linked together by defining `Translators` that take messages
+from one module and translate them into messages for the other module.
+
+All message-passing is done asynchronously and doesn't need intervention by
+the programmer. 
+However, this means that tests sometimes need to wait for all messages to be
+transmitted, before the results are available.
+
+## Example
+
+Given the [router-broker](../flmodules/src/router/broker.rs) with its two message-types:
+- input: `RouterIn`
+- output: `RouterOut`
+
+The [webproxy-broker](../flmodules/src/web_proxy/broker.rs) has similar two message-types:
+- input: `WebProxyIn`
+- output: `WebProxyOut`
+
+For the webproxy to be able to use the router, it has to connect to the input and output
+of the router.
+This happens with the following line:
+
+```rust
+  web_proxy
+      .add_translator_link(
+          router,
+          Box::new(Self::link_proxy_router),
+          Box::new(Self::link_router_proxy),
+      )
+      .await?;
+```
+
+The `link_proxy_router` and `link_router_proxy` translate between the two messages, outputting
+`Option`s of the destination message.
+This allows to connect the output of the webproxy with the input of the router, and the output
+of the router with the input of the webproxy.
+
+Now every time the router receives a message from the web, it will output it with a `RouterOut`
+message.
+All connected brokers to the router will receive this `RouterOut` message, and translate it into
+their internal messages.
+The broker system will call the appropriate handlers to create output messages from the modules,
+which will then be passed to `RouterIn`, and back to the network.
+This all happens in the background, both for `libc` and `wasm` compilation.
\ No newline at end of file
diff --git a/flarch/src/broker.rs b/flarch/src/broker.rs
index ab0fb9d2..c0a41c46 100644
--- a/flarch/src/broker.rs
+++ b/flarch/src/broker.rs
@@ -10,8 +10,8 @@
 //!
 //! # Subsystems
 //!
-//! Every broker has a certain number of subsystems.
-//! A handler is a step in the passage of a message through the broker.
+//! Every Broker has a certain number of subsystems.
+//! A handler is a step in the passage of a message through the Broker.
 //! The following subsystems exist:
 //!
 //!
@@ -41,12 +41,24 @@ use std::{
     },
 };
 
-use flarch_macro::platform_async_trait;
-use futures::{future::BoxFuture, lock::Mutex};
+use futures::lock::Mutex;
 use thiserror::Error;
 use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender};
 
 use crate::{nodeids::U256, tasks::spawn_local};
+use flmacro::{platform_async_trait, target_send};
+
+#[cfg(any(target_family = "wasm", feature = "node"))]
+pub mod asy {
+    pub trait Async {}
+    impl<T> Async for T {}
+}
+#[cfg(all(target_family = "unix", not(feature="node")))]
+pub mod asy {
+    pub trait Async: Sync + Send {}
+    impl<T: Sync + Send> Async for T {}
+}
+use asy::*;
 
 #[derive(Debug, Error)]
 /// The only error that can happen is that sending to another broker fails.
@@ -55,6 +67,8 @@ pub enum BrokerError {
     #[error("While sending to {0}")]
     /// Couldn't send to this queue.
     SendQueue(String),
+    #[error("Translation error")]
+    Translation,
 }
 
 /// Identifies a broker for loop detection.
@@ -64,7 +78,7 @@ pub type BrokerID = U256;
 /// to make sure no loop is created.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Destination {
-    /// To all handlers in this broker
+    /// To all handlers in this Broker
     All,
     /// Only to handlers which represent no tap - useful for tests
     NoTap,
@@ -74,12 +88,12 @@ pub enum Destination {
     Handled(usize),
 }
 
-enum SubsystemAction<T> {
-    Add(usize, Subsystem<T>),
+enum SubsystemAction<I, O> {
+    Add(usize, Subsystem<I, O>),
     Remove(usize),
 }
 
-impl<T> fmt::Debug for SubsystemAction<T> {
+impl<I, O> fmt::Debug for SubsystemAction<I, O> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
             SubsystemAction::Add(id, ss) => write!(f, "Add({}, {ss:?})", id),
@@ -88,63 +102,82 @@ impl<T> fmt::Debug for SubsystemAction<T> {
     }
 }
 
-#[cfg(target_family = "wasm")]
-mod asy {
-    pub trait Async {}
-    impl<T> Async for T {}
-}
-#[cfg(target_family = "unix")]
-mod asy {
-    pub trait Async: Sync + Send {}
-    impl<T: Sync + Send> Async for T {}
-}
-use asy::*;
+pub trait Message: Async + Clone + fmt::Debug {}
+impl<M: Async + Clone + fmt::Debug> Message for M {}
 
-/// The broker connects the different subsystem together and offers
+/// The Broker connects the different subsystem together and offers
 /// a pub/sub system.
 /// Every subsystem can subscribe to any number of messages.
 /// Every subsystem can emit any number of messages.
 /// Incoming messages are queued in a channel and are treated when
 /// the `process` method is called.
-pub struct Broker<T: Async + Clone + fmt::Debug> {
-    intern_tx: UnboundedSender<InternMessage<T>>,
+pub struct Broker<I: Message + 'static, O: Message + 'static> {
+    intern_tx: UnboundedSender<InternMessage<I, O>>,
+    // Intern is in an always-locked state to make sure it's dropped last.
+    intern: Arc<Mutex<Intern<I, O>>>,
     subsystems: Arc<Mutex<usize>>,
     id: BrokerID,
 }
 
-impl<T: 'static + Async + Clone + fmt::Debug> Default for Broker<T> {
-    /// Create a new broker.
+impl<I: 'static + Message, O: 'static + Message> std::fmt::Debug for Broker<I, O> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Broker")
+            .field("intern_tx", &self.intern_tx)
+            .field("subsystems", &self.subsystems)
+            .field("id", &self.id)
+            .finish()
+    }
+}
+
+impl<I: 'static + Message, O: 'static + Message> Default for Broker<I, O> {
+    /// Create a new Broker.
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl<T: Async + Clone + fmt::Debug> Clone for Broker<T> {
-    /// Clone the broker. The new broker will communicate with the same "Intern" structure
-    /// and share all messages. However, each broker clone will have its own tap messages.
+impl<I: Message, O: Message> Clone for Broker<I, O> {
+    /// Clone the Broker. The new Broker will communicate with the same "Intern" structure
+    /// and share all messages. However, each Broker clone will have its own tap messages.
     fn clone(&self) -> Self {
+        // log::warn!("{}/{}: Sending clone", self.id, self.type_str());
+        self.intern_tx
+            .send(InternMessage::Cloned)
+            .expect("Couldn't inform broker::Intern of cloning");
         Self {
             intern_tx: self.intern_tx.clone(),
+            intern: self.intern.clone(),
             subsystems: Arc::clone(&self.subsystems),
             id: self.id,
         }
     }
 }
 
-impl<T: 'static + Async + Clone + fmt::Debug> Broker<T> {
-    /// Creates a new broker of type <T> and initializes it without any subsystems.
+impl<I: Message + 'static, O: Message + 'static> Drop for Broker<I, O> {
+    fn drop(&mut self) {
+        // log::warn!("{}/{}: Sending Dropped", self.id, self.type_str());
+        self.intern_tx
+            .send(InternMessage::Dropped)
+            .err()
+            .map(|e| log::warn!("{}: Couldn't send 'Dropped': {e:?}", self.type_str()));
+    }
+}
+
+impl<I: 'static + Message, O: 'static + Message> Broker<I, O> {
+    /// Creates a new Broker of type <T> and initializes it without any subsystems.
     pub fn new() -> Self {
         let id = BrokerID::rnd();
-        let intern_tx = Intern::new(id);
+        let (intern_tx, intern) = Intern::new(id);
         Self {
             intern_tx,
+            intern,
             subsystems: Arc::new(Mutex::new(0)),
             id,
         }
     }
 
     /// Adds a new subsystem to send and/or receive messages.
-    pub async fn add_subsystem(&mut self, ss: Subsystem<T>) -> Result<usize, BrokerError> {
+    pub async fn add_subsystem(&mut self, ss: Subsystem<I, O>) -> Result<usize, BrokerError> {
         let subsystem = {
             let mut subsystems = self.subsystems.lock().await;
             *subsystems += 1;
@@ -158,6 +191,86 @@ impl<T: 'static + Async + Clone + fmt::Debug> Broker<T> {
         Ok(subsystem)
     }
 
+    pub async fn add_translator_link<TI: Message + 'static, TO: Message + 'static>(
+        &mut self,
+        mut broker: Broker<TI, TO>,
+        tr_o_ti: Translate<O, TI>,
+        tr_to_i: Translate<TO, I>,
+    ) -> Result<usize, BrokerError> {
+        broker.add_translator_o_ti(self.clone(), tr_to_i).await?;
+        self.add_translator_o_ti(broker, tr_o_ti).await
+    }
+
+    pub async fn add_translator_direct<TI: Message + 'static, TO: Message + 'static>(
+        &mut self,
+        mut broker: Broker<TI, TO>,
+        tr_ti_i: Translate<TI, I>,
+        tr_o_to: Translate<O, TO>,
+    ) -> Result<usize, BrokerError> {
+        broker.add_translator_i_ti(self.clone(), tr_ti_i).await?;
+        self.add_translator_o_to(broker, tr_o_to).await
+    }
+
+    pub async fn add_translator_i_ti<TI: Message + 'static, TO: Message + 'static>(
+        &mut self,
+        broker: Broker<TI, TO>,
+        i_ti: Translate<I, TI>,
+    ) -> Result<usize, BrokerError> {
+        self.add_translator(Box::new(Translator {
+            broker,
+            translate_fn_i_ti: Some(i_ti),
+            translate_fn_i_to: None,
+            translate_fn_o_ti: None,
+            translate_fn_o_to: None,
+        }))
+        .await
+    }
+
+    pub async fn add_translator_i_to<TI: Message + 'static, TO: Message + 'static>(
+        &mut self,
+        broker: Broker<TI, TO>,
+        i_to: Translate<I, TO>,
+    ) -> Result<usize, BrokerError> {
+        self.add_translator(Box::new(Translator {
+            broker,
+            translate_fn_i_ti: None,
+            translate_fn_i_to: Some(i_to),
+            translate_fn_o_ti: None,
+            translate_fn_o_to: None,
+        }))
+        .await
+    }
+
+    pub async fn add_translator_o_ti<TI: Message + 'static, TO: Message + 'static>(
+        &mut self,
+        broker: Broker<TI, TO>,
+        o_ti: Translate<O, TI>,
+    ) -> Result<usize, BrokerError> {
+        self.add_translator(Box::new(Translator {
+            broker,
+            translate_fn_i_ti: None,
+            translate_fn_i_to: None,
+            translate_fn_o_ti: Some(o_ti),
+            translate_fn_o_to: None,
+        }))
+        .await
+    }
+
+    pub async fn add_translator_o_to<TI: Message + 'static, TO: Message + 'static>(
+        &mut self,
+        broker: Broker<TI, TO>,
+        o_to: Translate<O, TO>,
+    ) -> Result<usize, BrokerError> {
+        self.add_translator(Box::new(Translator {
+            broker,
+            translate_fn_i_ti: None,
+            translate_fn_i_to: None,
+            translate_fn_o_ti: None,
+            translate_fn_o_to: Some(o_to),
+        }))
+        .await
+    }
+
     /// Removes a subsystem from the list that will be applied to new messages.
     pub async fn remove_subsystem(&mut self, ss: usize) -> Result<(), BrokerError> {
         self.intern_tx
@@ -168,9 +281,9 @@ impl<T: 'static + Async + Clone + fmt::Debug> Broker<T> {
 
     /// Adds an async tap to the subsystems that can be used to listen to messages.
     /// The async tap is returned.
-    pub async fn get_tap(&mut self) -> Result<(UnboundedReceiver<T>, usize), BrokerError> {
+    pub async fn get_tap_out(&mut self) -> Result<(UnboundedReceiver<O>, usize), BrokerError> {
         let (tx, rx) = unbounded_channel();
-        let pos = self.add_subsystem(Subsystem::Tap(tx)).await?;
+        let pos = self.add_subsystem(Subsystem::TapOut(tx)).await?;
         Ok((rx, pos))
     }
 
@@ -179,79 +292,132 @@ impl<T: 'static + Async + Clone + fmt::Debug> Broker<T> {
     /// waiting for a message!
     /// For this reason it is better to use the `get_tap` method.
     /// Returns the synchronous tap.
-    pub async fn get_tap_sync(&mut self) -> Result<(Receiver<T>, usize), BrokerError> {
+    pub async fn get_tap_out_sync(&mut self) -> Result<(Receiver<O>, usize), BrokerError> {
         let (tx, rx) = channel();
-        let pos = self.add_subsystem(Subsystem::TapSync(tx)).await?;
+        let pos = self.add_subsystem(Subsystem::TapSyncOut(tx)).await?;
         Ok((rx, pos))
     }
 
+    /// Adds an async tap to the subsystems that can be used to listen to messages.
+    /// The async tap is returned.
+    pub async fn get_tap_in(&mut self) -> Result<(UnboundedReceiver<I>, usize), BrokerError> {
+        let (tx, rx) = unbounded_channel();
+        let pos = self.add_subsystem(Subsystem::TapIn(tx)).await?;
+        Ok((rx, pos))
+    }
+
+    /// Adds a synchronous tap that can be used to listen to messages.
+    /// Care must be taken that the async handling will still continue while
+    /// waiting for a message!
+    /// For this reason it is better to use the `get_tap` method.
+    /// Returns the synchronous tap.
+    pub async fn get_tap_in_sync(&mut self) -> Result<(Receiver<I>, usize), BrokerError> {
+        let (tx, rx) = channel();
+        let pos = self.add_subsystem(Subsystem::TapSyncIn(tx)).await?;
+        Ok((rx, pos))
+    }
+
+    /// Emit a message to a given destination of other listeners.
+    /// The message will be processed asynchronously.
+    pub fn emit_msg_in_dest(&mut self, dst: Destination, msg: I) -> Result<(), BrokerError> {
+        self.intern_tx
+            .send(InternMessage::MessageIn(dst, msg))
+            .map_err(|_| BrokerError::SendQueue("emit_msg_dest".into()))
+    }
+
+    /// Emit a message to other listeners.
+    /// The message will be processed asynchronously.
+    pub fn emit_msg_in(&mut self, msg: I) -> Result<(), BrokerError> {
+        self.emit_msg_in_dest(Destination::All, msg)
+    }
+
     /// Emit a message to a given destination of other listeners.
     /// The message will be processed asynchronously.
-    pub fn emit_msg_dest(&mut self, dst: Destination, msg: T) -> Result<(), BrokerError> {
+    pub fn emit_msg_out_dest(&mut self, dst: Destination, msg: O) -> Result<(), BrokerError> {
         self.intern_tx
-            .send(InternMessage::Message(dst, msg))
+            .send(InternMessage::MessageOut(dst, msg))
             .map_err(|_| BrokerError::SendQueue("emit_msg_dest".into()))
     }
 
     /// Emit a message to other listeners.
     /// The message will be processed asynchronously.
-    pub fn emit_msg(&mut self, msg: T) -> Result<(), BrokerError> {
-        self.emit_msg_dest(Destination::All, msg)
+    pub fn emit_msg_out(&mut self, msg: O) -> Result<(), BrokerError> {
+        self.emit_msg_out_dest(Destination::All, msg)
     }
 
     /// Emit a message to a given destination of other listeners and wait for all involved
     /// brokers to settle.
-    pub async fn settle_msg_dest(&mut self, dst: Destination, msg: T) -> Result<(), BrokerError> {
+    pub async fn settle_msg_in_dest(
+        &mut self,
+        dst: Destination,
+        msg: I,
+    ) -> Result<(), BrokerError> {
         self.intern_tx
-            .send(InternMessage::Message(dst, msg))
+            .send(InternMessage::MessageIn(dst, msg))
             .map_err(|_| BrokerError::SendQueue("settle_msg_dest".into()))?;
         self.settle(vec![]).await
     }
 
     /// Emit a message to other listeners and wait for all involved brokers to settle.
-    pub async fn settle_msg(&mut self, msg: T) -> Result<(), BrokerError> {
-        self.settle_msg_dest(Destination::All, msg).await
+    pub async fn settle_msg_in(&mut self, msg: I) -> Result<(), BrokerError> {
+        self.settle_msg_in_dest(Destination::All, msg).await
     }
 
-    /// Connects to another broker. The message type of the other broker
-    /// needs to implement the TryFrom and TryInto for this broker's message
-    /// type.
-    /// Any error in the TryInto and TryFrom are interpreted as a message
-    /// that cannot be translated and that is ignored.
-    pub async fn link_bi<R: 'static + Async + Clone + fmt::Debug>(
+    /// Emit a message to a given destination of other listeners and wait for all involved
+    /// brokers to settle.
+    pub async fn settle_msg_out_dest(
         &mut self,
-        mut broker: Broker<R>,
-        link_rt: Translate<R, T>,
-        link_tr: Translate<T, R>,
+        dst: Destination,
+        msg: O,
     ) -> Result<(), BrokerError> {
-        self.forward(broker.clone(), link_tr).await;
-        broker.forward(self.clone(), link_rt).await;
+        self.intern_tx
+            .send(InternMessage::MessageOut(dst, msg))
+            .map_err(|_| BrokerError::SendQueue("settle_msg_dest".into()))?;
+        self.settle(vec![]).await
+    }
+
+    /// Emit a message to other listeners and wait for all involved brokers to settle.
+    pub async fn settle_msg_out(&mut self, msg: O) -> Result<(), BrokerError> {
+        self.settle_msg_out_dest(Destination::All, msg).await
+    }
+
+    /// Connects to another Broker.
+    /// The translations are defined using TranslateFrom and TranslateInto.
+    /// If you only own the types TI and TO, then you can call link_bi on
+    /// the 'other' Broker.
+    pub async fn link_bi<TI: 'static + Message, TO: 'static + Message>(
+        &mut self,
+        other: Broker<TI, TO>,
+    ) -> Result<(), BrokerError>
+    where
+        I: TranslateFrom<TO>,
+        O: TranslateInto<TI>,
+    {
+        self.add_translator_link(other, Box::new(O::translate), Box::new(I::translate))
+            .await?;
         Ok(())
     }
 
-    /// Forwards all messages from this broker to another broker.
-    /// The link_tr method is used to translate messages from this
-    /// broker to the other broker.
-    /// If you need a bidirectional link, use the link_bi method.
-    pub async fn forward<R: 'static + Async + Clone + fmt::Debug>(
+    /// Connects to another Broker, but in a direct way:
+    /// I forwards to TI, O forwards to TO.
+    pub async fn link_direct<TI: 'static + Message, TO: 'static + Message>(
         &mut self,
-        broker: Broker<R>,
-        link_tr: Translate<T, R>,
-    ) {
-        let translator_tr = Translator {
-            broker,
-            translate: link_tr,
-        };
-        self.add_subsystem(Subsystem::Translator(Box::new(translator_tr)))
-            .await
-            .unwrap();
+        other: Broker<TI, TO>,
+    ) -> Result<(), BrokerError>
+    where
+        I: TranslateFrom<TI>,
+        O: TranslateInto<TO>,
+    {
+        self.add_translator_direct(other, Box::new(I::translate), Box::new(O::translate))
+            .await?;
+        Ok(())
     }
 
     /// Waits for all messages in the queue to be forwarded / handled, before returning.
     /// It also calls all brokers that are signed up as forwarding targets.
     /// The caller argument is to be used when recursively settling, to avoid
     /// endless loops.
-    async fn settle(&mut self, callers: Vec<BrokerID>) -> Result<(), BrokerError> {
+    pub async fn settle(&mut self, callers: Vec<BrokerID>) -> Result<(), BrokerError> {
         let (tx, mut rx) = unbounded_channel();
         self.intern_tx
             .send(InternMessage::Settle(callers.clone(), tx))
@@ -259,105 +425,98 @@ impl<T: 'static + Async + Clone + fmt::Debug> Broker<T> {
         rx.recv().await;
         Ok(())
     }
-}
 
-#[cfg(target_family = "unix")]
-/// Defines a method that translates from message type <R> to message
-/// type <T>.
-pub type Translate<R, T> = Box<dyn Fn(R) -> Option<T> + Send + 'static>;
-#[cfg(target_family = "wasm")]
-/// Defines a method that translates from message type <R> to message
-/// type <T>.
-pub type Translate<R, T> = Box<dyn Fn(R) -> Option<T> + 'static>;
-
-struct Translator<R: Clone, S: Async + Clone + fmt::Debug> {
-    broker: Broker<S>,
-    translate: Translate<R, S>,
+    fn type_str(&self) -> String {
+        format!(
+            "<{},{}>",
+            std::any::type_name::<I>(),
+            std::any::type_name::<O>()
+        )
+    }
 }
 
-#[platform_async_trait()]
-impl<R: Async + Clone + fmt::Debug, S: 'static + Async + Clone + fmt::Debug> SubsystemTranslator<R>
-    for Translator<R, S>
-{
-    async fn translate(&mut self, trail: Vec<BrokerID>, msg: R) -> bool {
-        let msg_res = (self.translate)(msg.clone());
-        if let Some(msg_tr) = msg_res {
-            log::trace!(
-                "Translated {} -> {}: {msg_tr:?}, sending to {}",
-                std::any::type_name::<R>(),
-                std::any::type_name::<S>(),
-                self.broker.id,
-            );
-            self.broker
-                .emit_msg_dest(Destination::Forwarded(trail), msg_tr)
-                .err()
-                .map(|e| {
-                    log::error!(
-                        "{:p}: Translated message {} -> {} couldn't be queued: {e}",
-                        self,
-                        std::any::type_name::<R>(),
-                        std::any::type_name::<S>()
-                    );
-                });
-            return true;
-        }
-        false
+impl<I: 'static + Message, O: 'static + Message> Broker<I, O> {
+    pub async fn add_handler(
+        &mut self,
+        handler: SubsystemHandlerBox<I, O>,
+    ) -> Result<usize, BrokerError> {
+        self.add_subsystem(Subsystem::Handler(handler)).await
     }
 
-    async fn settle(&mut self, callers: Vec<BrokerID>) -> Result<(), BrokerError> {
-        if !callers.contains(&self.broker.id) {
-            self.broker.settle(callers).await?;
-        }
-        Ok(())
+    pub async fn add_translator(
+        &mut self,
+        translate: SubsystemTranslatorBox<I, O>,
+    ) -> Result<usize, BrokerError> {
+        self.add_subsystem(Subsystem::Translator(translate)).await
     }
 }
 
-enum InternMessage<T: Async + Clone + fmt::Debug> {
-    Subsystem(SubsystemAction<T>),
-    Message(Destination, T),
+enum InternMessage<I: Message, O: Message> {
+    Subsystem(SubsystemAction<I, O>),
+    MessageIn(Destination, I),
+    MessageOut(Destination, O),
     Settle(Vec<BrokerID>, UnboundedSender<bool>),
+    Cloned,
+    Dropped,
 }
 
-struct Intern<T: Async + Clone + fmt::Debug> {
-    main_rx: UnboundedReceiver<InternMessage<T>>,
-    subsystems: HashMap<usize, Subsystem<T>>,
-    msg_queue: Vec<(Destination, T)>,
+struct Intern<I: Message + 'static, O: Message + 'static> {
+    main_rx: UnboundedReceiver<InternMessage<I, O>>,
+    subsystems: HashMap<usize, Subsystem<I, O>>,
+    msg_queue_in: Vec<(Destination, I)>,
+    msg_queue_out: Vec<(Destination, O)>,
     id: BrokerID,
+    copies: usize,
 }
 
-impl<T: Async + Clone + fmt::Debug + 'static> Intern<T> {
-    fn new(id: BrokerID) -> UnboundedSender<InternMessage<T>> {
-        log::trace!("Creating Broker {} for {}", id, std::any::type_name::<T>());
-        let (main_tx, main_rx) = unbounded_channel::<InternMessage<T>>();
+impl<I: Message + 'static, O: Message + 'static> Intern<I, O> {
+    fn new(
+        id: BrokerID,
+    ) -> (
+        UnboundedSender<InternMessage<I, O>>,
+        Arc<Mutex<Intern<I, O>>>,
+    ) {
+        log::trace!(
+            "Creating Broker {} for {}->{}",
+            id,
+            std::any::type_name::<I>(),
+            std::any::type_name::<O>()
+        );
+        let (main_tx, main_rx) = unbounded_channel::<InternMessage<I, O>>();
+        let intern = Arc::new(Mutex::new(Self {
+            main_rx,
+            subsystems: HashMap::new(),
+            msg_queue_in: vec![],
+            msg_queue_out: vec![],
+            id,
+            copies: 1,
+        }));
+
+        let intern_arc = intern.clone();
         spawn_local(async move {
-            let mut intern = Self {
-                main_rx,
-                subsystems: HashMap::new(),
-                msg_queue: vec![],
-                id,
-            };
+            let mut intern = intern_arc.try_lock().expect("Getting global lock");
             loop {
                 if !intern.get_msg().await {
-                    log::warn!(
-                        "{}: Closed Intern.main_rx for {}",
-                        intern.id,
-                        intern.type_id()
-                    );
+                    // log::warn!(
+                    //     "{}: Closed Intern_locked.main_rx for {}",
+                    //     intern.id,
+                    //     intern.type_str()
+                    // );
                     return;
                 }
 
-                if intern.msg_queue.len() > 0 {
+                if !intern.msg_queue_in.is_empty() || !intern.msg_queue_out.is_empty() {
                     match intern.process().await {
-                        Ok(nbr) => log::trace!("{}: Processed {nbr} messages", intern.type_id()),
+                        Ok(nbr) => log::trace!("{}: Processed {nbr} messages", intern.type_str()),
                         Err(e) => {
-                            log::error!("{}: Couldn't process: {e:?}", intern.type_id());
+                            log::error!("{}: Couldn't process: {e:?}", intern.type_str());
                         }
                     }
                 }
             }
         });
 
-        main_tx
+        (main_tx, intern)
     }
 
     // The process method goes through all incoming messages and treats them from the first
@@ -367,11 +526,11 @@ impl<T: Async + Clone + fmt::Debug + 'static> Intern<T> {
     async fn process(&mut self) -> Result<usize, BrokerError> {
         let mut msg_count: usize = 0;
         loop {
+            msg_count += self.msg_queue_in.len() + self.msg_queue_out.len();
             self.process_once().await?;
-            if self.msg_queue.len() == 0 {
+            if self.msg_queue_in.is_empty() && self.msg_queue_out.is_empty() {
                 break;
             }
-            msg_count += self.msg_queue.len();
         }
         Ok(msg_count)
     }
@@ -383,18 +542,24 @@ impl<T: Async + Clone + fmt::Debug + 'static> Intern<T> {
         let msg_queue = match self.main_rx.recv().await {
             Some(msg) => msg,
             None => {
+                log::warn!(
+                    "{}/{} Closed queue before Close arrived",
+                    self.id,
+                    self.type_str()
+                );
                 return false;
             }
         };
-        let msg = match msg_queue {
+        match msg_queue {
             InternMessage::Subsystem(ss) => {
-                log::trace!("{self:p}/{} subsystem action {ss:?}", self.type_id());
+                log::trace!("{self:p}/{} subsystem action {ss:?}", self.type_str());
                 self.subsystem_action(ss);
                 return true;
             }
-            InternMessage::Message(dst, msg) => (dst, msg),
+            InternMessage::MessageIn(dst, msg) => self.msg_queue_in.push((dst, msg)),
+            InternMessage::MessageOut(dst, msg) => self.msg_queue_out.push((dst, msg)),
             InternMessage::Settle(list, reply) => {
-                let type_id = self.type_id();
+                let type_str = self.type_str();
                 if !list.contains(&self.id) {
                     let mut list = list.clone();
                     list.push(self.id);
@@ -402,23 +567,46 @@ impl<T: Async + Clone + fmt::Debug + 'static> Intern<T> {
                         ss.settle(list.clone())
                             .await
                             .err()
-                            .map(|e| log::error!("{}: While settling: {e:?}", type_id));
+                            .map(|e| log::error!("{}: While settling: {e:?}", type_str));
                     }
                 }
                 reply
                     .send(true)
                     .err()
-                    .map(|e| log::error!("{}: Couldn't send: {e:?}", type_id));
+                    .map(|e| log::error!("{}: Couldn't send: {e:?}", type_str));
                 return true;
             }
+            InternMessage::Dropped => {
+                self.copies -= 1;
+                // log::warn!(
+                //     "{}/{}: Copies now: {}",
+                //     self.id,
+                //     self.type_str(),
+                //     self.copies
+                // );
+                if self.copies == 0 {
+                    self.subsystems = HashMap::new();
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+            InternMessage::Cloned => {
+                self.copies += 1;
+                // log::warn!(
+                //     "{}/{}: Copies now: {}",
+                //     self.id,
+                //     self.type_str(),
+                //     self.copies
+                // );
+            }
         };
-        self.msg_queue.push(msg);
 
         true
     }
 
     /// Adds a SubsystemInit
-    fn subsystem_action(&mut self, ssa: SubsystemAction<T>) {
+    fn subsystem_action(&mut self, ssa: SubsystemAction<I, O>) {
         match ssa {
             SubsystemAction::Add(pos, s) => {
                 self.subsystems.insert(pos, s);
@@ -437,12 +625,18 @@ impl<T: Async + Clone + fmt::Debug + 'static> Intern<T> {
     // Every tap returning an error is considered closed and removed from
     // the list of subsystems.
     async fn process_once(&mut self) -> Result<(), BrokerError> {
-        self.process_translate_messages().await;
+        self.process_translate_out_messages().await;
+        self.process_translate_in_messages().await;
+
+        let mut subsystems_error = self.send_tap_out().await;
+        subsystems_error.extend(self.send_tap_in().await);
 
-        let mut subsystems_error = self.send_tap().await;
+        self.msg_queue_out.clear();
 
         subsystems_error.extend(self.process_handle_messages().await);
 
+        self.msg_queue_in.clear();
+
         for index in subsystems_error.iter().rev() {
             self.subsystem_action(SubsystemAction::Remove(*index));
         }
@@ -450,69 +644,111 @@ impl<T: Async + Clone + fmt::Debug + 'static> Intern<T> {
         Ok(())
     }
 
-    // First run translators on the messages. For each message, if it has been
-    // translated by at least one translator, it will be deleted from the queue.
-    async fn process_translate_messages(&mut self) {
-        let mut i = 0;
-        while i < self.msg_queue.len() {
-            let (dst, msg) = &mut self.msg_queue[i];
-
+    // First run translators on the messages.
+    async fn process_translate_out_messages(&mut self) {
+        for (dst, msg) in &self.msg_queue_out {
             let mut trail = vec![];
             if let Destination::Forwarded(t) = dst.clone() {
                 trail.extend(t);
             }
             if trail.contains(&self.id) {
-                log::trace!(
+                log::warn!(
                     "{}: Endless forward-loop detected, aborting",
-                    self.type_id()
+                    self.type_str()
                 );
-                i += 1;
                 continue;
             }
             trail.push(self.id);
 
-            let mut translated = false;
             for (_, ss) in self
                 .subsystems
                 .iter_mut()
                 .filter(|(_, ss)| ss.is_translator())
             {
-                if match ss {
+                match ss {
                     Subsystem::Translator(ref mut translator) => {
-                        translator.translate(trail.clone(), msg.clone()).await
+                        translator
+                            .translate_output(trail.clone(), msg.clone())
+                            .await;
                     }
-                    Subsystem::TranslatorCallback(translator) => {
-                        (translator)(trail.clone(), msg.clone()).await
+                    _ => (),
+                }
+            }
+        }
+    }
+
+    // First run translators on the messages.
+    async fn process_translate_in_messages(&mut self) {
+        for (dst, msg) in &self.msg_queue_in {
+            let mut trail = vec![];
+            if let Destination::Forwarded(t) = dst.clone() {
+                trail.extend(t);
+            }
+            if trail.contains(&self.id) {
+                log::warn!(
+                    "{}: Endless forward-loop detected, aborting",
+                    self.type_str()
+                );
+                continue;
+            }
+            trail.push(self.id);
+
+            for (_, ss) in self
+                .subsystems
+                .iter_mut()
+                .filter(|(_, ss)| ss.is_translator())
+            {
+                match ss {
+                    Subsystem::Translator(ref mut translator) => {
+                        translator.translate_input(trail.clone(), msg.clone()).await;
                     }
-                    _ => false,
-                } {
-                    translated = true;
+                    _ => (),
                 }
             }
-            if translated {
-                self.msg_queue.remove(i);
-            } else {
-                i += 1;
+        }
+    }
+
+    // Then send the messages to the taps, except Destination::NoTap.
+    async fn send_tap_out(&mut self) -> Vec<usize> {
+        let mut faulty = vec![];
+        let msgs: Vec<O> = self
+            .msg_queue_out
+            .iter()
+            .filter(|(dst, _)| dst != &Destination::NoTap)
+            .map(|(_, msg)| msg.clone())
+            .collect();
+
+        let type_str = self.type_str();
+        for (i, ss) in self.subsystems.iter_mut() {
+            if let Err(e) = ss.send_tap_out(msgs.clone()).await {
+                log::warn!(
+                    "{}: Couldn't send to tap-out: {e:?}::{} - perhaps you should use 'remove_subsystem'?",
+                    type_str,
+                    i
+                );
+                faulty.push(*i);
             }
         }
+
+        faulty
     }
 
     // Then send the messages to the taps, except Destination::NoTap.
-    async fn send_tap(&mut self) -> Vec<usize> {
+    async fn send_tap_in(&mut self) -> Vec<usize> {
         let mut faulty = vec![];
-        let msgs: Vec<T> = self
-            .msg_queue
+        let msgs: Vec<I> = self
+            .msg_queue_in
             .iter()
             .filter(|(dst, _)| dst != &Destination::NoTap)
             .map(|(_, msg)| msg.clone())
             .collect();
 
-        let type_id = self.type_id();
-        for (i, ss) in self.subsystems.iter_mut().filter(|(_, ss)| ss.is_tap()) {
-            if let Err(e) = ss.put_messages(*i, msgs.clone()).await {
+        let type_str = self.type_str();
+        for (i, ss) in self.subsystems.iter_mut() {
+            if let Err(e) = ss.send_tap_in(msgs.clone()).await {
                 log::warn!(
-                    "{}: Couldn't send to tap: {e:?} - perhaps you should use 'remove_subsystem'?",
-                    type_id
+                    "{}: Couldn't send to tap-in: {e:?} - perhaps you should use 'remove_subsystem'?",
+                    type_str
                 );
                 faulty.push(*i);
             }
@@ -524,15 +760,15 @@ impl<T: Async + Clone + fmt::Debug + 'static> Intern<T> {
     // Finally send messages to all other subsystems, and collect
     // new messages for next call to 'process'.
     async fn process_handle_messages(&mut self) -> Vec<usize> {
-        if self.msg_queue.len() == 0 {
+        if self.msg_queue_in.is_empty() {
             return vec![];
         }
         let mut ss_remove = vec![];
         let mut new_msg_queue = vec![];
-        let type_id = self.type_id();
+        let type_str = self.type_str();
         for (index_ss, ss) in self.subsystems.iter_mut().filter(|(_, ss)| ss.is_handler()) {
-            let msgs: Vec<T> = self
-                .msg_queue
+            let msgs: Vec<I> = self
+                .msg_queue_in
                 .iter()
                 .filter(|nm| match nm.0 {
                     Destination::Handled(i) => index_ss != &i,
@@ -541,156 +777,265 @@ impl<T: Async + Clone + fmt::Debug + 'static> Intern<T> {
                 .map(|nm| &nm.1)
                 .cloned()
                 .collect();
-            match ss.put_messages(*index_ss, msgs.clone()).await {
+            match ss.send_handler(*index_ss, msgs.clone()).await {
                 Ok(mut new_msgs) => {
                     new_msg_queue.append(&mut new_msgs);
                 }
                 Err(e) => {
                     ss_remove.push(*index_ss);
-                    log::error!("{}: While sending messages: {e}", type_id);
+                    log::error!("{}: While sending messages: {e}", type_str);
                 }
             }
         }
-        self.msg_queue = new_msg_queue;
+        self.msg_queue_out.append(&mut new_msg_queue);
 
         ss_remove
     }
 
-    fn type_id(&self) -> String {
-        std::any::type_name::<T>().into()
+    fn type_str(&self) -> String {
+        format!(
+            "<{},{}>",
+            std::any::type_name::<I>(),
+            std::any::type_name::<O>()
+        )
     }
 }
 
-#[cfg(target_family = "wasm")]
-/// Subsystems available in a broker.
-/// Every subsystem can be added zero, one, or more times.
-pub enum Subsystem<T> {
-    Tap(UnboundedSender<T>),
-    TapSync(Sender<T>),
-    Handler(Box<dyn SubsystemHandler<T>>),
-    Translator(Box<dyn SubsystemTranslator<T>>),
-    Callback(SubsystemCallback<T>),
-    TranslatorCallback(SubsystemTranslatorCallback<T>),
+impl<I: Message + 'static, O: Message + 'static> Drop for Intern<I, O> {
+    fn drop(&mut self) {
+        // log::warn!(
+        //     "{}/{}: Intern dropped at counter {}",
+        //     self.id,
+        //     self.type_str(),
+        //     self.copies
+        // );
+    }
 }
-#[cfg(target_family = "unix")]
-/// Subsystems available in a broker.
+
+/// Subsystems available in a Broker.
 /// Every subsystem can be added zero, one, or more times.
-pub enum Subsystem<T> {
-    Tap(UnboundedSender<T>),
-    TapSync(Sender<T>),
-    Handler(Box<dyn SubsystemHandler<T> + Send>),
-    Translator(Box<dyn SubsystemTranslator<T> + Send>),
-    Callback(SubsystemCallback<T>),
-    TranslatorCallback(SubsystemTranslatorCallback<T>),
+pub enum Subsystem<I, O> {
+    TapIn(UnboundedSender<I>),
+    TapOut(UnboundedSender<O>),
+    TapSyncIn(Sender<I>),
+    TapSyncOut(Sender<O>),
+    Handler(SubsystemHandlerBox<I, O>),
+    Translator(SubsystemTranslatorBox<I, O>),
 }
 
-impl<T: Async + Clone + fmt::Debug> Subsystem<T> {
-    async fn put_messages(
-        &mut self,
-        index: usize,
-        msgs: Vec<T>,
-    ) -> Result<Vec<(Destination, T)>, BrokerError> {
+impl<I: Message, O: Message> Subsystem<I, O> {
+    async fn send_tap_out(&mut self, msgs: Vec<O>) -> Result<(), BrokerError> {
+        Ok(match self {
+            Self::TapSyncOut(s) => {
+                for msg in msgs {
+                    s.send(msg.clone())
+                        .map_err(|_| BrokerError::SendQueue("send_tap".into()))?;
+                }
+            }
+            Self::TapOut(s) => {
+                for msg in msgs {
+                    s.send(msg.clone())
+                        .map_err(|_| BrokerError::SendQueue("send_tap_async".into()))?;
+                }
+            }
+            _ => (),
+        })
+    }
+
+    async fn send_tap_in(&mut self, msgs: Vec<I>) -> Result<(), BrokerError> {
         Ok(match self {
-            Self::TapSync(s) => {
+            Self::TapSyncIn(s) => {
                 for msg in msgs {
                     s.send(msg.clone())
                         .map_err(|_| BrokerError::SendQueue("send_tap".into()))?;
                 }
-                vec![]
             }
-            Self::Tap(s) => {
+            Self::TapIn(s) => {
                 for msg in msgs {
                     s.send(msg.clone())
                         .map_err(|_| BrokerError::SendQueue("send_tap_async".into()))?;
                 }
-                vec![]
             }
+            _ => (),
+        })
+    }
+
+    async fn send_handler(
+        &mut self,
+        index: usize,
+        msgs: Vec<I>,
+    ) -> Result<Vec<(Destination, O)>, BrokerError> {
+        Ok(match self {
             Self::Handler(h) => {
                 let ret = h.messages(msgs).await;
                 ret.into_iter()
                     .map(|m| (Destination::Handled(index), m))
                     .collect()
             }
-            Self::Callback(h) => h(msgs).await,
             _ => vec![],
         })
     }
 
-    fn is_tap(&self) -> bool {
-        matches!(self, Self::TapSync(_)) || matches!(self, Self::Tap(_))
-    }
-
     fn is_translator(&self) -> bool {
-        matches!(self, Self::Translator(_)) || matches!(self, Self::TranslatorCallback(_))
+        matches!(self, Self::Translator(_))
     }
 
     fn is_handler(&self) -> bool {
-        matches!(self, Self::Handler(_)) || matches!(self, Self::Callback(_))
+        matches!(self, Self::Handler(_))
     }
 
     async fn settle(&mut self, callers: Vec<BrokerID>) -> Result<(), BrokerError> {
-        if let Self::Translator(tr) = self {
-            tr.settle(callers).await
-        } else {
-            Ok(())
+        match self {
+            Subsystem::Translator(tr) => tr.settle(callers).await,
+            _ => Ok(()),
         }
     }
 }
 
-impl<T> fmt::Debug for Subsystem<T> {
+impl<I, O> fmt::Debug for Subsystem<I, O> {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            Self::TapSync(_) => write!(f, "Tap"),
-            Self::Tap(_) => write!(f, "TapAsync"),
+            Self::TapSyncIn(_) => write!(f, "TapSyncIn"),
+            Self::TapSyncOut(_) => write!(f, "TapSyncOut"),
+            Self::TapIn(_) => write!(f, "TapAsyncIn"),
+            Self::TapOut(_) => write!(f, "TapAsyncOut"),
             Self::Handler(_) => write!(f, "Handler"),
             Self::Translator(_) => write!(f, "Translator"),
-            Self::TranslatorCallback(_) => write!(f, "TranslatorCallback"),
-            Self::Callback(_) => write!(f, "Callback"),
         }
     }
 }
 
 #[platform_async_trait()]
-pub trait SubsystemHandler<T: Async> {
-    async fn messages(&mut self, from_broker: Vec<T>) -> Vec<T>;
+#[target_send()]
+pub trait SubsystemHandler<I: Async, O: Async> {
+    async fn messages(&mut self, from_broker: Vec<I>) -> Vec<O>;
 }
 
 #[platform_async_trait()]
-pub trait SubsystemTranslator<T: Async> {
-    async fn translate(&mut self, trail: Vec<BrokerID>, from_broker: T) -> bool;
+#[target_send()]
+pub trait SubsystemTranslator<I: Async, O: Async> {
+    async fn translate_input(&mut self, trail: Vec<BrokerID>, from_broker: I);
+    async fn translate_output(&mut self, trail: Vec<BrokerID>, from_broker: O);
     async fn settle(&mut self, callers: Vec<BrokerID>) -> Result<(), BrokerError>;
 }
 
-#[cfg(target_family = "wasm")]
-type SubsystemCallback<T> = Box<dyn Fn(Vec<T>) -> BoxFuture<'static, Vec<(Destination, T)>>>;
-#[cfg(target_family = "unix")]
-type SubsystemCallback<T> =
-    Box<dyn Fn(Vec<T>) -> BoxFuture<'static, Vec<(Destination, T)>> + Send + Sync>;
-#[cfg(target_family = "wasm")]
-type SubsystemTranslatorCallback<T> = Box<dyn Fn(Vec<BrokerID>, T) -> BoxFuture<'static, bool>>;
-#[cfg(target_family = "unix")]
-type SubsystemTranslatorCallback<T> =
-    Box<dyn Fn(Vec<BrokerID>, T) -> BoxFuture<'static, bool> + Send + Sync>;
+#[target_send()]
+pub type Translate<A, B> = Box<dyn Fn(A) -> Option<B> + 'static>;
+
+pub struct Translator<I: Message, O: Message, TI: Message + 'static, TO: Message + 'static> {
+    broker: Broker<TI, TO>,
+    translate_fn_i_ti: Option<Translate<I, TI>>,
+    translate_fn_i_to: Option<Translate<I, TO>>,
+    translate_fn_o_ti: Option<Translate<O, TI>>,
+    translate_fn_o_to: Option<Translate<O, TO>>,
+}
+
+impl<I: Message, O: Message, TI: Message + 'static, TO: Message + 'static>
+    Translator<I, O, TI, TO>
+{
+    async fn emit_ti_to(&mut self, trail: Vec<BrokerID>, msg_ti: Option<TI>, msg_to: Option<TO>) {
+        if let Some(msg_tr) = msg_ti {
+            if let Err(e) = self
+                .broker
+                .emit_msg_in_dest(Destination::Forwarded(trail.clone()), msg_tr)
+            {
+                log::error!("Translated message couldn't be queued: {e}",);
+            };
+        }
+        if let Some(msg_tr) = msg_to {
+            if let Err(e) = self
+                .broker
+                .emit_msg_out_dest(Destination::Forwarded(trail), msg_tr)
+            {
+                log::error!("Translated message couldn't be queued: {e}",);
+            };
+        }
+    }
+}
+
+#[platform_async_trait()]
+impl<I: Message, O: Message, TI: Message + 'static, TO: Message + 'static> SubsystemTranslator<I, O>
+    for Translator<I, O, TI, TO>
+{
+    async fn translate_input(&mut self, trail: Vec<BrokerID>, msg: I) {
+        self.emit_ti_to(
+            trail,
+            self.translate_fn_i_ti
+                .as_ref()
+                .and_then(|tr| tr(msg.clone())),
+            self.translate_fn_i_to.as_ref().and_then(|tr| tr(msg)),
+        )
+        .await;
+    }
+
+    async fn translate_output(&mut self, trail: Vec<BrokerID>, msg: O) {
+        self.emit_ti_to(
+            trail,
+            self.translate_fn_o_ti
+                .as_ref()
+                .and_then(|tr| tr(msg.clone())),
+            self.translate_fn_o_to.as_ref().and_then(|tr| tr(msg)),
+        )
+        .await;
+    }
+
+    async fn settle(&mut self, callers: Vec<BrokerID>) -> Result<(), BrokerError> {
+        if !callers.contains(&self.broker.id) {
+            self.broker.settle(callers).await?;
+        }
+        Ok(())
+    }
+}
+
+#[platform_async_trait()]
+pub trait TranslateFrom<T: Message>: Sized {
+    fn translate(msg: T) -> Option<Self>;
+}
+
+#[platform_async_trait()]
+pub trait TranslateInto<T: Message> {
+    fn translate(self) -> Option<T>;
+}
+
+#[platform_async_trait()]
+pub trait TranslateLink<I: Message + 'static, O: Message + 'static, TI: Message, TO: Message>:
+    Async + Clone
+{
+    fn translate_o_ti(&self, msg: O) -> Option<TI>;
+    fn translate_to_i(&self, msg: TO) -> Option<I>;
+}
+
+#[platform_async_trait()]
+pub trait TranslateDirect<I: Message, O: Message, TI: Message, TO: Message> {
+    fn translate_o_ti(msg: O) -> Option<TO>;
+    fn translate_to_i(msg: I) -> Option<TI>;
+}
 
 #[cfg(test)]
 mod tests {
+    use thiserror::Error;
+
     use crate::{start_logging, start_logging_filter_level};
 
     use super::*;
 
     #[derive(Debug, Clone, PartialEq)]
-    pub enum BrokerTest {
+    pub enum BrokerTestIn {
         MsgA,
+    }
+
+    #[derive(Debug, Clone, PartialEq)]
+    pub enum BrokerTestOut {
         MsgB,
     }
 
     pub struct Tps {
-        reply: Vec<(BrokerTest, BrokerTest)>,
+        reply: Vec<(BrokerTestIn, BrokerTestOut)>,
     }
 
     #[platform_async_trait()]
-    impl SubsystemHandler<BrokerTest> for Tps {
-        async fn messages(&mut self, msgs: Vec<BrokerTest>) -> Vec<BrokerTest> {
+    impl SubsystemHandler<BrokerTestIn, BrokerTestOut> for Tps {
+        async fn messages(&mut self, msgs: Vec<BrokerTestIn>) -> Vec<BrokerTestOut> {
             let mut output = vec![];
             log::debug!("Msgs are: {:?} - Replies are: {:?}", msgs, self.reply);
 
@@ -704,13 +1049,13 @@ mod tests {
         }
     }
 
-    /// Test the broker with two subsystems.
+    /// Test the Broker with two subsystems.
     #[tokio::test]
     async fn test_broker_new() -> Result<(), BrokerError> {
         start_logging();
 
-        let bm_a = BrokerTest::MsgA;
-        let bm_b = BrokerTest::MsgB;
+        let bm_a = BrokerTestIn::MsgA;
+        let bm_b = BrokerTestOut::MsgB;
 
         let broker = &mut Broker::new();
         // Add a first subsystem that will reply 'msg_b' when it
@@ -720,59 +1065,67 @@ mod tests {
                 reply: vec![(bm_a.clone(), bm_b.clone())],
             })))
             .await?;
-        let (tap_tx, tap) = channel::<BrokerTest>();
-        broker.add_subsystem(Subsystem::TapSync(tap_tx)).await?;
-
-        // Shouldn't reply to a msg_b, so only 1 message.
-        broker.settle_msg(bm_b.clone()).await?;
-        assert_eq!(tap.try_iter().count(), 1);
+        let (tap, _) = broker.get_tap_out_sync().await?;
 
-        // Should reply to msg_a, so the tap should have 2 messages - the original
+        // Should reply to msg_a, so the tap should have 1 message - the original
         // and the reply.
-        broker.settle_msg(bm_a.clone()).await?;
-        assert_eq!(tap.try_iter().count(), 2);
+        broker.settle_msg_in(bm_a.clone()).await?;
+        assert_eq!(tap.try_iter().count(), 1);
 
-        // Add the same subsystem, now it should get 3 messages - the original
-        // and two replies.
+        // Add the same subsystem, now it should get 2 messages - the two replies.
         broker
             .add_subsystem(Subsystem::Handler(Box::new(Tps {
                 reply: vec![(bm_a.clone(), bm_b)],
             })))
             .await?;
-        broker.settle_msg(bm_a).await?;
-        assert_eq!(tap.try_iter().count(), 3);
+        broker.settle_msg_in(bm_a).await?;
+        assert_eq!(tap.try_iter().count(), 2);
 
         Ok(())
     }
 
     #[derive(Clone, PartialEq, Debug)]
-    enum MessageA {
+    enum MessageAI {
         One,
+        _Two,
+        _Three,
+    }
+
+    #[derive(Clone, PartialEq, Debug)]
+    enum MessageAO {
+        _Un,
+        Deux,
+        Trois,
+    }
+
+    #[derive(Clone, PartialEq, Debug)]
+    enum MessageBI {
+        _One,
         Two,
-        Four,
+        _Three,
+    }
+
+    #[derive(Clone, PartialEq, Debug)]
+    enum MessageBO {
+        Un,
+        _Deux,
+        Trois,
     }
 
-    fn translate_ab(msg: MessageA) -> Option<MessageB> {
+    fn translate_ab(msg: MessageAO) -> Option<MessageBI> {
         match msg {
-            MessageA::Two => Some(MessageB::Deux),
+            MessageAO::Deux => Some(MessageBI::Two),
             _ => None,
         }
     }
 
-    fn translate_ba(msg: MessageB) -> Option<MessageA> {
+    fn translate_ba(msg: MessageBO) -> Option<MessageAI> {
         match msg {
-            MessageB::Un => Some(MessageA::One),
+            MessageBO::Un => Some(MessageAI::One),
             _ => None,
         }
     }
 
-    #[derive(Clone, PartialEq, Debug)]
-    enum MessageB {
-        Un,
-        Deux,
-        Trois,
-    }
-
     #[derive(Error, Debug)]
     enum ConvertError {
         #[error("Wrong conversion")]
@@ -783,114 +1136,102 @@ mod tests {
 
     #[tokio::test]
     async fn link() -> Result<(), ConvertError> {
-        start_logging_filter_level(vec![], log::LevelFilter::Trace);
-
-        let mut broker_a: Broker<MessageA> = Broker::new();
-        let (tap_a_tx, tap_a_rx) = channel::<MessageA>();
-        broker_a.add_subsystem(Subsystem::TapSync(tap_a_tx)).await?;
-        let mut broker_b: Broker<MessageB> = Broker::new();
-        let (tap_b_tx, tap_b_rx) = channel::<MessageB>();
-        broker_b.add_subsystem(Subsystem::TapSync(tap_b_tx)).await?;
-
-        broker_b
-            .link_bi(
-                broker_a.clone(),
+        start_logging_filter_level(vec![], log::LevelFilter::Info);
+
+        let mut broker_a: Broker<MessageAI, MessageAO> = Broker::new();
+        let (tap_a_in, _) = broker_a.get_tap_in_sync().await?;
+        let mut broker_b: Broker<MessageBI, MessageBO> = Broker::new();
+        let (tap_b_in, _) = broker_b.get_tap_in_sync().await?;
+
+        broker_a
+            .add_translator_link(
+                broker_b.clone(),
                 Box::new(translate_ab),
                 Box::new(translate_ba),
             )
             .await?;
 
-        broker_a.settle_msg(MessageA::Two).await?;
-        if let Ok(msg) = tap_b_rx.try_recv() {
-            assert_eq!(MessageB::Deux, msg);
+        broker_a.settle_msg_out(MessageAO::Deux).await?;
+        if let Ok(msg) = tap_b_in.try_recv() {
+            assert_eq!(MessageBI::Two, msg);
         } else {
             return Err(ConvertError::Conversion("A to B".to_string()));
         }
 
-        broker_b.settle_msg(MessageB::Un).await?;
-        if let Ok(msg) = tap_a_rx.try_recv() {
-            assert_eq!(MessageA::One, msg);
+        broker_b.settle_msg_out(MessageBO::Un).await?;
+        if let Ok(msg) = tap_a_in.try_recv() {
+            assert_eq!(MessageAI::One, msg);
         } else {
             return Err(ConvertError::Conversion("B to A".to_string()));
         }
 
-        broker_a.settle_msg(MessageA::Four).await?;
+        broker_a.settle_msg_out(MessageAO::Trois).await?;
         // Remove the untranslated message
-        tap_a_rx.recv().unwrap();
-        assert!(tap_b_rx.try_recv().is_err());
-        broker_b.settle_msg(MessageB::Trois).await?;
+        assert!(tap_b_in.try_recv().is_err());
+        broker_b.settle_msg_out(MessageBO::Trois).await?;
         // Remove the untranslated message
-        tap_b_rx.recv().unwrap();
-        assert!(tap_a_rx.try_recv().is_err());
+        assert!(tap_a_in.try_recv().is_err());
 
         Ok(())
     }
 
-    // Test that a forwarding-loop doesn't block the system.
-    #[tokio::test]
-    async fn link_infinite() -> Result<(), Box<dyn std::error::Error>> {
-        start_logging_filter_level(vec![], log::LevelFilter::Trace);
-
-        let mut a = Broker::<MessageA>::new();
-        let mut b = Broker::<MessageA>::new();
-
-        a.link_bi(
-            b.clone(),
-            Box::new(|msg| Some(msg)),
-            Box::new(|msg| Some(msg)),
-        )
-        .await?;
-
-        let (tap_a, _) = a.get_tap_sync().await?;
-        let (tap_b, _) = b.get_tap_sync().await?;
-        a.settle_msg(MessageA::One).await?;
-        assert!(tap_a.try_recv().is_ok());
-        assert!(tap_b.try_recv().is_err());
-
-        Ok(())
-    }
-
-    async fn do_something(from_broker: Vec<MessageA>) -> Vec<(Destination, MessageA)> {
+    async fn _do_something(from_broker: Vec<MessageAI>) -> Vec<(Destination, MessageAO)> {
         from_broker
             .iter()
-            .filter(|msg| msg == &&MessageA::One)
-            .map(|_| (Destination::All, MessageA::Two))
+            .filter(|msg| msg == &&MessageAI::One)
+            .map(|_| (Destination::All, MessageAO::_Un))
             .collect()
     }
 
-    #[tokio::test]
-    async fn test_callback() -> Result<(), Box<dyn std::error::Error>> {
-        start_logging_filter_level(vec![], log::LevelFilter::Trace);
-
-        let mut b = Broker::new();
-        b.add_subsystem(Subsystem::Callback(Box::new(|b_in| {
-            Box::pin(do_something(b_in))
-        })))
-        .await?;
-        let tap = b.get_tap_sync().await?;
-        b.settle_msg_dest(Destination::NoTap, MessageA::One).await?;
-        assert_eq!(MessageA::Two, tap.0.recv()?);
-        Ok(())
+    #[derive(Clone, std::fmt::Debug, PartialEq)]
+    enum MessageAIO {
+        Input(MessageAI),
+        _Output(MessageAO),
     }
 
-    async fn test_translator_cb(msg: MessageA) -> bool {
-        matches!(msg, MessageA::One)
+    impl TranslateInto<MessageAIO> for MessageAO {
+        fn translate(self) -> Option<MessageAIO> {
+            Some(match self {
+                MessageAO::_Un => MessageAIO::Input(MessageAI::One),
+                MessageAO::Deux => MessageAIO::Input(MessageAI::_Two),
+                MessageAO::Trois => MessageAIO::Input(MessageAI::_Three),
+            })
+        }
     }
 
-    #[tokio::test]
-    async fn test_translator_callback() -> Result<(), Box<dyn std::error::Error>> {
-        start_logging_filter_level(vec![], log::LevelFilter::Trace);
-
-        let mut b = Broker::new();
-        b.add_subsystem(Subsystem::TranslatorCallback(Box::new(|_, b_in| {
-            Box::pin(test_translator_cb(b_in))
-        })))
-        .await?;
-        let tap = b.get_tap_sync().await?;
-        b.settle_msg(MessageA::One).await?;
-        assert!(tap.0.try_recv().is_err());
-        b.settle_msg(MessageA::Two).await?;
-        assert_eq!(MessageA::Two, tap.0.recv()?);
-        Ok(())
+    impl TranslateFrom<MessageAIO> for MessageAI {
+        fn translate(value: MessageAIO) -> Option<MessageAI> {
+            if let MessageAIO::_Output(out) = value {
+                Some(match out {
+                    MessageAO::_Un => MessageAI::One,
+                    MessageAO::Deux => MessageAI::_Two,
+                    MessageAO::Trois => MessageAI::_Three,
+                })
+            } else {
+                None
+            }
+        }
     }
+
+    // #[tokio::test]
+    // async fn test_broker() -> Result<(), BrokerError> {
+    //     start_logging_filter_level(vec![], log::LevelFilter::Info);
+
+    //     let mut bio = Broker::<MessageAI, MessageAO>::new();
+    //     let mut b = broker::Broker::<MessageAIO>::new();
+    //     bio.link_broker(b.clone()).await?;
+
+    //     let (bio_in, _) = bio.get_tap_in_sync().await?;
+    //     let (b_tap, _) = b.get_tap_sync().await?;
+
+    //     bio.settle_msg_out(MessageAO::Un).await?;
+    //     assert_eq!(
+    //         MessageAIO::Input(MessageAI::One),
+    //         b_tap.recv().expect("receive b_tap")
+    //     );
+
+    //     b.settle_msg(MessageAIO::Output(MessageAO::Deux)).await?;
+    //     assert_eq!(MessageAI::_Two, bio_in.recv().expect("receive bio_out"));
+    //     Ok(())
+    // }
 }
diff --git a/flarch/src/data_storage.rs b/flarch/src/data_storage.rs
index a0366b3f..2631a485 100644
--- a/flarch/src/data_storage.rs
+++ b/flarch/src/data_storage.rs
@@ -1,21 +1,21 @@
+use async_trait::async_trait;
 use std::{
     collections::HashMap,
     sync::{Arc, Mutex},
 };
 use thiserror::Error;
-use async_trait::async_trait;
 
-#[cfg(all(target_family="wasm", feature = "node"))]
+#[cfg(all(target_family = "wasm", feature = "node"))]
 mod node;
-#[cfg(all(target_family="wasm", feature = "node"))]
+#[cfg(all(target_family = "wasm", feature = "node"))]
 pub use node::*;
-#[cfg(all(target_family="wasm", not(feature = "node")))]
+#[cfg(all(target_family = "wasm", not(feature = "node")))]
 mod wasm;
-#[cfg(all(target_family="wasm", not(feature = "node")))]
+#[cfg(all(target_family = "wasm", not(feature = "node")))]
 pub use wasm::*;
-#[cfg(target_family="unix")]
+#[cfg(target_family = "unix")]
 mod libc;
-#[cfg(target_family="unix")]
+#[cfg(target_family = "unix")]
 pub use libc::*;
 
 #[derive(Error, Debug)]
@@ -33,7 +33,19 @@ pub trait DataStorage {
 
     fn remove(&mut self, key: &str) -> Result<(), StorageError>;
 
-    fn clone(&self) -> Box<dyn DataStorage + Send>;
+    fn clone_box(&self) -> Box<dyn DataStorage + Send>;
+}
+
+impl Clone for Box<dyn DataStorage + Send> {
+    fn clone(&self) -> Box<dyn DataStorage + Send> {
+        self.clone_box()
+    }
+}
+
+impl std::fmt::Debug for Box<dyn DataStorage + Send>{
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_tuple("Box<DataStorage>").finish()
+    }
 }
 
 /// A temporary DataStorage that keeps the data only during its lifetime.
@@ -42,9 +54,16 @@ pub struct DataStorageTemp {
 }
 
 impl DataStorageTemp {
-    pub fn new(
-    ) -> Self {
-        Self { kvs: Arc::new(Mutex::new(HashMap::new()))}
+    pub fn new() -> Self {
+        Self {
+            kvs: Arc::new(Mutex::new(HashMap::new())),
+        }
+    }
+    
+    pub fn new_box() -> Box<Self> {
+        Box::new(Self {
+            kvs: Arc::new(Mutex::new(HashMap::new())),
+        })
     }
 }
 
@@ -79,8 +98,10 @@ impl DataStorage for DataStorageTemp {
         Ok(())
     }
 
-    fn clone(&self) -> Box<dyn DataStorage + Send>{
-        Box::new(Self{kvs: Arc::clone(&self.kvs)})
+    fn clone_box(&self) -> Box<dyn DataStorage + Send> {
+        Box::new(Self {
+            kvs: Arc::clone(&self.kvs),
+        })
     }
 }
 
@@ -89,12 +110,12 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_storage() -> Result<(), Box<dyn std::error::Error>>{
+    fn test_storage() -> Result<(), Box<dyn std::error::Error>> {
         let mut ds = DataStorageTemp::new();
         ds.set("two", "three")?;
 
-        let ds2 = ds.clone();
+        let ds2 = ds.clone_box();
         assert_eq!("three", ds2.get("two")?);
         Ok(())
     }
-}
\ No newline at end of file
+}
diff --git a/flarch/src/data_storage/libc.rs b/flarch/src/data_storage/libc.rs
index 2494306c..6faa9171 100644
--- a/flarch/src/data_storage/libc.rs
+++ b/flarch/src/data_storage/libc.rs
@@ -76,7 +76,7 @@ impl DataStorage for DataStorageFile {
         Ok(())
     }
 
-    fn clone(&self) -> Box<dyn DataStorage + Send> {
+    fn clone_box(&self) -> Box<dyn DataStorage + Send> {
         Box::new(DataStorageFile {
             dir: self.dir.clone(),
             base: self.base.clone(),
diff --git a/flarch/src/data_storage/node.rs b/flarch/src/data_storage/node.rs
index 400dcf14..d11a5e79 100644
--- a/flarch/src/data_storage/node.rs
+++ b/flarch/src/data_storage/node.rs
@@ -61,7 +61,7 @@ impl DataStorage for DataStorageNode {
         Ok(())
     }
 
-    fn clone(&self) -> Box<dyn DataStorage + Send> {
+    fn clone_box(&self) -> Box<dyn DataStorage + Send> {
         Box::new(Self {
             base: self.base.clone(),
         })
diff --git a/flarch/src/data_storage/wasm.rs b/flarch/src/data_storage/wasm.rs
index 305ff7e3..d1e5c3ec 100644
--- a/flarch/src/data_storage/wasm.rs
+++ b/flarch/src/data_storage/wasm.rs
@@ -54,7 +54,7 @@ impl DataStorage for DataStorageLocal {
             .map_err(|e| StorageError::Underlying(e.as_string().unwrap()))
     }
 
-    fn clone(&self) -> Box<dyn DataStorage + Send> {
+    fn clone_box(&self) -> Box<dyn DataStorage + Send> {
         Box::new(DataStorageLocal {base: self.base.clone()})
     }
 }
diff --git a/flarch/src/lib.rs b/flarch/src/lib.rs
index edab40c6..27f2cdc9 100644
--- a/flarch/src/lib.rs
+++ b/flarch/src/lib.rs
@@ -1,3 +1,4 @@
+// pub mod broker;
 pub mod broker;
 pub mod data_storage;
 pub mod nodeids;
@@ -9,7 +10,7 @@ pub fn start_logging() {
 }
 
 pub fn start_logging_filter(filters: Vec<&str>) {
-    start_logging_filter_level(filters, log::LevelFilter::Debug);
+    start_logging_filter_level(filters, log::LevelFilter::Info);
 }
 
 pub fn start_logging_filter_level(filters: Vec<&str>, level: log::LevelFilter) {
@@ -27,5 +28,18 @@ pub fn start_logging_filter_level(filters: Vec<&str>, level: log::LevelFilter) {
     }
 }
 
-pub use flarch_macro::platform_async_trait;
-pub use rand::random;
\ No newline at end of file
+pub fn log_backtrace() -> String {
+    let backtrace = std::backtrace::Backtrace::force_capture();
+    let backtrace = btparse::deserialize(&backtrace).unwrap();
+    backtrace
+        .frames
+        .iter()
+        .skip(3)
+        .map(|f| format!("{f:?}"))
+        .take(9)
+        .collect::<Vec<_>>()
+        .join("\n")
+}
+
+pub use flmacro::platform_async_trait;
+pub use rand::random;
diff --git a/flarch/src/nodeids.rs b/flarch/src/nodeids.rs
index cec79231..c61c8f74 100644
--- a/flarch/src/nodeids.rs
+++ b/flarch/src/nodeids.rs
@@ -1,7 +1,10 @@
+use bytes::Bytes;
 use rand::random;
 use serde::{Deserialize, Serialize};
 use serde_with::{hex::Hex, serde_as};
 use sha2::digest::{consts::U32, generic_array::GenericArray};
+use sha2::{Digest, Sha256};
+use std::collections::HashMap;
 use std::num::ParseIntError;
 use std::{fmt, str::FromStr};
 use thiserror::Error;
@@ -15,9 +18,8 @@ pub enum ParseError {
 }
 
 /// Nicely formatted 256 bit structure
-// #[derive(Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde_as]
-#[derive(Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Default)]
 pub struct U256(#[serde_as(as = "Hex")] [u8; 32]);
 
 impl fmt::Display for U256 {
@@ -47,14 +49,73 @@ impl fmt::Debug for U256 {
     }
 }
 
+fn to_varint(i: usize) -> Vec<u8> {
+    if i < 0x80 {
+        return vec![i as u8];
+    }
+    let mut out = i.to_be_bytes().to_vec();
+    out = out.into_iter().skip_while(|&x| x == 0).collect();
+    let len = out.len();
+    let mut result = vec![len as u8 | 0x80];
+    result.extend(out);
+    result
+}
+
 impl U256 {
     pub fn rnd() -> U256 {
         U256 { 0: random() }
     }
 
+    pub fn hash_data(data: &[u8]) -> Self {
+        let mut hasher = Sha256::new();
+        hasher.update(to_varint(data.len()));
+        hasher.update(data);
+        Self(hasher.finalize().into())
+    }
+
+    pub fn hash_domain_parts(domain: &str, parts: &[&[u8]]) -> Self {
+        let mut hasher = Sha256::new();
+        hasher.update(to_varint(domain.len()));
+        hasher.update(domain);
+        hasher.update(to_varint(parts.len()));
+        for part in parts {
+            hasher.update(to_varint(part.len()));
+            hasher.update(part);
+        }
+
+        Self(hasher.finalize().into())
+    }
+
+    pub fn hash_domain_hashmap<K: Serialize, V: Serialize>(domain: &str, hm: &HashMap<K, V>) -> Self {
+        let mut parts = vec![];
+        for (k, v) in hm {
+            parts.push(rmp_serde::to_vec(k).unwrap());
+            parts.push(rmp_serde::to_vec(v).unwrap());
+        }
+        let slices: Vec<&[u8]> = parts.iter().map(|e| e.as_slice()).collect();
+        Self::hash_domain_parts(domain, &slices)
+    }
+
+    pub fn from_vec<V: Serialize>(domain: &str, vec: &Vec<V>) -> Self {
+        let mut parts = vec![];
+        for v in vec {
+            parts.push(rmp_serde::to_vec(v).unwrap());
+        }
+        let slices: Vec<&[u8]> = parts.iter().map(|e| e.as_slice()).collect();
+        Self::hash_domain_parts(domain, &slices)
+    }
+
     pub fn to_bytes(self) -> [u8; 32] {
         self.0
     }
+
+    pub fn bytes(&self) -> Bytes {
+        Bytes::copy_from_slice(self.as_ref())
+    }
+
+    pub fn zero() -> U256 {
+        U256 { 0: [0; 32] }
+    }
 }
 
 impl FromStr for U256 {
@@ -212,6 +273,20 @@ impl From<&Vec<U256>> for NodeIDs {
     }
 }
 
+impl fmt::Display for NodeIDs {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_fmt(format_args!(
+            "[{}]",
+            &self
+                .0
+                .iter()
+                .map(|id| id.to_string())
+                .collect::<Vec<String>>()
+                .join(","),
+        ))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::start_logging;
diff --git a/flarch/src/web_rtc/libc/web_rtc_setup.rs b/flarch/src/web_rtc/libc/web_rtc_setup.rs
index 5216e8d8..0d974aa6 100644
--- a/flarch/src/web_rtc/libc/web_rtc_setup.rs
+++ b/flarch/src/web_rtc/libc/web_rtc_setup.rs
@@ -3,32 +3,40 @@ use std::sync::{
     Arc,
 };
 
-use crate::broker::{Broker, Subsystem, SubsystemHandler};
 use async_trait::async_trait;
 use futures::lock::Mutex;
 use webrtc::{
     api::{
-        interceptor_registry::register_default_interceptors, media_engine::MediaEngine, setting_engine::SettingEngine, APIBuilder
-    }, data_channel::{data_channel_message::DataChannelMessage, RTCDataChannel}, ice::mdns::MulticastDnsMode, ice_transport::{
+        interceptor_registry::register_default_interceptors, media_engine::MediaEngine,
+        setting_engine::SettingEngine, APIBuilder,
+    },
+    data_channel::{data_channel_message::DataChannelMessage, RTCDataChannel},
+    ice::mdns::MulticastDnsMode,
+    ice_transport::{
         ice_candidate::{RTCIceCandidate, RTCIceCandidateInit},
         ice_connection_state::RTCIceConnectionState,
         ice_credential_type::RTCIceCredentialType,
         ice_server::RTCIceServer,
-    }, interceptor::registry::Registry, peer_connection::{
+    },
+    interceptor::registry::Registry,
+    peer_connection::{
         configuration::RTCConfiguration,
         peer_connection_state::RTCPeerConnectionState,
         sdp::{sdp_type::RTCSdpType, session_description::RTCSessionDescription},
         RTCPeerConnection,
-    }
+    },
 };
 
-use crate::web_rtc::{
-    connection::{ConnectionConfig, HostLogin},
-    messages::{
-        ConnType, ConnectionStateMap, DataChannelState, PeerMessage, SetupError, SignalingState,
-        WebRTCInput, WebRTCMessage, WebRTCOutput, WebRTCSpawner,
+use crate::{
+    broker::{Broker, SubsystemHandler},
+    web_rtc::{
+        connection::{ConnectionConfig, HostLogin},
+        messages::{
+            ConnType, ConnectionStateMap, DataChannelState, PeerMessage, SetupError,
+            SignalingState, WebRTCInput, WebRTCOutput, WebRTCSpawner,
+        },
+        node_connection::Direction,
     },
-    node_connection::Direction,
 };
 
 fn get_ice_server(host: HostLogin) -> RTCIceServer {
@@ -48,7 +56,7 @@ fn get_ice_server(host: HostLogin) -> RTCIceServer {
 pub struct WebRTCConnectionSetupLibc {
     connection: RTCPeerConnection,
     rtc_data: Arc<Mutex<Option<Arc<RTCDataChannel>>>>,
-    broker: Broker<WebRTCMessage>,
+    broker: Broker<WebRTCInput, WebRTCOutput>,
     // While the connection is not up, queue up messages in here.
     queue: Vec<String>,
     direction: Option<Direction>,
@@ -59,7 +67,7 @@ pub struct WebRTCConnectionSetupLibc {
 impl WebRTCConnectionSetupLibc {
     pub async fn new_box(
         connection_cfg: ConnectionConfig,
-    ) -> Result<Broker<WebRTCMessage>, SetupError> {
+    ) -> Result<Broker<WebRTCInput, WebRTCOutput>, SetupError> {
         let mut web_rtc = Box::new(WebRTCConnectionSetupLibc {
             connection: Self::make_connection(connection_cfg.clone()).await?,
             rtc_data: Arc::new(Mutex::new(None)),
@@ -73,7 +81,7 @@ impl WebRTCConnectionSetupLibc {
         web_rtc.setup_connection().await?;
 
         let mut broker = web_rtc.broker.clone();
-        broker.add_subsystem(Subsystem::Handler(web_rtc)).await?;
+        broker.add_handler(web_rtc).await?;
 
         Ok(broker)
     }
@@ -138,9 +146,7 @@ impl WebRTCConnectionSetupLibc {
                     if let Some(ice) = ice_op {
                         let ice_str = ice.to_json().unwrap().candidate;
                         broker_cl
-                            .emit_msg(WebRTCMessage::Output(WebRTCOutput::Setup(
-                                PeerMessage::IceCandidate(ice_str),
-                            )))
+                            .emit_msg_out(WebRTCOutput::Setup(PeerMessage::IceCandidate(ice_str)))
                             .err()
                             .map(|e| log::warn!("Ice candidate queued but not processed: {:?}", e));
                     }
@@ -159,18 +165,16 @@ impl WebRTCConnectionSetupLibc {
 
                 let mut broker_cl = broker_cl.clone();
                 Box::pin(async move {
-                    let msg = match s {
+                    match s {
                         RTCPeerConnectionState::Disconnected
                         | RTCPeerConnectionState::Failed
                         | RTCPeerConnectionState::Closed => {
-                            WebRTCMessage::Output(WebRTCOutput::Disconnected)
+                            broker_cl.emit_msg_out(WebRTCOutput::Disconnected)
                         }
-                        _ => WebRTCMessage::Input(WebRTCInput::UpdateState),
-                    };
-                    broker_cl
-                        .emit_msg(msg)
-                        .err()
-                        .map(|e| log::warn!("UpdateState queued but not processed: {:?}", e));
+                        _ => broker_cl.emit_msg_in(WebRTCInput::UpdateState),
+                    }
+                    .err()
+                    .map(|e| log::warn!("UpdateState queued but not processed: {:?}", e));
                 })
             },
         ));
@@ -367,7 +371,7 @@ impl WebRTCConnectionSetupLibc {
     async fn register_data_channel(
         rtc_data: Arc<Mutex<Option<Arc<RTCDataChannel>>>>,
         data_channel: Arc<RTCDataChannel>,
-        broker: Broker<WebRTCMessage>,
+        broker: Broker<WebRTCInput, WebRTCOutput>,
         resets: Arc<AtomicU32>,
     ) {
         let mut broker_cl = broker.clone();
@@ -382,11 +386,11 @@ impl WebRTCConnectionSetupLibc {
             log::trace!("DataChannel is opened");
             Box::pin(async move {
                 broker_cl
-                    .emit_msg(WebRTCMessage::Output(WebRTCOutput::Connected))
+                    .emit_msg_out(WebRTCOutput::Connected)
                     .err()
                     .map(|e| log::warn!("Connected queued but not processed: {:?}", e));
                 broker_cl
-                    .emit_msg(WebRTCMessage::Input(WebRTCInput::Flush))
+                    .emit_msg_in(WebRTCInput::Flush)
                     .err()
                     .map(|e| log::warn!("Flush queued but not processed: {:?}", e));
             })
@@ -400,7 +404,7 @@ impl WebRTCConnectionSetupLibc {
             let mut broker = broker.clone();
             Box::pin(async move {
                 broker
-                    .emit_msg(WebRTCMessage::Output(WebRTCOutput::Text(msg_str)))
+                    .emit_msg_out(WebRTCOutput::Text(msg_str))
                     .err()
                     .map(|e| log::warn!("Text queued but not processed: {:?}", e));
             })
@@ -413,21 +417,19 @@ impl WebRTCConnectionSetupLibc {
         rtc_data.lock().await.replace(data_channel);
     }
 
-    async fn msg_in(&mut self, msg: WebRTCInput) -> Result<Option<WebRTCMessage>, SetupError> {
+    async fn msg_in(&mut self, msg: WebRTCInput) -> Result<Option<WebRTCOutput>, SetupError> {
         match msg {
             WebRTCInput::Text(s) => self.send(s).await?,
             WebRTCInput::Setup(s) => {
                 if let Some(msg) = self.setup(s).await? {
-                    return Ok(Some(WebRTCMessage::Output(WebRTCOutput::Setup(msg))));
+                    return Ok(Some(WebRTCOutput::Setup(msg)));
                 }
             }
             WebRTCInput::Flush => {
                 self.send_queue().await?;
             }
             WebRTCInput::UpdateState => {
-                return Ok(Some(WebRTCMessage::Output(WebRTCOutput::State(
-                    self.get_state().await?,
-                ))));
+                return Ok(Some(WebRTCOutput::State(self.get_state().await?)));
             }
             WebRTCInput::Disconnect => {
                 if let Err(e) = self.reset().await {
@@ -477,17 +479,15 @@ impl WebRTCConnectionSetupLibc {
 }
 
 #[async_trait]
-impl SubsystemHandler<WebRTCMessage> for WebRTCConnectionSetupLibc {
-    async fn messages(&mut self, msgs: Vec<WebRTCMessage>) -> Vec<WebRTCMessage> {
+impl SubsystemHandler<WebRTCInput, WebRTCOutput> for WebRTCConnectionSetupLibc {
+    async fn messages(&mut self, msgs: Vec<WebRTCInput>) -> Vec<WebRTCOutput> {
         let mut out = vec![];
         for msg in msgs {
-            if let WebRTCMessage::Input(msg_in) = msg {
-                match self.msg_in(msg_in.clone()).await {
-                    Ok(Some(msg)) => out.push(msg),
-                    Ok(None) => {}
-                    Err(e) => {
-                        log::trace!("{:p} Error processing message {msg_in:?}: {:?}", self, e);
-                    }
+            match self.msg_in(msg.clone()).await {
+                Ok(Some(msg)) => out.push(msg),
+                Ok(None) => {}
+                Err(e) => {
+                    log::trace!("{:p} Error processing message {msg:?}: {:?}", self, e);
                 }
             }
         }
diff --git a/flarch/src/web_rtc/libc/web_socket_client.rs b/flarch/src/web_rtc/libc/web_socket_client.rs
index e3e5fbf8..ef311bf6 100644
--- a/flarch/src/web_rtc/libc/web_socket_client.rs
+++ b/flarch/src/web_rtc/libc/web_socket_client.rs
@@ -5,20 +5,18 @@ use std::pin::Pin;
 use tokio::net::TcpStream;
 use tokio_tungstenite::{connect_async, tungstenite, MaybeTlsStream, WebSocketStream};
 
-use crate::broker::{Broker, Subsystem, SubsystemHandler};
+use crate::broker::{Broker, SubsystemHandler};
 use crate::tasks::wait_ms;
-use crate::web_rtc::websocket::{
-    WSClientInput, WSClientMessage, WSClientOutput, WSError, WSSError,
-};
+use crate::web_rtc::websocket::{BrokerWSClient, WSClientIn, WSClientOut, WSError, WSSError};
 
 pub struct WebSocketClient {
     url: String,
     write: Option<SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, tungstenite::Message>>,
-    broker: Broker<WSClientMessage>,
+    broker: BrokerWSClient,
 }
 
 impl WebSocketClient {
-    pub async fn connect(url: &str) -> Result<Broker<WSClientMessage>, WSSError> {
+    pub async fn connect(url: &str) -> Result<BrokerWSClient, WSSError> {
         let wsb = WebSocketClient {
             url: url.to_string(),
             write: None,
@@ -26,9 +24,9 @@ impl WebSocketClient {
         };
         let mut broker = wsb.broker.clone();
         broker
-            .add_subsystem(Subsystem::Handler(Box::new(wsb)))
+            .add_handler(Box::new(wsb))
             .await?;
-        broker.emit_msg(WSClientMessage::Input(WSClientInput::Connect))?;
+        broker.emit_msg_in(WSClientIn::Connect)?;
         Ok(broker)
     }
 
@@ -42,7 +40,7 @@ impl WebSocketClient {
                         Ok(msg) => {
                             if msg.is_text() {
                                 broker_cl
-                                    .emit_msg(WSClientOutput::Message(msg.to_string()).into())
+                                    .emit_msg_out(WSClientOut::Message(msg.to_string()))
                                     .expect("Failed to emit message");
                             }
                         }
@@ -50,7 +48,7 @@ impl WebSocketClient {
                             log::warn!("Closing connection because of error: {:?}", e);
                             log::warn!("Trying to reconnect");
                             broker_cl
-                                .emit_msg(WSClientMessage::Input(WSClientInput::Connect))
+                                .emit_msg_in(WSClientIn::Connect)
                                 .expect("tried to reconnect");
                             return;
                         }
@@ -77,43 +75,41 @@ impl WebSocketClient {
 }
 
 #[async_trait]
-impl SubsystemHandler<WSClientMessage> for WebSocketClient {
-    async fn messages(&mut self, msgs: Vec<WSClientMessage>) -> Vec<WSClientMessage> {
+impl SubsystemHandler<WSClientIn, WSClientOut> for WebSocketClient {
+    async fn messages(&mut self, msgs: Vec<WSClientIn>) -> Vec<WSClientOut> {
         for msg in msgs {
-            if let WSClientMessage::Input(msg_in) = msg {
-                match msg_in {
-                    WSClientInput::Message(msg) => {
-                        if let Some(mut write) = self.write.as_mut() {
-                            Pin::new(&mut write)
-                                .start_send(tungstenite::Message::text(msg))
-                                .map_err(|e| WSError::Underlying(e.to_string()))
-                                .expect("Error sending message");
-                            Pin::new(&mut write)
-                                .flush()
-                                .await
-                                .map_err(|e| WSError::Underlying(e.to_string()))
-                                .expect("msg flush error");
-                        } else {
-                            log::warn!("Tried to write a message to a closed connection");
-                            if let Err(e) = self.connect_ws().await {
-                                log::error!("Couldn't connect: {e}");
-                            }
-                        }
-                    }
-                    WSClientInput::Disconnect => {
-                        if let Some(mut write) = self.write.take() {
-                            write.close().await.unwrap();
-                        } else {
-                            log::warn!("Trying to disconnect a disconnected connection");
-                        }
-                        return vec![WSClientOutput::Disconnect.into()];
-                    }
-                    WSClientInput::Connect => {
+            match msg {
+                WSClientIn::Message(msg) => {
+                    if let Some(mut write) = self.write.as_mut() {
+                        Pin::new(&mut write)
+                            .start_send(tungstenite::Message::text(msg))
+                            .map_err(|e| WSError::Underlying(e.to_string()))
+                            .expect("Error sending message");
+                        Pin::new(&mut write)
+                            .flush()
+                            .await
+                            .map_err(|e| WSError::Underlying(e.to_string()))
+                            .expect("msg flush error");
+                    } else {
+                        log::warn!("Tried to write a message to a closed connection");
                         if let Err(e) = self.connect_ws().await {
                             log::error!("Couldn't connect: {e}");
                         }
                     }
                 }
+                WSClientIn::Disconnect => {
+                    if let Some(mut write) = self.write.take() {
+                        write.close().await.unwrap();
+                    } else {
+                        log::warn!("Trying to disconnect a disconnected connection");
+                    }
+                    return vec![WSClientOut::Disconnect];
+                }
+                WSClientIn::Connect => {
+                    if let Err(e) = self.connect_ws().await {
+                        log::error!("Couldn't connect: {e}");
+                    }
+                }
             }
         }
         vec![]
diff --git a/flarch/src/web_rtc/libc/web_socket_server.rs b/flarch/src/web_rtc/libc/web_socket_server.rs
index ea69568b..f4e1bd90 100644
--- a/flarch/src/web_rtc/libc/web_socket_server.rs
+++ b/flarch/src/web_rtc/libc/web_socket_server.rs
@@ -13,9 +13,10 @@ use tokio::{
 };
 use tokio_tungstenite::{accept_async, tungstenite::Message, WebSocketStream};
 
-use crate::broker::{Broker, Subsystem, SubsystemHandler};
-use crate::web_rtc::websocket::{
-    WSError, WSSError, WSServerInput, WSServerMessage, WSServerOutput,
+use crate::web_rtc::websocket::{WSError, WSSError, WSServerIn, WSServerOut};
+use crate::{
+    broker::{Broker, SubsystemHandler},
+    web_rtc::websocket::BrokerWSServer,
 };
 
 pub struct WebSocketServer {
@@ -24,7 +25,7 @@ pub struct WebSocketServer {
 }
 
 impl WebSocketServer {
-    pub async fn new(port: u16) -> Result<Broker<WSServerMessage>, WSSError> {
+    pub async fn new(port: u16) -> Result<BrokerWSServer, WSSError> {
         let server = TcpListener::bind(format!("0.0.0.0:{}", port)).await?;
         let connections = Arc::new(Mutex::new(Vec::new()));
         let connections_cl = Arc::clone(&connections);
@@ -40,9 +41,7 @@ impl WebSocketServer {
                             log::trace!("Got new connection");
                             connections_cl.lock().await.push(conn);
                             broker_cl
-                                .emit_msg(WSServerMessage::Output(WSServerOutput::NewConnection(
-                                    connection_id,
-                                )))
+                                .emit_msg_out(WSServerOut::NewConnection(connection_id))
                                 .expect("Error sending connect message");
                         }
                         Err(e) => log::error!("Error while getting connection: {:?}", e),
@@ -53,10 +52,10 @@ impl WebSocketServer {
         });
 
         broker
-            .add_subsystem(Subsystem::Handler(Box::new(WebSocketServer {
+            .add_handler(Box::new(WebSocketServer {
                 connections,
                 conn_thread,
-            })))
+            }))
             .await?;
 
         Ok(broker)
@@ -64,34 +63,32 @@ impl WebSocketServer {
 }
 
 #[async_trait]
-impl SubsystemHandler<WSServerMessage> for WebSocketServer {
-    async fn messages(&mut self, from_broker: Vec<WSServerMessage>) -> Vec<WSServerMessage> {
+impl SubsystemHandler<WSServerIn, WSServerOut> for WebSocketServer {
+    async fn messages(&mut self, from_broker: Vec<WSServerIn>) -> Vec<WSServerOut> {
         for msg in from_broker {
-            if let WSServerMessage::Input(msg_in) = msg {
-                match msg_in {
-                    WSServerInput::Message(id, msg) => {
-                        let mut connections = self.connections.lock().await;
-                        if let Some(conn) = connections.get_mut(id) {
-                            if let Err(e) = conn.send(msg).await {
-                                log::error!("Error while sending: {e}");
-                                conn.close();
-                                connections.remove(id);
-                            }
-                        }
-                    }
-                    WSServerInput::Close(id) => {
-                        let mut connections = self.connections.lock().await;
-                        if let Some(conn) = connections.get_mut(id) {
+            match msg {
+                WSServerIn::Message(id, msg) => {
+                    let mut connections = self.connections.lock().await;
+                    if let Some(conn) = connections.get_mut(id) {
+                        if let Err(e) = conn.send(msg).await {
+                            log::error!("Error while sending: {e}");
                             conn.close();
                             connections.remove(id);
                         }
                     }
-                    WSServerInput::Stop => {
-                        log::warn!("Stopping thread");
-                        self.conn_thread.abort();
-                        return vec![WSServerMessage::Output(WSServerOutput::Stopped)];
+                }
+                WSServerIn::Close(id) => {
+                    let mut connections = self.connections.lock().await;
+                    if let Some(conn) = connections.get_mut(id) {
+                        conn.close();
+                        connections.remove(id);
                     }
                 }
+                WSServerIn::Stop => {
+                    log::trace!("Stopping thread");
+                    self.conn_thread.abort();
+                    return vec![WSServerOut::Stopped];
+                }
             }
         }
         vec![]
@@ -106,7 +103,7 @@ pub struct WSConnection {
 impl WSConnection {
     async fn new(
         stream: TcpStream,
-        broker: Broker<WSServerMessage>,
+        broker: BrokerWSServer,
         id: usize,
     ) -> Result<WSConnection, WSError> {
         let websocket = accept_async(stream)
@@ -124,7 +121,7 @@ impl WSConnection {
     }
 
     async fn loop_read(
-        mut broker: Broker<WSServerMessage>,
+        mut broker: BrokerWSServer,
         mut ws: SplitStream<WebSocketStream<TcpStream>>,
         mut rx: oneshot::Receiver<bool>,
         id: usize,
@@ -134,7 +131,7 @@ impl WSConnection {
                 select! {
                     _ = (&mut rx) => {
                         broker
-                        .emit_msg(WSServerMessage::Output(WSServerOutput::Disconnection(id)))
+                        .emit_msg_out(WSServerOut::Disconnection(id))
                         .expect("While sending message to broker.");
                         return;
                     },
@@ -143,24 +140,24 @@ impl WSConnection {
                             if let Some(out) = match msg_ws {
                                 Ok(msg) => match msg {
                                     Message::Text(s) => {
-                                        Some(WSServerMessage::Output(WSServerOutput::Message(id, s)))
+                                        Some(WSServerOut::Message(id, s))
                                     }
                                     Message::Close(_) => {
-                                        Some(WSServerMessage::Output(WSServerOutput::Disconnection(id)))
+                                        Some(WSServerOut::Disconnection(id))
                                     }
                                     _ => None,
                                 },
                                 Err(e) => {
                                     log::warn!("Closing connection because of error: {e:?}");
-                                    Some(WSServerMessage::Output(WSServerOutput::Disconnection(id)))
+                                    Some(WSServerOut::Disconnection(id))
                                 }
                             } {
                                 broker
-                                    .emit_msg(out.clone())
+                                    .emit_msg_out(out.clone())
                                     .expect("While sending message to broker.");
                                 if matches!(
                                     out,
-                                    WSServerMessage::Output(WSServerOutput::Disconnection(_))
+                                    WSServerOut::Disconnection(_)
                                 ) {
                                     return;
                                 }
@@ -191,64 +188,70 @@ impl WSConnection {
 mod tests {
     use super::*;
     use crate::broker::Destination;
-    use crate::start_logging;
+    use crate::start_logging_filter_level;
+    use crate::tasks::wait_ms;
     use crate::web_rtc::web_socket_client::WebSocketClient;
-    use crate::web_rtc::websocket::{WSClientInput, WSClientMessage, WSClientOutput};
+    use crate::web_rtc::websocket::{BrokerWSClient, WSClientIn, WSClientOut};
+    use std::error::Error;
     use std::sync::mpsc::Receiver;
 
     async fn send_client_server(
-        client: &mut Broker<WSClientMessage>,
-        server_tap: &Receiver<WSServerMessage>,
+        client: &mut BrokerWSClient,
+        server_tap: &Receiver<WSServerOut>,
         ch_index: usize,
         txt: String,
     ) {
         client
-            .emit_msg_dest(
-                Destination::NoTap,
-                WSClientInput::Message(txt.clone()).into(),
-            )
+            .settle_msg_in_dest(Destination::NoTap, WSClientIn::Message(txt.clone()))
+            .await
             .unwrap();
         assert_eq!(
             server_tap.recv().unwrap(),
-            WSServerMessage::Output(WSServerOutput::Message(ch_index, txt))
+            WSServerOut::Message(ch_index, txt)
         );
     }
 
     async fn send_server_client(
-        server: &mut Broker<WSServerMessage>,
-        client_tap: &Receiver<WSClientMessage>,
+        server: &mut BrokerWSServer,
+        client_tap: &Receiver<WSClientOut>,
         ch_index: usize,
         txt: String,
     ) {
         server
-            .emit_msg_dest(
+            .settle_msg_in_dest(
                 Destination::NoTap,
-                WSServerInput::Message(ch_index, txt.clone()).into(),
+                WSServerIn::Message(ch_index, txt.clone()),
             )
+            .await
             .unwrap();
-        assert_eq!(
-            client_tap.recv().unwrap(),
-            WSClientOutput::Message(txt).into()
-        );
+        assert_eq!(client_tap.recv().unwrap(), WSClientOut::Message(txt));
     }
 
     #[tokio::test(flavor = "multi_thread")]
-    async fn test_server() {
-        start_logging();
+    async fn test_server() -> Result<(), Box<dyn Error>> {
+        start_logging_filter_level(vec![], log::LevelFilter::Info);
         let mut server = WebSocketServer::new(8080).await.unwrap();
-        let (server_tap, _) = server.get_tap_sync().await.unwrap();
+        let (server_tap, tap0) = server.get_tap_out_sync().await.unwrap();
+
+        wait_ms(100).await;
 
         let mut client1 = WebSocketClient::connect("ws://localhost:8080")
             .await
             .unwrap();
-        let (client1_tap, _) = client1.get_tap_sync().await.unwrap();
-        log::debug!("Server reply from client 1: {:?}", server_tap.recv());
+        let (client1_tap, tap1) = client1.get_tap_out_sync().await.unwrap();
+        let reply = server_tap.recv();
+        log::debug!("Server reply from client 1: {:?}", reply);
+
+        wait_ms(100).await;
 
         let mut client2 = WebSocketClient::connect("ws://localhost:8080")
             .await
             .unwrap();
-        let (client2_tap, _) = client2.get_tap_sync().await.unwrap();
-        log::debug!("Server reply from client 2: {:?}", server_tap.recv());
+        let (client2_tap, _) = client2.get_tap_out_sync().await.unwrap();
+        let reply = server_tap.recv();
+        log::debug!("Server reply from client 2: {:?}", reply);
+
+        wait_ms(100).await;
 
         for _ in 1..=2 {
             send_client_server(&mut client1, &server_tap, 0, "Hello 1".to_string()).await;
@@ -258,10 +261,13 @@ mod tests {
             send_server_client(&mut server, &client2_tap, 1, "there 2".to_string()).await;
         }
 
-        client1.emit_msg(WSClientInput::Disconnect.into()).unwrap();
-        client2.emit_msg(WSClientInput::Disconnect.into()).unwrap();
-        server
-            .emit_msg(WSServerMessage::Input(WSServerInput::Stop))
-            .unwrap();
+        client1.emit_msg_in(WSClientIn::Disconnect).unwrap();
+        client2.emit_msg_in(WSClientIn::Disconnect).unwrap();
+        server.emit_msg_in(WSServerIn::Stop).unwrap();
+
+        server.remove_subsystem(tap0).await?;
+        client1.remove_subsystem(tap1).await?;
+
+        Ok(())
     }
 }
diff --git a/flarch/src/web_rtc/messages.rs b/flarch/src/web_rtc/messages.rs
index 46b3ccf5..b4ace34a 100644
--- a/flarch/src/web_rtc/messages.rs
+++ b/flarch/src/web_rtc/messages.rs
@@ -3,14 +3,17 @@
 //! This is a list of messages that are used by the [`crate::web_rtc::WebRTCConn`] and
 //! [`crate::web_rtc::node_connection::NodeConnection`] brokers to communicate with the libc and wasm implementations
 //! of the WebRTC subsystem.
-//! Both the wasm and the libc implementation for the WebRTC system return a [`Broker<WebRTCMessage>`]
+//! Both the wasm and the libc implementation for the WebRTC system return a [`Broker<WebRTCInput, WebRTCOutput>`]
 //! that is then given to the [`crate::web_rtc::WebRTCConn`].
 use futures::{channel::oneshot::Canceled, Future};
 use serde::{Deserialize, Serialize};
 use std::sync::mpsc::RecvError;
 use thiserror::Error;
 
-use crate::{broker::{Broker, BrokerError}, nodeids::NodeID};
+use crate::{
+    broker::{BrokerError, Broker},
+    nodeids::NodeID,
+};
 
 use super::node_connection::Direction;
 
@@ -38,12 +41,20 @@ pub enum SetupError {
 }
 
 #[derive(Debug, Clone, PartialEq)]
-/// Messages used in the WebRTC subsystem.
-pub enum WebRTCMessage {
-    /// Sent from the WebRTC subsystem
-    Output(WebRTCOutput),
-    /// Commands for the WebRTC subsystem
-    Input(WebRTCInput),
+/// Command for the WebRTC subsystem
+pub enum WebRTCInput {
+    /// Send a text message
+    Text(String),
+    /// Treat a setup message
+    Setup(PeerMessage),
+    /// Flush all pending messages
+    Flush,
+    /// Send the current state of the connection
+    UpdateState,
+    /// Try to reconnect, or throw an error if incoming connection
+    Reset,
+    /// Disconnect this node
+    Disconnect,
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -63,36 +74,22 @@ pub enum WebRTCOutput {
     Error(String),
 }
 
-#[derive(Debug, Clone, PartialEq)]
-/// Command for the WebRTC subsystem
-pub enum WebRTCInput {
-    /// Send a text message
-    Text(String),
-    /// Treat a setup message
-    Setup(PeerMessage),
-    /// Flush all pending messages
-    Flush,
-    /// Send the current state of the connection
-    UpdateState,
-    /// Try to reconnect, or throw an error if incoming connection
-    Reset,
-    /// Disconnect this node
-    Disconnect,
-}
-
-#[cfg(target_family="unix")]
-/// The spawner will create a new [`Broker<WebRTCMessage>`] ready to handle either an incoing
+#[cfg(target_family = "unix")]
+/// The spawner will create a new [`Broker<WebRTCInput, WebRTCOutput>`] ready to handle either an incoing
 /// or an outgoing connection.
 pub type WebRTCSpawner = Box<
-    dyn Fn() -> Box<dyn Future<Output = Result<Broker<WebRTCMessage>, SetupError>> + Unpin + Send>
-        + Send
+    dyn Fn() -> Box<
+            dyn Future<Output = Result<Broker<WebRTCInput, WebRTCOutput>, SetupError>>
+                + Unpin
+                + Send,
+        > + Send
         + Sync,
 >;
-#[cfg(target_family="wasm")]
-/// The spawner will create a new [`Broker<WebRTCMessage>`] ready to handle either an incoing
+#[cfg(target_family = "wasm")]
+/// The spawner will create a new [`Broker<WebRTCInput, WebRTCOutput>`] ready to handle either an incoing
 /// or an outgoing connection.
 pub type WebRTCSpawner =
-    Box<dyn Fn() -> Box<dyn Future<Output = Result<Broker<WebRTCMessage>, SetupError>> + Unpin>>;
+    Box<dyn Fn() -> Box<dyn Future<Output = Result<Broker<WebRTCInput, WebRTCOutput>, SetupError>> + Unpin>>;
 
 #[derive(PartialEq, Debug, Clone, Copy, Serialize, Deserialize)]
 /// How the current connection is being setup.
diff --git a/flarch/src/web_rtc/mod.rs b/flarch/src/web_rtc/mod.rs
index 40b3c5d6..2a908b08 100644
--- a/flarch/src/web_rtc/mod.rs
+++ b/flarch/src/web_rtc/mod.rs
@@ -17,16 +17,16 @@
 
 use std::collections::HashMap;
 
-use flarch_macro::platform_async_trait;
+use flmacro::platform_async_trait;
 
 use crate::{
-    broker::{Broker, BrokerError, Subsystem, SubsystemHandler, Translate},
+    broker::{BrokerError, Broker, SubsystemHandler},
     nodeids::NodeID,
 };
 
 use self::{
     messages::WebRTCSpawner,
-    node_connection::{NCError, NCInput, NCMessage, NCOutput, NodeConnection},
+    node_connection::{NCError, NCInput, NCOutput, NodeConnection},
 };
 
 pub mod connection;
@@ -47,47 +47,53 @@ mod libc;
 #[cfg(target_family = "unix")]
 pub use libc::*;
 
+pub type BrokerWebRTCConn = Broker<WebRTCConnInput, WebRTCConnOutput>;
+
 #[derive(Debug, Clone, PartialEq)]
-/// All messages for the [`WebRTCConn`] broker.
-pub enum WebRTCConnMessage {
-    /// Messages going to the WebRTC interface
-    InputNC(NodeID, NCInput),
-    /// Messages coming from the WebRTC interface
-    OutputNC(NodeID, NCOutput),
-    /// Connection request
+pub enum WebRTCConnInput {
+    Message(NodeID, NCInput),
     Connect(NodeID),
-    /// Disconnect this node
     Disconnect(NodeID),
 }
 
+#[derive(Debug, Clone, PartialEq)]
+pub enum WebRTCConnOutput {
+    Message(NodeID, NCOutput),
+}
+
 /// The actual implementation of the WebRTC connection setup.
 pub struct WebRTCConn {
     web_rtc: WebRTCSpawner,
-    connections: HashMap<NodeID, Broker<NCMessage>>,
-    broker: Broker<WebRTCConnMessage>,
+    connections: HashMap<NodeID, Broker<NCInput, NCOutput>>,
+    broker: BrokerWebRTCConn,
 }
 
 impl WebRTCConn {
     /// Creates a new [`Broker<WebRTCConnMessage>`] that will accept incoming connections and set up
     /// new outgoing connections.
-    pub async fn new(web_rtc: WebRTCSpawner) -> Result<Broker<WebRTCConnMessage>, BrokerError> {
+    pub async fn new(
+        web_rtc: WebRTCSpawner,
+    ) -> Result<BrokerWebRTCConn, BrokerError> {
         let mut br = Broker::new();
-        br.add_subsystem(Subsystem::Handler(Box::new(Self {
+        br.add_handler(Box::new(Self {
             web_rtc,
             connections: HashMap::new(),
             broker: br.clone(),
-        })))
+        }))
         .await?;
         Ok(br)
     }
 
     /// Ensures that a given connection exists.
-    async fn ensure_connection(&mut self, id: &NodeID) -> Result<(), NCError> {
-        if !self.connections.contains_key(id) {
+    async fn ensure_connection(&mut self, id: NodeID) -> Result<(), NCError> {
+        if !self.connections.contains_key(&id) {
             let mut nc = NodeConnection::new(&self.web_rtc).await?;
-            nc.forward(self.broker.clone(), Self::from_nc(id.clone()))
-                .await;
-            self.connections.insert(*id, nc);
+            self.connections.insert(id.clone(), nc.clone());
+            nc.add_translator_o_to(
+                self.broker.clone(),
+                Box::new(move |msg| Some(WebRTCConnOutput::Message(id.clone(), msg))),
+            )
+            .await?;
         }
 
         Ok(())
@@ -95,37 +101,28 @@ impl WebRTCConn {
 
     fn try_send(&mut self, dst: NodeID, msg: NCInput) {
         if let Some(conn) = self.connections.get_mut(&dst) {
-            conn.emit_msg(NCMessage::Input(msg.clone()))
+            conn.emit_msg_in(msg.clone())
                 .err()
                 .map(|e| log::error!("When sending message {msg:?} to webrtc: {e:?}"));
         } else {
             log::warn!("Dropping message {:?} to unconnected node {}", msg, dst);
         }
     }
-
-    fn from_nc(id: NodeID) -> Translate<NCMessage, WebRTCConnMessage> {
-        Box::new(move |msg| {
-            if let NCMessage::Output(ncmsg) = msg {
-                return Some(WebRTCConnMessage::OutputNC(id, ncmsg));
-            }
-            None
-        })
-    }
 }
 
 #[platform_async_trait()]
-impl SubsystemHandler<WebRTCConnMessage> for WebRTCConn {
-    async fn messages(&mut self, msgs: Vec<WebRTCConnMessage>) -> Vec<WebRTCConnMessage> {
+impl SubsystemHandler<WebRTCConnInput, WebRTCConnOutput> for WebRTCConn {
+    async fn messages(&mut self, msgs: Vec<WebRTCConnInput>) -> Vec<WebRTCConnOutput> {
         for msg in msgs {
             match msg {
-                WebRTCConnMessage::InputNC(dst, msg_in) => {
+                WebRTCConnInput::Message(dst, msg_in) => {
                     self.try_send(dst, msg_in);
                 }
-                WebRTCConnMessage::Disconnect(dst) => {
+                WebRTCConnInput::Disconnect(dst) => {
                     self.try_send(dst, NCInput::Disconnect);
                 }
-                WebRTCConnMessage::Connect(dst) => {
-                    self.ensure_connection(&dst)
+                WebRTCConnInput::Connect(dst) => {
+                    self.ensure_connection(dst.clone())
                         .await
                         .err()
                         .map(|e| log::error!("When starting webrtc-connection {e:?}"));
@@ -137,7 +134,6 @@ impl SubsystemHandler<WebRTCConnMessage> for WebRTCConn {
                         ),
                     );
                 }
-                _ => {}
             };
         }
         vec![]
diff --git a/flarch/src/web_rtc/node_connection.rs b/flarch/src/web_rtc/node_connection.rs
index 6f9b538a..757c9139 100644
--- a/flarch/src/web_rtc/node_connection.rs
+++ b/flarch/src/web_rtc/node_connection.rs
@@ -10,13 +10,12 @@
 //!
 //! _If you come here, I hope you're not trying to debug something that doesn't work.
 //! This code is quite obscure, and should be rewritten for the 5th time or so._
-use crate::broker::{Broker, BrokerError, Subsystem, SubsystemHandler};
-use flarch_macro::platform_async_trait;
+use crate::broker::{BrokerError, Broker, SubsystemHandler};
+use flmacro::platform_async_trait;
 use thiserror::Error;
 
 use crate::web_rtc::messages::{
-    ConnectionStateMap, DataChannelState, PeerMessage, WebRTCInput, WebRTCMessage, WebRTCOutput,
-    WebRTCSpawner,
+    ConnectionStateMap, DataChannelState, PeerMessage, WebRTCInput, WebRTCOutput, WebRTCSpawner,
 };
 
 #[derive(Error, Debug)]
@@ -34,16 +33,21 @@ pub enum NCError {
 }
 
 #[derive(Debug, Clone, PartialEq)]
-/// Messages for the [`NodeConnection`] broker.
-pub enum NCMessage {
-    /// Messages to the [`crate::web_rtc::WebRTCConn`] broker
-    Output(NCOutput),
-    /// Messages from the [`crate::web_rtc::WebRTCConn`] broker
-    Input(NCInput),
-    /// Messages to/from the incoming connection
-    Incoming(WebRTCMessage),
-    /// Messages to/from the outgoing connection
-    Outgoing(WebRTCMessage),
+/// Messages from the [`crate::web_rtc::WebRTCConn`]
+pub enum NCInput {
+    /// Text to be sent over the first available connection
+    Text(String),
+    /// Disconnect all connections
+    Disconnect,
+    /// Return all states
+    GetStates,
+    /// Treat the [`PeerMessage`] to setup a new connection with the
+    /// given direction
+    Setup(Direction, PeerMessage),
+    /// Messages to the incoming connection
+    Incoming(WebRTCOutput),
+    /// Messages to the outgoing connection
+    Outgoing(WebRTCOutput),
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -59,20 +63,10 @@ pub enum NCOutput {
     State(Direction, ConnectionStateMap),
     /// Setup message for the connection in the given direction
     Setup(Direction, PeerMessage),
-}
-
-#[derive(Debug, Clone, PartialEq)]
-/// Messages from the [`crate::web_rtc::WebRTCConn`]
-pub enum NCInput {
-    /// Text to be sent over the first available connection
-    Text(String),
-    /// Disconnect all connections
-    Disconnect,
-    /// Return all states
-    GetStates,
-    /// Treat the [`PeerMessage`] to setup a new connection with the
-    /// given direction
-    Setup(Direction, PeerMessage),
+    /// Messages from the incoming connection
+    Incoming(WebRTCInput),
+    /// Messages from the outgoing connection
+    Outgoing(WebRTCInput),
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -96,66 +90,52 @@ pub struct NodeConnection {
 impl NodeConnection {
     /// Create a new [`NodeConnection`] that will wait for a first message before
     /// setting up an outgoing connection.
-    pub async fn new(spawner: &WebRTCSpawner) -> Result<Broker<NCMessage>, NCError> {
+    pub async fn new(spawner: &WebRTCSpawner) -> Result<Broker<NCInput, NCOutput>, NCError> {
         let mut broker = Broker::new();
         broker
-            .link_bi(
+            .add_translator_link(
                 spawner().await?,
-                Box::new(Self::to_incoming),
-                Box::new(Self::from_incoming),
+                Box::new(|msg| match msg {
+                    NCOutput::Incoming(msg_webrtc) => Some(msg_webrtc),
+                    _ => None,
+                }),
+                Box::new(|msg_webrtc| Some(NCInput::Incoming(msg_webrtc))),
             )
             .await?;
+
         broker
-            .link_bi(
+            .add_translator_link(
                 spawner().await?,
-                Box::new(Self::to_outgoing),
-                Box::new(Self::from_outgoing),
+                Box::new(|msg| match msg {
+                    NCOutput::Outgoing(msg_webrtc) => Some(msg_webrtc),
+                    _ => None,
+                }),
+                Box::new(|msg_webrtc| Some(NCInput::Outgoing(msg_webrtc))),
             )
             .await?;
+
         let nc = NodeConnection {
             msg_queue: vec![],
             state_incoming: None,
             state_outgoing: None,
         };
         broker
-            .add_subsystem(Subsystem::Handler(Box::new(nc)))
+            .add_handler(Box::new(nc))
             .await?;
         Ok(broker)
     }
 
-    fn to_incoming(msg: WebRTCMessage) -> Option<NCMessage> {
-        matches!(msg, WebRTCMessage::Output(_)).then(|| (NCMessage::Incoming(msg)))
-    }
-
-    fn from_incoming(msg: NCMessage) -> Option<WebRTCMessage> {
-        match msg {
-            NCMessage::Incoming(msg) => matches!(msg, WebRTCMessage::Input(_)).then(|| (msg)),
-            _ => None,
-        }
-    }
-
-    fn to_outgoing(msg: WebRTCMessage) -> Option<NCMessage> {
-        matches!(msg, WebRTCMessage::Output(_)).then(|| (NCMessage::Outgoing(msg)))
-    }
-
-    fn from_outgoing(msg: NCMessage) -> Option<WebRTCMessage> {
-        match msg {
-            NCMessage::Outgoing(msg) => matches!(msg, WebRTCMessage::Input(_)).then(|| (msg)),
-            _ => None,
-        }
-    }
-
-    fn send(&mut self, dir: Direction, state: Option<ConnectionStateMap>) -> Vec<NCMessage> {
+    fn send(&mut self, dir: Direction, state: Option<ConnectionStateMap>) -> Vec<NCOutput> {
         if let Some(csm) = state {
             if let Some(dc) = csm.data_connection {
                 if dc == DataChannelState::Open {
                     return self
                         .msg_queue
                         .drain(..)
-                        .map(|msg| WebRTCMessage::Input(WebRTCInput::Text(msg)))
+                        .map(|msg| WebRTCInput::Text(msg))
                         .map(|msg| match dir {
-                            Direction::Incoming => NCMessage::Incoming(msg),
-                            Direction::Outgoing => NCMessage::Outgoing(msg),
+                            Direction::Incoming => NCOutput::Incoming(msg),
+                            Direction::Outgoing => NCOutput::Outgoing(msg),
                         })
                         .collect();
                 }
@@ -165,7 +145,7 @@ impl NodeConnection {
     }
 
     // First try to send through outgoing queue, if that fails, try incoming queue.
-    fn send_queue(&mut self) -> Vec<NCMessage> {
+    fn send_queue(&mut self) -> Vec<NCOutput> {
         let mut out = vec![];
         if self.msg_queue.len() > 0 {
             out.extend(self.send(Direction::Outgoing, self.state_outgoing));
@@ -176,110 +156,93 @@ impl NodeConnection {
         out
     }
 
-    fn msg_in(&mut self, msg: NCInput) -> Vec<NCMessage> {
+    fn msg_in(&mut self, msg: NCInput) -> Vec<NCOutput> {
         match msg {
             NCInput::Text(msg_str) => {
                 self.msg_queue.push(msg_str);
                 let mut out = vec![];
                 out.extend(self.send_queue());
                 if self.state_outgoing.is_none() {
-                    out.push(NCMessage::Outgoing(WebRTCMessage::Input(
-                        WebRTCInput::Setup(PeerMessage::Init),
-                    )));
+                    out.push(NCOutput::Outgoing(WebRTCInput::Setup(PeerMessage::Init)));
                     self.state_outgoing = Some(ConnectionStateMap::default());
                 }
                 out
             }
             NCInput::Disconnect => vec![
-                NCMessage::Incoming(WebRTCMessage::Input(WebRTCInput::Disconnect)),
-                NCMessage::Outgoing(WebRTCMessage::Input(WebRTCInput::Disconnect)),
+                NCOutput::Incoming(WebRTCInput::Disconnect),
+                NCOutput::Outgoing(WebRTCInput::Disconnect),
             ],
 
             NCInput::GetStates => {
                 let mut out = vec![];
                 if let Some(state) = self.state_incoming {
-                    out.push(NCMessage::Output(NCOutput::State(
-                        Direction::Incoming,
-                        state.clone(),
-                    )));
+                    out.push(NCOutput::State(Direction::Incoming, state.clone()));
                 }
                 if let Some(state) = self.state_outgoing {
-                    out.push(NCMessage::Output(NCOutput::State(
-                        Direction::Outgoing,
-                        state.clone(),
-                    )));
+                    out.push(NCOutput::State(Direction::Outgoing, state.clone()));
                 }
                 out
             }
-            NCInput::Setup(dir, pm) => {
-                match dir {
-                    Direction::Incoming => vec![NCMessage::Incoming(WebRTCMessage::Input(
-                        WebRTCInput::Setup(pm),
-                    ))],
-                    Direction::Outgoing => vec![NCMessage::Outgoing(WebRTCMessage::Input(
-                        WebRTCInput::Setup(pm),
-                    ))],
-                }
-            }
+            NCInput::Setup(dir, pm) => match dir {
+                Direction::Incoming => vec![NCOutput::Incoming(WebRTCInput::Setup(pm))],
+                Direction::Outgoing => vec![NCOutput::Outgoing(WebRTCInput::Setup(pm))],
+            },
+            _ => vec![],
         }
     }
 
-    fn msg_conn(&mut self, dir: Direction, msg: WebRTCMessage) -> Vec<NCMessage> {
+    fn msg_conn(&mut self, dir: Direction, msg: WebRTCOutput) -> Vec<NCOutput> {
         match msg {
-            WebRTCMessage::Output(msg_out) => match msg_out {
-                WebRTCOutput::Connected => {
-                    let state = Some(ConnectionStateMap {
-                        data_connection: Some(DataChannelState::Open),
-                        ..Default::default()
-                    });
-                    match dir {
-                        Direction::Incoming => self.state_incoming = state,
-                        Direction::Outgoing => self.state_outgoing = state,
-                    }
-                    let mut out = vec![NCMessage::Output(NCOutput::Connected(dir))];
-                    out.extend(self.send_queue());
-                    out
+            WebRTCOutput::Connected => {
+                let state = Some(ConnectionStateMap {
+                    data_connection: Some(DataChannelState::Open),
+                    ..Default::default()
+                });
+                match dir {
+                    Direction::Incoming => self.state_incoming = state,
+                    Direction::Outgoing => self.state_outgoing = state,
                 }
-                WebRTCOutput::Setup(pm) => vec![NCMessage::Output(NCOutput::Setup(dir, pm))],
-                WebRTCOutput::Text(msg_str) => {
-                    vec![NCMessage::Output(NCOutput::Text(msg_str))]
+                let mut out = vec![NCOutput::Connected(dir)];
+                out.extend(self.send_queue());
+                out
+            }
+            WebRTCOutput::Setup(pm) => vec![NCOutput::Setup(dir, pm)],
+            WebRTCOutput::Text(msg_str) => {
+                vec![NCOutput::Text(msg_str)]
+            }
+            WebRTCOutput::State(state) => {
+                match dir {
+                    Direction::Incoming => self.state_incoming = Some(state),
+                    Direction::Outgoing => self.state_outgoing = Some(state),
                 }
-                WebRTCOutput::State(state) => {
-                    match dir {
-                        Direction::Incoming => self.state_incoming = Some(state),
-                        Direction::Outgoing => self.state_outgoing = Some(state),
+                vec![NCOutput::State(dir, state)]
+            }
+            WebRTCOutput::Disconnected | WebRTCOutput::Error(_) => {
+                let msg = match dir {
+                    Direction::Incoming => {
+                        self.state_incoming = None;
+                        NCOutput::Incoming(WebRTCInput::Reset)
                     }
-                    vec![NCMessage::Output(NCOutput::State(dir, state))]
-                }
-                WebRTCOutput::Disconnected | WebRTCOutput::Error(_) => {
-                    let msg = match dir {
-                        Direction::Incoming => {
-                            self.state_incoming = None;
-                            NCMessage::Incoming(WebRTCMessage::Input(WebRTCInput::Reset))
-                        }
-                        Direction::Outgoing => {
-                            self.state_outgoing = None;
-                            NCMessage::Outgoing(WebRTCMessage::Input(WebRTCInput::Reset))
-                        }
-                    };
-                    vec![msg, NCMessage::Output(NCOutput::Disconnected(dir))]
-                }
-            },
-            _ => vec![],
+                    Direction::Outgoing => {
+                        self.state_outgoing = None;
+                        NCOutput::Outgoing(WebRTCInput::Reset)
+                    }
+                };
+                vec![msg, NCOutput::Disconnected(dir)]
+            }
         }
     }
 }
 
 #[platform_async_trait()]
-impl SubsystemHandler<NCMessage> for NodeConnection {
-    async fn messages(&mut self, msgs: Vec<NCMessage>) -> Vec<NCMessage> {
+impl SubsystemHandler<NCInput, NCOutput> for NodeConnection {
+    async fn messages(&mut self, msgs: Vec<NCInput>) -> Vec<NCOutput> {
         let mut out = vec![];
         for msg in msgs {
             out.extend(match msg {
-                NCMessage::Input(msg_in) => self.msg_in(msg_in),
-                NCMessage::Incoming(msg_conn) => self.msg_conn(Direction::Incoming, msg_conn),
-                NCMessage::Outgoing(msg_conn) => self.msg_conn(Direction::Outgoing, msg_conn),
-                _ => vec![],
+                NCInput::Incoming(msg_conn) => self.msg_conn(Direction::Incoming, msg_conn),
+                NCInput::Outgoing(msg_conn) => self.msg_conn(Direction::Outgoing, msg_conn),
+                _ => self.msg_in(msg),
             });
         }
 
@@ -287,14 +250,29 @@ impl SubsystemHandler<NCMessage> for NodeConnection {
     }
 }
 
-impl From<NCInput> for NCMessage {
-    fn from(msg: NCInput) -> NCMessage {
-        NCMessage::Input(msg)
+/*
+ fn to_incoming(msg: WebRTCMessage) -> Option<NCMessage> {
+    matches!(msg, WebRTCMessage::Output(_)).then(|| (NCMessage::Incoming(msg)))
+}
+
+fn from_incoming(msg: NCMessage) -> Option<WebRTCMessage> {
+    match msg {
+        NCMessage::Incoming(msg) => matches!(msg, WebRTCMessage::Input(_)).then(|| (msg)),
+        _ => None,
     }
 }
 
-impl From<NCOutput> for NCMessage {
-    fn from(msg: NCOutput) -> NCMessage {
-        NCMessage::Output(msg)
+fn to_outgoing(msg: WebRTCMessage) -> Option<NCMessage> {
+    matches!(msg, WebRTCMessage::Output(_)).then(|| (NCMessage::Outgoing(msg)))
+}
+
+fn from_outgoing(msg: NCMessage) -> Option<WebRTCMessage> {
+    match msg {
+        NCMessage::Outgoing(msg) => matches!(msg, WebRTCMessage::Input(_)).then(|| (msg)),
+        _ => None,
     }
 }
+
+    I: TranslateFrom<TO>,
+    O: TranslateInto<TI>,
+*/
diff --git a/flarch/src/web_rtc/wasm/web_rtc_setup.rs b/flarch/src/web_rtc/wasm/web_rtc_setup.rs
index eb1e48e7..2eaee459 100644
--- a/flarch/src/web_rtc/wasm/web_rtc_setup.rs
+++ b/flarch/src/web_rtc/wasm/web_rtc_setup.rs
@@ -12,13 +12,12 @@ use web_sys::{
     RtcSessionDescriptionInit, RtcSignalingState,
 };
 
-use crate::broker::{Broker, Subsystem, SubsystemHandler};
+use crate::broker::{Broker, SubsystemHandler};
 use crate::web_rtc::{
     connection::{ConnectionConfig, HostLogin},
     messages::{
         ConnType, ConnectionStateMap, DataChannelState, IceConnectionState, IceGatheringState,
-        PeerMessage, SetupError, SignalingState, WebRTCInput, WebRTCMessage, WebRTCOutput,
-        WebRTCSpawner,
+        PeerMessage, SetupError, SignalingState, WebRTCInput, WebRTCOutput, WebRTCSpawner,
     },
     node_connection::Direction,
 };
@@ -26,7 +25,7 @@ use crate::web_rtc::{
 pub struct WebRTCConnectionSetup {
     pub rp_conn: RtcPeerConnection,
     rtc_data: Arc<Mutex<Option<RtcDataChannel>>>,
-    broker: Broker<WebRTCMessage>,
+    broker: Broker<WebRTCInput, WebRTCOutput>,
     // While the connection is not up, queue up messages in here.
     queue: Vec<String>,
     direction: Option<Direction>,
@@ -52,7 +51,7 @@ fn get_ice_server(host: HostLogin) -> IceServer {
 
 impl WebRTCConnectionSetup {
     pub async fn new(
-        broker: Broker<WebRTCMessage>,
+        broker: Broker<WebRTCInput, WebRTCOutput>,
         config: ConnectionConfig,
     ) -> Result<WebRTCConnectionSetup, SetupError> {
         Ok(WebRTCConnectionSetup {
@@ -119,7 +118,7 @@ impl WebRTCConnectionSetup {
         }
     }
 
-    pub fn ice_start(rp_conn: &RtcPeerConnection, broker: Broker<WebRTCMessage>) {
+    pub fn ice_start(rp_conn: &RtcPeerConnection, broker: Broker<WebRTCInput, WebRTCOutput>) {
         let broker_cl = broker.clone();
         let onicecandidate_callback1 =
             Closure::wrap(Box::new(move |ev: RtcPeerConnectionIceEvent| {
@@ -128,9 +127,7 @@ impl WebRTCConnectionSetup {
                     let cand = format!("{}", candidate.candidate());
                     wasm_bindgen_futures::spawn_local(async move {
                         broker
-                            .emit_msg(WebRTCMessage::Output(WebRTCOutput::Setup(
-                                PeerMessage::IceCandidate(cand),
-                            )))
+                            .emit_msg_out(WebRTCOutput::Setup(PeerMessage::IceCandidate(cand)))
                             .err()
                             .map(|e| log::error!("While sending ICE candidate: {:?}", e));
                     });
@@ -142,18 +139,17 @@ impl WebRTCConnectionSetup {
         let rp_conn_cl = rp_conn.clone();
         let oniceconnectionstatechange =
             Closure::wrap(Box::new(move |_: RtcPeerConnectionIceEvent| {
-                let msg = match rp_conn_cl.ice_connection_state() {
-                    RtcIceConnectionState::Failed | RtcIceConnectionState::Disconnected => {
-                        WebRTCMessage::Output(WebRTCOutput::Disconnected)
-                    }
-                    _ => WebRTCMessage::Input(WebRTCInput::UpdateState),
-                };
                 let mut broker = broker_cl.clone();
+                let rp_conn = rp_conn_cl.clone();
                 wasm_bindgen_futures::spawn_local(async move {
-                    broker
-                        .emit_msg(msg)
-                        .err()
-                        .map(|e| log::error!("While sending ICE candidate: {:?}", e));
+                    match rp_conn.ice_connection_state() {
+                        RtcIceConnectionState::Failed | RtcIceConnectionState::Disconnected => {
+                            broker.emit_msg_out(WebRTCOutput::Disconnected)
+                        }
+                        _ => broker.emit_msg_in(WebRTCInput::UpdateState),
+                    }
+                    .err()
+                    .map(|e| log::error!("While sending ICE candidate: {:?}", e));
                 });
             }) as Box<dyn FnMut(RtcPeerConnectionIceEvent)>);
         rp_conn.set_oniceconnectionstatechange(Some(
@@ -297,7 +293,7 @@ impl WebRTCConnectionSetup {
     }
 
     fn dc_set_onopen(
-        broker: Broker<WebRTCMessage>,
+        broker: Broker<WebRTCInput, WebRTCOutput>,
         rtc_data: Arc<Mutex<Option<RtcDataChannel>>>,
         dc: RtcDataChannel,
     ) {
@@ -310,7 +306,7 @@ impl WebRTCConnectionSetup {
             wasm_bindgen_futures::spawn_local(async move {
                 rtc_data.lock().await.replace(dc_clone2.clone());
                 broker_clone
-                    .emit_msg(WebRTCMessage::Output(WebRTCOutput::Connected))
+                    .emit_msg_out(WebRTCOutput::Connected)
                     .err()
                     .map(|e| log::error!("While sending connection: {:?}", e));
             });
@@ -321,7 +317,7 @@ impl WebRTCConnectionSetup {
                     let mut broker = broker_cl.clone();
                     wasm_bindgen_futures::spawn_local(async move {
                         broker
-                            .emit_msg(WebRTCMessage::Output(WebRTCOutput::Text(message)))
+                            .emit_msg_out(WebRTCOutput::Text(message))
                             .err()
                             .map(|e| log::error!("While sending message: {:?}", e));
                     });
@@ -335,7 +331,7 @@ impl WebRTCConnectionSetup {
                 let mut broker = broker_cl.clone();
                 wasm_bindgen_futures::spawn_local(async move {
                     broker
-                        .emit_msg(WebRTCMessage::Output(WebRTCOutput::Disconnected))
+                        .emit_msg_out(WebRTCOutput::Disconnected)
                         .err()
                         .map(|e| log::error!("While sending message: {:?}", e));
                 });
@@ -437,17 +433,16 @@ pub struct WebRTCConnection {
 }
 
 impl WebRTCConnection {
-    pub async fn new_box(config: ConnectionConfig) -> Result<Broker<WebRTCMessage>, SetupError> {
+    pub async fn new_box(
+        config: ConnectionConfig,
+    ) -> Result<Broker<WebRTCInput, WebRTCOutput>, SetupError> {
         let broker = Broker::new();
         let rn = WebRTCConnection {
             setup: WebRTCConnectionSetup::new(broker.clone(), config).await?,
         };
         let rp_conn = rn.setup.rp_conn.clone();
 
-        broker
-            .clone()
-            .add_subsystem(Subsystem::Handler(Box::new(rn)))
-            .await?;
+        broker.clone().add_handler(Box::new(rn)).await?;
         WebRTCConnectionSetup::ice_start(&rp_conn, broker.clone());
         Ok(broker)
     }
@@ -467,21 +462,19 @@ impl WebRTCConnection {
         })
     }
 
-    async fn msg_in(&mut self, msg: WebRTCInput) -> Result<Option<WebRTCMessage>, SetupError> {
+    async fn msg_in(&mut self, msg: WebRTCInput) -> Result<Option<WebRTCOutput>, SetupError> {
         match msg {
             WebRTCInput::Text(s) => self.setup.send(s).await?,
             WebRTCInput::Setup(s) => {
                 if let Some(msg) = self.setup(s).await? {
-                    return Ok(Some(WebRTCMessage::Output(WebRTCOutput::Setup(msg))));
+                    return Ok(Some(WebRTCOutput::Setup(msg)));
                 }
             }
             WebRTCInput::Flush => {
                 self.setup.send_queue().await?;
             }
             WebRTCInput::UpdateState => {
-                return Ok(Some(WebRTCMessage::Output(WebRTCOutput::State(
-                    self.setup.get_state().await?,
-                ))));
+                return Ok(Some(WebRTCOutput::State(self.setup.get_state().await?)));
             }
             WebRTCInput::Disconnect => self.setup.reset()?,
             WebRTCInput::Reset => self.setup.reset()?,
@@ -491,17 +484,15 @@ impl WebRTCConnection {
 }
 
 #[async_trait(?Send)]
-impl SubsystemHandler<WebRTCMessage> for WebRTCConnection {
-    async fn messages(&mut self, msgs: Vec<WebRTCMessage>) -> Vec<WebRTCMessage> {
+impl SubsystemHandler<WebRTCInput, WebRTCOutput> for WebRTCConnection {
+    async fn messages(&mut self, msgs: Vec<WebRTCInput>) -> Vec<WebRTCOutput> {
         let mut out = vec![];
         for msg in msgs {
-            if let WebRTCMessage::Input(msg_in) = msg {
-                match self.msg_in(msg_in.clone()).await {
-                    Ok(Some(msg)) => out.push(msg),
-                    Ok(None) => {}
-                    Err(e) => {
-                        log::trace!("{:p} Error processing message {msg_in:?}: {:?}", self, e);
-                    }
+            match self.msg_in(msg.clone()).await {
+                Ok(Some(msg)) => out.push(msg),
+                Ok(None) => {}
+                Err(e) => {
+                    log::trace!("{:p} Error processing message {msg:?}: {:?}", self, e);
                 }
             }
         }
diff --git a/flarch/src/web_rtc/wasm/web_socket_client.rs b/flarch/src/web_rtc/wasm/web_socket_client.rs
index 96ddda03..8ff3f7b9 100644
--- a/flarch/src/web_rtc/wasm/web_socket_client.rs
+++ b/flarch/src/web_rtc/wasm/web_socket_client.rs
@@ -2,20 +2,22 @@ use async_trait::async_trait;
 use wasm_bindgen::{prelude::Closure, JsCast, JsValue};
 use web_sys::{ErrorEvent, MessageEvent, WebSocket};
 
-use crate::broker::{Broker, Subsystem, SubsystemHandler};
+use crate::broker::{Broker, SubsystemHandler};
 
 use crate::tasks::{now, wait_ms};
-use crate::web_rtc::websocket::{WSClientError, WSClientInput, WSClientMessage, WSClientOutput};
+use crate::web_rtc::websocket::{WSClientError, WSClientIn, WSClientOut};
 
 pub struct WebSocketClient {
     url: String,
     ws: Option<WebSocket>,
-    broker: Broker<WSClientMessage>,
+    broker: Broker<WSClientIn, WSClientOut>,
     last_connection: i64,
 }
 
 impl WebSocketClient {
-    pub async fn connect(url: &str) -> Result<Broker<WSClientMessage>, WSClientError> {
+    pub async fn connect(
+        url: &str,
+    ) -> Result<Broker<WSClientIn, WSClientOut>, WSClientError> {
         let wsw = WebSocketClient {
             url: url.to_string(),
             ws: None,
@@ -23,16 +25,14 @@ impl WebSocketClient {
             last_connection: 0,
         };
         let mut broker = wsw.broker.clone();
-        broker
-            .add_subsystem(Subsystem::Handler(Box::new(wsw)))
-            .await?;
-        broker.emit_msg(WSClientMessage::Input(WSClientInput::Connect))?;
+        broker.add_handler(Box::new(wsw)).await?;
+        broker.emit_msg_in(WSClientIn::Connect)?;
         Ok(broker)
     }
 
     async fn connect_ws(&mut self) -> Result<(), WSClientError> {
         if self.ws.is_some() && now() / 1000 < self.last_connection + 10 {
-            return Ok(())
+            return Ok(());
         }
         self.last_connection = now() / 1000;
 
@@ -72,7 +72,7 @@ impl WebSocketClient {
                 if let Ok(txt) = e.data().dyn_into::<js_sys::JsString>() {
                     let txt_str = txt.as_string().unwrap();
                     broker_clone
-                        .emit_msg(WSClientOutput::Message(txt_str).into())
+                        .emit_msg_out(WSClientOut::Message(txt_str))
                         .err()
                         .map(|e| log::error!("On_message_callback error: {e:?}"));
                 } else {
@@ -87,9 +87,7 @@ impl WebSocketClient {
             let mut broker_clone = self.broker.clone();
             let onerror_callback = Closure::wrap(Box::new(move |_: ErrorEvent| {
                 broker_clone
-                    .emit_msg(WSClientMessage::Output(WSClientOutput::Error(
-                        "WS-error".into(),
-                    )))
+                    .emit_msg_out(WSClientOut::Error("WS-error".into()))
                     .err()
                     .map(|e| log::error!("On_error_callback error: {e:?}"));
             }) as Box<dyn FnMut(ErrorEvent)>);
@@ -99,7 +97,7 @@ impl WebSocketClient {
             let mut broker_clone = self.broker.clone();
             let onopen_callback = Closure::wrap(Box::new(move |_| {
                 broker_clone
-                    .emit_msg(WSClientMessage::Output(WSClientOutput::Connected))
+                    .emit_msg_out(WSClientOut::Connected)
                     .err()
                     .map(|e| log::error!("On_open_callback error: {e:?}"));
             }) as Box<dyn FnMut(JsValue)>);
@@ -110,32 +108,30 @@ impl WebSocketClient {
 }
 
 #[async_trait(?Send)]
-impl SubsystemHandler<WSClientMessage> for WebSocketClient {
-    async fn messages(&mut self, msgs: Vec<WSClientMessage>) -> Vec<WSClientMessage> {
+impl SubsystemHandler<WSClientIn, WSClientOut> for WebSocketClient {
+    async fn messages(&mut self, msgs: Vec<WSClientIn>) -> Vec<WSClientOut> {
         for msg in msgs {
-            if let WSClientMessage::Input(msg_in) = msg {
-                match msg_in {
-                    WSClientInput::Message(msg) => {
-                        if let Some(ws) = self.ws.as_mut() {
-                            if ws.ready_state() != WebSocket::OPEN {
-                                log::debug!("WebSocket is not open for {msg:?}");
-                                if let Err(e) = self.connect_ws().await {
-                                    log::warn!("While reconnecting: {e}");
-                                }
-                                return vec![];
+            match msg {
+                WSClientIn::Message(msg) => {
+                    if let Some(ws) = self.ws.as_mut() {
+                        if ws.ready_state() != WebSocket::OPEN {
+                            log::debug!("WebSocket is not open for {msg:?}");
+                            if let Err(e) = self.connect_ws().await {
+                                log::warn!("While reconnecting: {e}");
                             }
-                            ws.send_with_str(&msg)
-                                .err()
-                                .map(|e| log::error!("Error sending message: {:?}", e));
+                            return vec![];
                         }
+                        ws.send_with_str(&msg)
+                            .err()
+                            .map(|e| log::error!("Error sending message: {:?}", e));
                     }
-                    WSClientInput::Disconnect => {
-                        // ws.disconnect();
-                    }
-                    WSClientInput::Connect => {
-                        if let Err(e) = self.connect_ws().await {
-                            log::warn!("While reconnecting: {e}");
-                        }
+                }
+                WSClientIn::Disconnect => {
+                    // ws.disconnect();
+                }
+                WSClientIn::Connect => {
+                    if let Err(e) = self.connect_ws().await {
+                        log::warn!("While reconnecting: {e}");
                     }
                 }
             }
diff --git a/flarch/src/web_rtc/websocket.rs b/flarch/src/web_rtc/websocket.rs
index 4fbe5c05..387ff474 100644
--- a/flarch/src/web_rtc/websocket.rs
+++ b/flarch/src/web_rtc/websocket.rs
@@ -1,7 +1,7 @@
 //! # Websocket structures for the broker implementations
 //! 
-//! These are the structures used by the [`crate::broker::Broker<WSClientMessage>`] and 
-//! [`crate::broker::Broker<WSServerMessage>`].
+//! These are the structures used by the [`crate::broker::BrokerWSClient`] and 
+//! [`crate::broker::BrokerWSServer`].
 //! The wasm and libc implementations will return one of these brokers and then
 //! interpret the messages received.
 //! This is similar to a trait that is implemented in either wasm or libc, but
@@ -10,7 +10,7 @@
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
-use crate::broker::BrokerError;
+use crate::broker::{Broker, BrokerError};
 
 #[derive(Error, Debug)]
 /// Wrapper for an error in the websocket implementations
@@ -49,19 +49,11 @@ pub enum WSSError {
     IO(#[from] std::io::Error),
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-/// The message to be implemented for the [`crate::broker::Broker<WSClientMessage>`] in the
-/// websocket client of wasm and libc.
-pub enum WSClientMessage {
-    /// Message generated by the websocket client
-    Output(WSClientOutput),
-    /// Commands for the websocket client
-    Input(WSClientInput),
-}
+pub type BrokerWSClient = Broker<WSClientIn, WSClientOut>;
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 /// Commands for the websocket client
-pub enum WSClientInput {
+pub enum WSClientIn {
     /// Send a text message over the websocket connection
     Message(String),
     /// Disconnect the websocket - no further messages will be sent after this message.
@@ -72,7 +64,7 @@ pub enum WSClientInput {
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 /// Websocket client return messages
-pub enum WSClientOutput {
+pub enum WSClientOut {
     /// Text message received over the connection
     Message(String),
     /// The connection has been closed
@@ -83,32 +75,11 @@ pub enum WSClientOutput {
     Error(String),
 }
 
-impl From<WSClientInput> for WSClientMessage {
-    fn from(input: WSClientInput) -> Self {
-        WSClientMessage::Input(input)
-    }
-}
-
-impl From<WSClientOutput> for WSClientMessage {
-    fn from(output: WSClientOutput) -> Self {
-        WSClientMessage::Output(output)
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-/// The implementation for the websocket server, which only exists for the
-/// libc implementation, as wasm in the browser cannot have a websocket server.
-/// The libc implementation will return a [`crate::broker::Broker<WSServerMessage>`].
-pub enum WSServerMessage {
-    /// Messages sent by the websocket server
-    Output(WSServerOutput),
-    /// Commands to the websocket server
-    Input(WSServerInput),
-}
+pub type BrokerWSServer = Broker<WSServerIn, WSServerOut>;
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 /// Messages sent by the websocket server
-pub enum WSServerOutput {
+pub enum WSServerOut {
     /// A message has been received from the connection `usize`
     Message(usize, String),
     /// A new connection is available with index `usize`
@@ -122,7 +93,7 @@ pub enum WSServerOutput {
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 /// Commands for the websocket server
-pub enum WSServerInput {
+pub enum WSServerIn {
     /// Send a message to the connection with index `usize`. If the connection
     /// doesn't exist, or is closed, nothing happens.
     Message(usize, String),
@@ -134,15 +105,3 @@ pub enum WSServerInput {
     /// Stop the websocket server
     Stop,
 }
-
-impl From<WSServerInput> for WSServerMessage {
-    fn from(msg: WSServerInput) -> Self {
-        WSServerMessage::Input(msg)
-    }
-}
-
-impl From<WSServerOutput> for WSServerMessage {
-    fn from(msg: WSServerOutput) -> Self {
-        WSServerMessage::Output(msg)
-    }
-}
\ No newline at end of file
diff --git a/flarch_macro/README.md b/flarch_macro/README.md
deleted file mode 100644
index e2f5eb31..00000000
--- a/flarch_macro/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# flarch_macro
-
-This holds the macro for defining an `async_trait` either with or without the
-`Send` trait.
-You can use it like this:
-
-```rust
-#[platform_async_trait()]
-impl SubsystemHandler<Message> for SomeBroker {
-    async fn messages(&mut self, _: Vec<Message>) -> Vec<Message> {
-        todo!();
-    }
-}
-```
-
-Depending on `wasm` or `unix`, it will either remove or keep the `Send` trait.
\ No newline at end of file
diff --git a/flarch_macro/src/lib.rs b/flarch_macro/src/lib.rs
deleted file mode 100644
index df3d8894..00000000
--- a/flarch_macro/src/lib.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Define a custom attribute macro for platform-specific async_trait
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::{ItemImpl, ItemTrait};
-
-#[proc_macro_attribute]
-pub fn platform_async_trait(_attr: TokenStream, input: TokenStream) -> TokenStream {
-    if let Ok(input_impl) = syn::parse::<ItemImpl>(input.clone()) {
-        let expanded = quote! {
-            #[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
-            #[cfg_attr(target_family = "unix", async_trait::async_trait)]
-            #input_impl
-        };
-        return TokenStream::from(expanded);
-    }
-
-    if let Ok(input_trait) = syn::parse::<ItemTrait>(input) {
-        let expanded = quote! {
-            #[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
-            #[cfg_attr(target_family = "unix", async_trait::async_trait)]
-            #input_trait
-        };
-        return TokenStream::from(expanded);
-    }
-
-    let error = syn::Error::new(proc_macro2::Span::call_site(), "Unsupported type");
-    TokenStream::from(error.to_compile_error())
-}
diff --git a/flbrowser/Cargo.lock b/flbrowser/Cargo.lock
index 21e5a071..460ae1d0 100644
--- a/flbrowser/Cargo.lock
+++ b/flbrowser/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,43 +93,44 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "arc-swap"
@@ -149,7 +150,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -164,7 +165,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -188,7 +189,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -211,14 +212,25 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -227,24 +239,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -255,23 +267,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -321,9 +333,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 dependencies = [
  "serde",
 ]
@@ -346,11 +358,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -360,9 +378,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -378,9 +396,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -403,11 +421,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -430,9 +454,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "console_error_panic_hook"
@@ -468,9 +492,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -515,9 +539,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -537,6 +561,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -551,7 +576,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -575,7 +600,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -586,14 +611,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -663,7 +688,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -680,6 +705,17 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
 [[package]]
 name = "ed25519-compact"
 version = "2.1.1"
@@ -687,7 +723,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
- "getrandom",
+ "ed25519",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -719,9 +771,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -729,9 +781,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -746,6 +798,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -764,23 +826,26 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "flarch"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "wasm-bindgen",
@@ -791,18 +856,9 @@ dependencies = [
  "webrtc",
 ]
 
-[[package]]
-name = "flarch_macro"
-version = "0.8.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "flbrowser"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "chrono",
@@ -822,39 +878,75 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "flcrypto"
+version = "0.9.0"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "flarch",
+ "flmacro",
+ "log",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde_with",
+ "sha2",
+ "thiserror 2.0.11",
+ "typetag",
+]
+
+[[package]]
+name = "flmacro"
+version = "0.9.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "flmodules"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
+ "async-recursion",
  "async-stream",
  "async-trait",
  "bimap",
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
+ "btparse",
  "bytes",
  "ed25519-compact",
+ "ed25519-dalek",
  "flarch",
+ "flcrypto",
+ "flmacro",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
+ "num-bigint",
  "rand",
  "reqwest",
+ "rmp-serde",
  "serde",
  "serde_derive",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "strum_macros",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "toml",
+ "typetag",
 ]
 
 [[package]]
 name = "flnode"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "async-trait",
  "chrono",
@@ -862,7 +954,7 @@ dependencies = [
  "flarch",
  "flmodules",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
@@ -872,7 +964,7 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "toml",
 ]
@@ -894,9 +986,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -909,9 +1001,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -919,15 +1011,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -936,38 +1028,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1001,10 +1093,22 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -1017,9 +1121,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "group"
@@ -1040,15 +1144,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hex"
@@ -1076,9 +1180,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1110,9 +1214,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "humantime"
@@ -1122,9 +1226,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1141,9 +1245,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http",
@@ -1159,9 +1263,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1172,16 +1276,15 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1200,6 +1303,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1208,12 +1429,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1229,12 +1461,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1261,18 +1493,27 @@ dependencies = [
  "rand",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
  "webrtc-util",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1291,16 +1532,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1312,9 +1554,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linked-hash-map"
@@ -1322,6 +1564,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1334,9 +1582,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "md-5"
@@ -1371,9 +1619,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1387,22 +1635,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1446,6 +1693,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1474,9 +1722,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1492,9 +1740,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1504,9 +1752,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1522,9 +1770,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1555,6 +1803,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1580,31 +1834,11 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1636,9 +1870,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1666,18 +1900,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -1686,46 +1920,50 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.15",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1757,14 +1995,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -1776,18 +2014,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1797,9 +2035,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1808,15 +2046,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -1846,6 +2084,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-util",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -1874,13 +2113,35 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rtcp"
 version = "0.11.0"
@@ -1888,7 +2149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1902,7 +2163,7 @@ dependencies = [
  "portable-atomic",
  "rand",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1914,9 +2175,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -1938,9 +2199,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -1965,36 +2226,44 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -2007,19 +2276,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2034,7 +2297,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand",
  "substring",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2058,7 +2321,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2067,9 +2330,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2077,15 +2340,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2103,20 +2366,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -2126,9 +2389,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2147,15 +2410,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2165,14 +2428,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2251,9 +2514,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2275,12 +2538,31 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "stun"
 version = "0.6.0"
@@ -2294,7 +2576,7 @@ dependencies = [
  "rand",
  "ring",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2328,9 +2610,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2339,9 +2621,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -2366,34 +2648,54 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 2.0.11",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2412,19 +2714,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2437,9 +2749,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2454,31 +2766,30 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2503,9 +2814,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2516,9 +2827,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2537,11 +2848,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -2550,14 +2861,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
  "pin-project-lite",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -2577,9 +2888,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -2587,9 +2898,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -2616,7 +2927,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2635,12 +2946,18 @@ dependencies = [
  "rand",
  "ring",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -2648,31 +2965,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typetag"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "typetag-impl"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unicode-ident"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -2692,9 +3018,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2713,6 +3039,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2721,11 +3059,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2768,14 +3106,24 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2783,36 +3131,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2820,33 +3168,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -2854,13 +3203,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2876,9 +3225,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -2889,9 +3238,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -2903,9 +3252,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2913,9 +3272,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -2948,7 +3307,7 @@ dependencies = [
  "sha2",
  "smol_str",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -2973,7 +3332,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -3009,7 +3368,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -3031,7 +3390,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -3049,7 +3408,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3064,7 +3423,7 @@ dependencies = [
  "bytes",
  "rand",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3080,7 +3439,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3103,7 +3462,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3124,7 +3483,7 @@ dependencies = [
  "nix",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3283,13 +3642,34 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -3316,7 +3696,7 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3338,6 +3718,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3356,7 +3760,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -3376,5 +3801,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/flbrowser/Cargo.toml b/flbrowser/Cargo.toml
index 09951471..e66ce738 100644
--- a/flbrowser/Cargo.toml
+++ b/flbrowser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flbrowser"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Linus Gasser <ineiti@gasser.blue>"]
 edition = "2021"
 description = "Web interface for fledger"
@@ -15,9 +15,9 @@ opt-level = 's'
 local = []
 
 [dependencies]
-flarch = {path="../flarch", version = "0.8"}
-flmodules = {path="../flmodules", version = "0.8"}
-flnode = {path = "../flnode", version = "0.8"}
+flarch = {path="../flarch", version = "0.9"}
+flmodules = {path="../flmodules", version = "0.9"}
+flnode = {path = "../flnode", version = "0.9"}
 
 chrono = "0.4"
 anyhow = "1"
diff --git a/flbrowser/index.html b/flbrowser/index.html
index 9c66b7dc..72658470 100644
--- a/flbrowser/index.html
+++ b/flbrowser/index.html
@@ -15,13 +15,22 @@
     <h2><i id="node_info">Starting up</i></h2>
 
     <p>Nodes connected/online: <span id="nodes_connected"></span> /
-      <span id="nodes_online"></span></p>
+      <span id="nodes_online"></span>
+    </p>
 
     <ul class="nav nav-tabs" id="myTab" role="tablist">
       <li class="nav-item" role="presentation">
         <button class="nav-link active" id="welcome-tab" data-bs-toggle="tab" data-bs-target="#welcome" type="button"
           role="tab" aria-controls="welcome" aria-selected="true">Welcome</button>
       </li>
+      <!-- <li class="nav-item" role="presentation">
+        <button class="nav-link" id="dht-storage-tab" data-bs-toggle="tab" data-bs-target="#dht-storage" type="button"
+          role="tab" aria-controls="dht-storage" aria-selected="true">DHT-Storage</button>
+      </li>
+      <li class="nav-item" role="presentation">
+        <button class="nav-link" id="pages-tab" data-bs-toggle="tab" data-bs-target="#pages" type="button" role="tab"
+          aria-controls="pages" aria-selected="true">Manage Pages</button>
+      </li> -->
       <li class="nav-item" role="presentation">
         <button class="nav-link" id="blackboard-tab" data-bs-toggle="tab" data-bs-target="#blackboard" type="button"
           role="tab" aria-controls="blackboard" aria-selected="true">Blackboard</button>
@@ -79,6 +88,55 @@ <h4>Work In Progress</h4>
         <p></p>
       </div>
 
+      <div class="tab-pane fade" id="dht-storage" role="tabpanel" aria-labelledby="dht-storage-tab">
+        <br>
+        <h3>DHT-Storage</h3>
+        <p>A DHT storage allows you to store data in a Distributed Hash Table.
+          All your data is split up in packets and then distributed over the available nodes.
+          The nodes exchange regularly to update which data they store.
+          In the ideal case, once you store data in the system, it will be kept even if nodes
+          come and go.
+          While your node (your browser) is connected to the network, it will also store data from other
+          nodes, so that it can be retrieved by them.
+        </p>
+        <h4>Statistics</h4>
+        <p>Here are some statistices about your node:</p>
+        <ul>
+          <li>Realm 1015da7a:</li>
+          <ul>
+            <li>Number of Flos (blobs): 23</li>
+            <li>Bucket distribution of Flos: 4 - 2 - 3 - 1 - 0 - 0 - 0 - 2 - 1</li>
+            <li>Bucket distribution of other nodes available: 0 - 1 - 0 - 2 - 0 - 1</li>
+            <li>Memory: Total (1MB), Used: (553kB)</li>
+          </ul>
+        </ul>
+      </div>
+
+      <div class="tab-pane fade" id="pages" role="tabpanel" aria-labelledby="pages-tab">
+        <br>
+        <h3>Pages</h3>
+        <p>On the DHT-Storage, you can search for other pages and upload your own web-pages.
+          Once you upload a web-page, it will be stored on the other nodes for visitors to be
+          seen.
+        </p>
+        <p>Here are the currently available pages:</p>
+        <ul>
+          <li>Root: Link
+            <ul>
+              <li>Fledger: Link
+                <ul>
+                  <li>Documentation: Link</li>
+                  <li>Ideas: Link</li>
+                </ul>
+              </li>
+              <li>Unofficial Pages: Add-Page</li>
+              <li>Something: Link</li>
+              <li>Else: Link</li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+
       <div class="tab-pane fade" id="blackboard" role="tabpanel" aria-labelledby="blackboard-tab">
         <br>
         <p>This is a decentralized chatting app, implemented like a global blackboard.
@@ -146,7 +204,8 @@ <h3>WebProxy</h3>
     <br />
     <div style="float: right;" id="version"></div>
     <div style="float: left;">
-      <a href="https://github.com/ineiti/fledger">GitHub</a> - <a href="https://ioc.exchange/@ineiti">@ineiti@ioc.exchange</a>
+      <a href="https://github.com/ineiti/fledger">GitHub</a> - <a
+        href="https://social.epfl.ch/@ineiti">@ineiti@social.epfl.ch</a>
     </div>
   </div>
 
diff --git a/flbrowser/src/main.rs b/flbrowser/src/main.rs
index fc93bf73..66513243 100644
--- a/flbrowser/src/main.rs
+++ b/flbrowser/src/main.rs
@@ -25,8 +25,8 @@ use flarch::{
     tasks::{spawn_local_nosend, wait_ms},
     web_rtc::connection::{ConnectionConfig, HostLogin, Login},
 };
-use flmodules::network::messages::NetworkConnectionState;
-use flmodules::network::network_broker_start;
+use flmodules::network::broker::NetworkConnectionState;
+use flmodules::network::network_start;
 use flnode::{node::Node, version::VERSION_STRING};
 
 #[cfg(not(feature = "local"))]
@@ -82,7 +82,7 @@ pub fn main() {
                         }
                     }
                     Button::DownloadData => {
-                        let data = web.node.gossip.as_ref().unwrap().storage.get().unwrap();
+                        let data = web.node.gossip.as_ref().unwrap().storage.borrow().get().unwrap();
                         downloadFile("gossip_event.toml".into(), data.into());
                     }
                     Button::WebProxy => {
@@ -219,10 +219,6 @@ impl FledgerWeb {
             .request_list()
             .await
             .expect("Couldn't request list");
-        self.node
-            .process()
-            .await
-            .expect("Should be able to push process");
         fs
     }
 
@@ -240,9 +236,9 @@ impl FledgerWeb {
                 }),
             }),
         );
-        let network = network_broker_start(node_config.clone(), config).await?;
-        node_config.info.modules = Modules::all() - Modules::ENABLE_WEBPROXY_REQUESTS;
-        Ok(Node::start(my_storage, node_config, network)
+        let network = network_start(node_config.clone(), config).await?;
+        node_config.info.modules = Modules::all() - Modules::WEBPROXY_REQUESTS;
+        Ok(Node::start(my_storage, node_config, network.broker)
             .await
             .map_err(|e| anyhow!("Couldn't create node: {:?}", e))?)
     }
@@ -319,8 +315,8 @@ impl FledgerState {
             mana: 0,
             msgs: FledgerMessages::new(msgs, &nodes_info.clone().into_values().collect()),
             nodes_info,
-            states: node.stat.as_ref().unwrap().states.clone(),
-            pings: node.ping.as_ref().unwrap().storage.clone(),
+            states: node.stat.as_ref().unwrap().borrow().clone(),
+            pings: node.ping.as_ref().unwrap().storage.borrow().clone(),
         })
     }
 
diff --git a/cli/Cargo.lock b/flcrypto/Cargo.lock
similarity index 74%
rename from cli/Cargo.lock
rename to flcrypto/Cargo.lock
index 19bffd16..d091fb17 100644
--- a/cli/Cargo.lock
+++ b/flcrypto/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,36 +93,37 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -143,7 +144,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -158,7 +159,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -182,7 +183,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -205,40 +206,18 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "async-stream"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -249,23 +228,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -292,12 +271,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
-[[package]]
-name = "bimap"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -315,12 +288,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-dependencies = [
- "serde",
-]
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
 [[package]]
 name = "block-buffer"
@@ -340,11 +310,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -354,9 +330,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -372,9 +348,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -399,9 +375,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -422,71 +398,11 @@ dependencies = [
  "inout",
 ]
 
-[[package]]
-name = "clap"
-version = "4.5.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap-verbosity-flag"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63d19864d6b68464c59f7162c9914a0b569ddc2926b4a2d71afe62a9738eff53"
-dependencies = [
- "clap",
- "log",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
-
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "const-oid"
@@ -512,9 +428,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -557,12 +473,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "ct-codecs"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
-
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -581,6 +491,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -595,7 +506,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -619,7 +530,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -630,14 +541,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -707,7 +618,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -725,20 +636,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "ed25519-compact"
-version = "2.1.1"
+name = "ed25519"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
- "ct-codecs",
- "getrandom",
+ "pkcs8",
+ "serde",
+ "signature",
 ]
 
 [[package]]
-name = "either"
-version = "1.13.0"
+name = "ed25519-dalek"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
+]
 
 [[package]]
 name = "elliptic-curve"
@@ -763,9 +684,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -773,9 +694,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -790,6 +711,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -811,20 +742,23 @@ name = "flarch"
 version = "0.8.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "wasm-bindgen",
@@ -836,97 +770,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
-version = "0.8.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "fledger"
-version = "0.8.0"
-dependencies = [
- "clap",
- "clap-verbosity-flag",
- "env_logger",
- "flarch",
- "flmodules",
- "flnode",
- "log",
- "thiserror",
- "tokio",
- "webrtc-util",
-]
-
-[[package]]
-name = "flmodules"
+name = "flcrypto"
 version = "0.8.0"
 dependencies = [
- "async-stream",
- "async-trait",
- "bimap",
- "bitflags 2.6.0",
  "bytes",
- "ed25519-compact",
+ "ed25519-dalek",
  "flarch",
- "futures",
- "getrandom",
- "itertools",
+ "flcrypto",
+ "flmacro",
  "log",
- "names",
  "rand",
- "reqwest",
+ "rmp-serde",
  "serde",
- "serde_derive",
- "serde_json",
  "serde_with",
- "serde_yaml",
  "sha2",
- "thiserror",
- "tokio",
- "tokio-stream",
- "toml",
+ "thiserror 2.0.11",
+ "typetag",
 ]
 
 [[package]]
-name = "flnode"
+name = "flmacro"
 version = "0.8.0"
 dependencies = [
- "async-trait",
- "chrono",
- "ed25519-compact",
- "flarch",
- "flmodules",
- "futures",
- "getrandom",
- "itertools",
- "log",
- "names",
- "rand",
- "serde",
- "serde_derive",
- "serde_json",
- "serde_yaml",
- "sha2",
- "thiserror",
- "tokio",
- "toml",
-]
-
-[[package]]
-name = "flsignal"
-version = "0.8.0"
-dependencies = [
- "clap",
- "clap-verbosity-flag",
- "env_logger",
- "flarch",
- "flmodules",
- "log",
- "thiserror",
- "tokio",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -946,9 +814,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -961,9 +829,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -971,15 +839,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -988,38 +856,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1051,10 +919,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
- "wasi",
- "wasm-bindgen",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
 ]
 
 [[package]]
@@ -1069,9 +947,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "group"
@@ -1092,21 +970,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "hex"
@@ -1134,9 +1000,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1144,118 +1010,156 @@ dependencies = [
 ]
 
 [[package]]
-name = "http-body"
-version = "1.0.1"
+name = "httparse"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
- "bytes",
- "http",
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
 ]
 
 [[package]]
-name = "http-body-util"
+name = "iana-time-zone-haiku"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "pin-project-lite",
+ "cc",
 ]
 
 [[package]]
-name = "httparse"
-version = "1.9.4"
+name = "icu_collections"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
 
 [[package]]
-name = "humantime"
-version = "2.1.0"
+name = "icu_locid"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
 
 [[package]]
-name = "hyper"
-version = "1.4.1"
+name = "icu_locid_transform"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
 dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "httparse",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
 ]
 
 [[package]]
-name = "hyper-rustls"
-version = "0.27.2"
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
 dependencies = [
- "futures-util",
- "http",
- "hyper",
- "hyper-util",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
- "webpki-roots",
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
 ]
 
 [[package]]
-name = "hyper-util"
-version = "0.1.7"
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
 dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower",
- "tower-service",
- "tracing",
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
 ]
 
 [[package]]
-name = "iana-time-zone"
-version = "0.1.60"
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
 dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
 ]
 
 [[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
+name = "icu_provider_macros"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
- "cc",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -1266,12 +1170,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1287,12 +1202,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1319,18 +1234,27 @@ dependencies = [
  "rand",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
  "webrtc-util",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1338,27 +1262,19 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1370,9 +1286,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linked-hash-map"
@@ -1380,6 +1296,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1392,9 +1314,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "md-5"
@@ -1421,17 +1343,11 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1445,34 +1361,24 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "names"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc"
-dependencies = [
- "rand",
-]
-
 [[package]]
 name = "nix"
 version = "0.26.4"
@@ -1532,9 +1438,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1550,9 +1456,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1562,9 +1468,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1580,9 +1486,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1613,6 +1519,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1638,31 +1550,11 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1694,9 +1586,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1724,66 +1616,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "quinn"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
-dependencies = [
- "bytes",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash",
- "rustls",
- "socket2",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "quinn-proto"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
-dependencies = [
- "bytes",
- "rand",
- "ring",
- "rustc-hash",
- "rustls",
- "slab",
- "thiserror",
- "tinyvec",
- "tracing",
-]
-
-[[package]]
-name = "quinn-udp"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
-dependencies = [
- "libc",
- "once_cell",
- "socket2",
- "tracing",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1815,14 +1659,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -1834,18 +1678,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1855,9 +1699,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1866,53 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
-[[package]]
-name = "reqwest"
-version = "0.12.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "quinn",
- "rustls",
- "rustls-pemfile",
- "rustls-pki-types",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tokio-rustls",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "webpki-roots",
- "windows-registry",
-]
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rfc6979"
@@ -1932,13 +1732,35 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rtcp"
 version = "0.11.0"
@@ -1946,7 +1768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1960,7 +1782,7 @@ dependencies = [
  "portable-atomic",
  "rand",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1968,13 +1790,7 @@ dependencies = [
 name = "rustc-demangle"
 version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustc-hash"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc_version"
@@ -1996,9 +1812,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -2023,36 +1839,41 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -2065,19 +1886,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2092,7 +1907,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand",
  "substring",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2116,7 +1931,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2125,9 +1940,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2135,15 +1950,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2161,20 +1976,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -2182,38 +1997,17 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_spanned"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2223,14 +2017,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2309,9 +2103,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2333,6 +2127,12 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -2352,7 +2152,7 @@ dependencies = [
  "rand",
  "ring",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2386,24 +2186,15 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-dependencies = [
- "futures-core",
-]
-
 [[package]]
 name = "synstructure"
 version = "0.12.6"
@@ -2424,34 +2215,54 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2470,34 +2281,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "tinystr"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
- "tinyvec_macros",
+ "displaydoc",
+ "zerovec",
 ]
 
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2512,34 +2318,22 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
-dependencies = [
- "futures-core",
- "pin-project-lite",
  "tokio",
 ]
 
@@ -2561,9 +2355,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2572,92 +2366,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
-dependencies = [
- "indexmap 2.5.0",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "pin-project-lite",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
 [[package]]
 name = "tungstenite"
 version = "0.23.0"
@@ -2674,7 +2382,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2693,12 +2401,18 @@ dependencies = [
  "rand",
  "ring",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -2706,31 +2420,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typetag"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "typetag-impl"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unicode-ident"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -2750,9 +2473,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2765,6 +2488,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2773,11 +2508,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2806,28 +2541,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "want"
-version = "0.3.1"
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.13.3+wasi-0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2835,36 +2571,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2872,33 +2608,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -2906,33 +2643,20 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "wasm-streams"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
-dependencies = [
- "futures-util",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -2944,23 +2668,14 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.26.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
-dependencies = [
- "rustls-pki-types",
-]
-
 [[package]]
 name = "webrtc"
 version = "0.11.0"
@@ -2989,7 +2704,7 @@ dependencies = [
  "sha2",
  "smol_str",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -3014,7 +2729,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -3050,7 +2765,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -3072,7 +2787,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -3090,7 +2805,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3105,7 +2820,7 @@ dependencies = [
  "bytes",
  "rand",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3121,7 +2836,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3144,7 +2859,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3165,7 +2880,7 @@ dependencies = [
  "nix",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3210,36 +2925,6 @@ dependencies = [
  "windows-targets",
 ]
 
-[[package]]
-name = "windows-registry"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
-dependencies = [
- "windows-result",
- "windows-strings",
- "windows-targets",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result",
- "windows-targets",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -3323,14 +3008,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "winnow"
-version = "0.6.18"
+name = "wit-bindgen-rt"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
- "memchr",
+ "bitflags 2.8.0",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -3357,7 +3054,7 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3379,6 +3076,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3397,7 +3118,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -3417,5 +3159,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/flcrypto/Cargo.toml b/flcrypto/Cargo.toml
new file mode 100644
index 00000000..9e4a058e
--- /dev/null
+++ b/flcrypto/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "flcrypto"
+version = "0.9.0"
+edition = "2021"
+
+[features]
+testing = []
+
+[dependencies]
+flarch = { path = "../flarch", version = "0.9" }
+flmacro = { path = "../flmacro", version = "0.9" }
+
+bytes = { version = "1", features = ["serde"] }
+ed25519-dalek = { version="2", features = ["serde", "rand_core"] }
+log = "0.4"
+rand = "0.8"
+rmp-serde = "1"
+serde = { version = "1", features = ["derive"] }
+serde_with = { version = "3", features = ["hex", "json", "base64"] }
+sha2 = "0.10"
+thiserror = "2"
+typetag = "0.2"
+
+[dev-dependencies]
+flcrypto = { path=".", features = ["testing"]}
diff --git a/flcrypto/src/README.md b/flcrypto/src/README.md
new file mode 100644
index 00000000..7fb55551
--- /dev/null
+++ b/flcrypto/src/README.md
@@ -0,0 +1,93 @@
+# Crypto Wrappers
+
+This crypto wrapper defines the following main structures:
+
+- `Signer` - a generic structure to sign messages
+- `Verifier` - a generic structure to verify signed messages
+- `Condition` - an AND/OR/NofT combination of verifiers
+- `Identity` - an updatable pair of `sign` and `update` Conditions,
+  representing identities or cryptographic anchors
+
+An example use-case is the following:
+
+- When a node starts, it creates a `Signer`, and a `Identity` with a `Condition`
+ pointing to that `Signer`. This allows the node to do key rotation by updating
+ its `Identity`
+- A user wants to create a website with many objects, so they create:
+  - one or more nodes with the corresponding `Identity`s. 
+    A CLI tool to update the page also acts as a node.
+  - a `WebPageT: Identity` with an OR of all nodes and CLIs `Identity`s
+  - a `WebPageAR: ACE` with rules like `update_object`, `add_object`, `rm_object`,
+   pointing to the `WebPageT`
+- Now the user can create objects and point them to the `WebPageAR`, allowing them to:
+  - control all objects from any node
+  - update the `WebPageT` if nodes join or go away
+  - update the `WebPageAR` if part of the rules should apply to other `Identity`s. An example
+    could be a rule to update the `TTL` of an object, which could be allowed by more nodes
+    than the rule to modify an object
+
+## Rule
+
+## Expression
+
+The following structures are defined for signing and updating an expression:
+
+```rust
+struct ExpressionSignatureCollector {
+    expression_id,
+    msg,
+    signatures: HashMap<RuleID, Signature>,
+    #[serde(skip)]
+    ev_cache: Option<watch::Receiver<EVCache>>,
+}
+
+type RuleID = Hash(msg|RulePath|SignerID);
+
+struct ExpressionUpdateCollector {
+    expression_id,
+    current_version,
+    new_rules,
+    sig: Either<ExpressionSignatureCollector, ExpressionSignature>,
+}
+```
+
+### Sign
+
+1. `Expression.signature_collector(msg)` -> `ExpressionSignatureCollector`
+2. `ESC.sign(Signer)` -> `ExpressionSignatureCollector`
+3. `ESC.finalize()` -> Result<(`ExpressionSignature`, `ExpressionSignatureVerifiers`), `ESCError`>
+
+#### Signing Subtrees
+
+There might be a usecase for having more privacy-preserving signatures of sub-trees,
+so that the signers cannot see the rest of the `Expression`.
+But the original `msg` will still need to be verified in one way or another.
+
+### Verify
+
+1. `Expression.verify(msg, ES, ESV)` -> `Result<(), ESError>`
+
+### Update
+
+1. `Expression.update_message(new_rules)` -> `msg`
+or
+1. `Expression.update_collector(new_rules)` -> `ExpressionUpdateCollector`
+2. `EUC.sign(Signer)` -> `ExpressionUpdateCollector`
+3. `EUC.finalize()` -> `ExpressionUpdate`
+4. `Expression.update(new_rules, ES)` -> `Expression`
+or
+4. `Expression.update_finalize(EU)` -> `Expression`
+
+## ACE
+
+In an `AccessRule`, the rules only point to `ExpressionID`.
+As such, whatever you want to do with an `AccessRule` needs to have
+access to the underlying `Expression`s.
+Not sure whether this should be a `HashMap`, or better an asynchronous
+`expression_getter`.
+
+### Sign
+
+### Verify
+
+### Update
\ No newline at end of file
diff --git a/flcrypto/src/access.rs b/flcrypto/src/access.rs
new file mode 100644
index 00000000..ef757ea6
--- /dev/null
+++ b/flcrypto/src/access.rs
@@ -0,0 +1,543 @@
+use std::{collections::HashMap, iter};
+
+use bytes::Bytes;
+use flarch::nodeids::U256;
+use flmacro::AsU256;
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    signer::{Signature, Signer, SignerError, Verifier},
+    tofrombytes::ToFromBytes,
+};
+
+use super::signer::KeyPairID;
+
+#[derive(AsU256, Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
+pub struct BadgeID(U256);
+
+/// A Condition is a boolean combination of verifiers and badges
+/// which can verify a given signature.
+/// A Condition can:
+/// - sign a given message
+/// - verify a given message
+#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
+pub enum Condition {
+    Verifier(KeyPairID),
+    Badge(Version<BadgeID>),
+    NofT(u32, Vec<Condition>),
+    /// TODO: re-enable this enum only for "testing"
+    /// The Pass condition is always true, but only available during testing.
+    Pass,
+}
+
+/// A badge can be viewed as an identity or a root of trust.
+/// It defines one cryptographic actor which can be composed of
+/// many different verifiers and other badges.
+pub trait Badge {
+    fn badge_id(&self) -> BadgeID;
+
+    fn badge_cond(&self) -> Condition;
+
+    fn badge_version(&self) -> u32;
+
+    fn clone_self(&self) -> Box<dyn Badge>;
+}
+
+impl Clone for Box<dyn Badge> {
+    fn clone(&self) -> Self {
+        self.clone_self()
+    }
+}
+
+/// What versions of the ACE or badge are accepted.
+#[derive(Clone, Serialize, Deserialize, PartialEq, Debug, Eq, Hash)]
+pub enum Version<T: Serialize + Clone> {
+    /// This is the default - everyone should use it and trust future versions.
+    Minimal(T, u32),
+    /// Paranoid version pinning. Also problematic because old versions might get
+    /// forgotten.
+    Exact(T, u32),
+    /// Just for completeness' sake - this version and all lower version. This doesn't
+    /// really make sense.
+    Maximal(T, u32),
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct BadgeSignature {
+    cs: CalcSignature,
+    msg_orig: Bytes,
+    condition: Condition,
+}
+
+impl<T: Serialize + Clone> Version<T> {
+    pub fn get_id(&self) -> T {
+        match self {
+            Version::Minimal(id, _) => id.clone(),
+            Version::Exact(id, _) => id.clone(),
+            Version::Maximal(id, _) => id.clone(),
+        }
+    }
+
+    pub fn accepts(&self, version: u32) -> bool {
+        match self {
+            Version::Minimal(_, v) => v <= &version,
+            Version::Exact(_, v) => v == &version,
+            Version::Maximal(_, v) => v >= &version,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct CalcSignature {
+    msg: U256,
+    condition_hash: Vec<U256>,
+    badges: HashMap<Version<BadgeID>, Condition>,
+    signatures: HashMap<KeyPairID, Option<(Box<dyn Verifier>, Signature)>>,
+}
+
+impl CalcSignature {
+    fn new() -> Self {
+        CalcSignature {
+            msg: U256::zero(),
+            condition_hash: vec![],
+            badges: HashMap::new(),
+            signatures: HashMap::new(),
+        }
+    }
+
+    pub fn from_cond_badges(
+        cond: &Condition,
+        badges: HashMap<Version<BadgeID>, Condition>,
+        signatures: HashMap<KeyPairID, Option<(Box<dyn Verifier>, Signature)>>,
+        msg: Bytes,
+    ) -> Result<Self, SignerError> {
+        let mut cs = Self::new();
+        cs.badges = badges;
+        cs.signatures = signatures;
+        cs.build_hash_verify(cond, msg)?;
+        Ok(cs)
+    }
+
+    fn calc_msg(&mut self, msg: Bytes) {
+        let parts = iter::once(msg)
+            .chain(self.condition_hash.iter().map(|u| u.bytes()))
+            .collect::<Vec<Bytes>>();
+        self.msg = U256::hash_domain_parts(
+            "ConditionHash",
+            &parts.iter().map(|b| b.as_ref()).collect::<Vec<_>>(),
+        );
+    }
+
+    pub fn build_hash_init(
+        cond: &Condition,
+        msg: Bytes,
+        get_badge: &GetBadge,
+    ) -> Result<CalcSignature, SignerError> {
+        let mut cs = CalcSignature::new();
+        cond.build_hash(&mut cs, get_badge, true)?;
+        cs.calc_msg(msg);
+        Ok(cs)
+    }
+
+    fn build_hash_verify(&mut self, cond: &Condition, msg: Bytes) -> Result<(), SignerError> {
+        self.condition_hash = vec![];
+        cond.build_hash(self, &|_| -> Option<Box<dyn Badge>> { None }, false)?;
+        self.calc_msg(msg);
+        Ok(())
+    }
+}
+
+impl<T: Serialize + Clone> Version<T> {
+    pub fn id(&self) -> T {
+        match self {
+            Version::Minimal(id, _) => id.clone(),
+            Version::Exact(id, _) => id.clone(),
+            Version::Maximal(id, _) => id.clone(),
+        }
+    }
+}
+
+pub type GetBadge = dyn Fn(&Version<BadgeID>) -> Option<Box<dyn Badge>>;
+
+impl Condition {
+    fn build_hash(
+        &self,
+        cs: &mut CalcSignature,
+        get_badge: &GetBadge,
+        init: bool,
+    ) -> Result<(), SignerError> {
+        cs.condition_hash.push(self.hash_this());
+        Ok(match self {
+            Condition::Verifier(verifier) => {
+                if init {
+                    cs.signatures.insert(verifier.clone(), None);
+                }
+            }
+            Condition::Badge(version) => {
+                if init {
+                    if cs.badges.contains_key(version) {
+                        log::warn!("Condition {self:?} contains loop");
+                        return Ok(());
+                    }
+                    get_badge(version)
+                        .ok_or(SignerError::BadgeMissing)?
+                        .badge_cond()
+                        .build_hash(cs, get_badge, init)?
+                } else {
+                    let cond = cs
+                        .badges
+                        .get(version)
+                        .ok_or(SignerError::BadgeMissing)?
+                        .clone();
+                    cond.build_hash(cs, get_badge, init)?
+                }
+            }
+            Condition::NofT(_, vec) => {
+                for cond in vec {
+                    cond.build_hash(cs, get_badge, init)?;
+                }
+            }
+            Condition::Pass => (),
+        })
+    }
+
+    fn hash_this(&self) -> U256 {
+        U256::hash_data(&self.to_bytes())
+    }
+}
+
+impl BadgeSignature {
+    pub fn from_cond(
+        condition: Condition,
+        msg_orig: Bytes,
+        get_badge: &GetBadge,
+    ) -> Result<Self, SignerError> {
+        let cs = CalcSignature::build_hash_init(&condition, msg_orig.clone(), get_badge)?;
+        Ok(Self {
+            cs,
+            msg_orig,
+            condition,
+        })
+    }
+
+    pub fn from_calc_signature(cs: CalcSignature, condition: Condition, msg_orig: Bytes) -> Self {
+        Self {
+            cs,
+            msg_orig,
+            condition,
+        }
+    }
+
+    pub fn sign(&mut self, signer: &dyn Signer) -> Result<(), SignerError> {
+        let verifier = signer.verifier();
+        let signature = signer.sign(&self.cs.msg.bytes())?;
+        self.cs
+            .signatures
+            .entry(verifier.get_id())
+            .and_modify(|sig| *sig = Some((verifier, signature)));
+        Ok(())
+    }
+
+    pub fn is_final(&mut self) -> Result<bool, SignerError> {
+        let msg = self.cs.msg;
+        self.cs
+            .build_hash_verify(&self.condition, self.msg_orig.clone())?;
+        if self.cs.msg != msg {
+            return Err(SignerError::SigningMessageMismatch);
+        }
+        self.evaluate_cond(&self.condition)
+    }
+
+    fn evaluate_cond(&self, cond: &Condition) -> Result<bool, SignerError> {
+        Ok(match cond {
+            Condition::Verifier(verifier_id) => self
+                .cs
+                .signatures
+                .get(&verifier_id)
+                .and_then(|ver_sig| {
+                    ver_sig.as_ref().map(|(ver, sig)| {
+                        &ver.get_id() == verifier_id
+                            && ver.verify(&self.cs.msg.bytes(), &sig).is_ok()
+                    })
+                })
+                .unwrap_or(false),
+            Condition::Badge(version) => self
+                .cs
+                .badges
+                .get(version)
+                .and_then(|cond| self.evaluate_cond(cond).ok())
+                .unwrap_or(false),
+            Condition::NofT(t, vec) => {
+                vec.iter()
+                    .filter_map(|cond| {
+                        self.evaluate_cond(cond)
+                            .ok()
+                            .and_then(|res| res.then(|| ()))
+                    })
+                    .count() as u32
+                    >= *t
+            }
+            Condition::Pass => true,
+        })
+    }
+
+    pub fn finalize(&mut self) -> Result<HashMap<KeyPairID, Signature>, SignerError> {
+        if !self.is_final()? {
+            return Err(SignerError::SignatureMessageMismatch);
+        }
+        Ok(self
+            .cs
+            .signatures
+            .clone()
+            .into_iter()
+            .filter_map(|(k, v)| v.map(|v| (k, v.1)))
+            .collect())
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::error::Error;
+
+    use flarch::start_logging_filter;
+
+    use crate::signer_ed25519::SignerEd25519;
+
+    use super::*;
+
+    #[test]
+    fn test_list_paths_errors() -> Result<(), Box<dyn Error>> {
+        let msg = Bytes::from("");
+        let cond = Condition::Badge(Version::Exact(BadgeID::rnd(), 1));
+        assert!(CalcSignature::build_hash_init(&cond, msg.clone(), &|_| None).is_err());
+        let cond2 = Condition::NofT(1, vec![cond]);
+        assert!(CalcSignature::build_hash_init(&cond2, msg, &|_| None).is_err());
+        Ok(())
+    }
+
+    struct SVID {
+        signer: Box<dyn Signer>,
+        _verifier: Box<dyn Verifier>,
+        condition: Condition,
+        id: KeyPairID,
+        // badge: Box<dyn Badge>,
+    }
+
+    impl SVID {
+        fn new() -> Self {
+            let signer = SignerEd25519::new_box();
+            let condition = Condition::Verifier(signer.verifier().get_id());
+            Self {
+                _verifier: signer.verifier(),
+                id: signer.verifier().get_id(),
+                // badge: Box::new(BT(condition.clone(), 0)),
+                condition,
+                signer,
+            }
+        }
+
+        fn condition(&self) -> Condition {
+            self.condition.clone()
+        }
+
+        // fn signer(&self) -> Box<dyn Signer> {
+        //     self.signer.clone()
+        // }
+    }
+
+    struct BT(Condition, u32);
+
+    impl Badge for BT {
+        fn badge_id(&self) -> BadgeID {
+            self.0.hash_this().into()
+        }
+
+        fn badge_cond(&self) -> Condition {
+            self.0.clone()
+        }
+
+        fn badge_version(&self) -> u32 {
+            self.1
+        }
+
+        fn clone_self(&self) -> Box<dyn Badge> {
+            Box::new(BT(self.0.clone(), self.1))
+        }
+    }
+
+    impl BT {
+        fn start_signature(
+            &self,
+            msg: &Bytes,
+            get_badge: &GetBadge,
+        ) -> Result<BadgeSignature, SignerError> {
+            BadgeSignature::from_cond(self.0.clone(), msg.clone(), get_badge)
+        }
+
+        fn start_signature_no_badge(&self, msg: &Bytes) -> Result<BadgeSignature, SignerError> {
+            self.start_signature(msg, &|_| None)
+        }
+    }
+
+    #[test]
+    fn test_verifiers() -> Result<(), Box<dyn Error>> {
+        let msg = Bytes::from("123");
+        let msg_bad = Bytes::from("1234");
+        let svid0 = SVID::new();
+        let svid1 = SVID::new();
+        let badge0 = BT(Condition::Verifier(svid0.id), 0);
+        let badge1 = BT(Condition::Verifier(svid1.id), 0);
+        let mut sig_prep0 = badge0.start_signature_no_badge(&msg)?;
+        let mut sig_prep0_bad = badge0.start_signature_no_badge(&msg_bad)?;
+        let mut sig_prep1 = badge1.start_signature_no_badge(&msg)?;
+
+        assert_eq!(sig_prep0.cs.msg, sig_prep0.cs.msg);
+        assert_ne!(sig_prep0.cs.msg, sig_prep0_bad.cs.msg);
+        assert_ne!(sig_prep0.cs.msg, sig_prep1.cs.msg);
+
+        // Wrong and correct signer
+        sig_prep0.sign(&*svid1.signer)?;
+        assert!(!sig_prep0.is_final()?);
+        sig_prep0.sign(&*svid0.signer)?;
+        assert!(sig_prep0.is_final()?);
+
+        // Wrong message
+        let mut sig_clone = sig_prep0.clone();
+        sig_clone.msg_orig = msg_bad.clone();
+        assert_eq!(
+            Err(SignerError::SigningMessageMismatch),
+            sig_clone.is_final()
+        );
+
+        // Wrong Condition
+        let mut sig_clone = sig_prep0.clone();
+        sig_clone.condition = sig_prep1.condition.clone();
+        assert_eq!(
+            Err(SignerError::SigningMessageMismatch),
+            sig_clone.is_final()
+        );
+
+        // Signature from different message
+        sig_prep0_bad.sign(&*svid0.signer)?;
+        assert!(sig_prep0_bad.is_final()?);
+        let mut sig_clone = sig_prep0.clone();
+        sig_clone.cs.signatures = sig_prep0_bad.cs.signatures.clone();
+        assert!(!sig_clone.is_final()?);
+
+        // Signature from different signer
+        sig_prep1.sign(&*svid1.signer)?;
+        assert!(sig_prep1.is_final()?);
+        let mut sig_clone = sig_prep0.clone();
+        sig_clone.cs.signatures = sig_prep1.cs.signatures.clone();
+        assert!(!sig_clone.is_final()?);
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_noft() -> Result<(), SignerError> {
+        start_logging_filter(vec![]);
+        let msg = Bytes::from("123");
+        let svid0 = SVID::new();
+        let svid1 = SVID::new();
+        let svid2 = SVID::new();
+        let badge0 = BT(
+            Condition::NofT(1, vec![svid0.condition(), svid1.condition()]),
+            0,
+        );
+        let badge1 = BT(
+            Condition::NofT(2, vec![svid0.condition(), svid1.condition()]),
+            0,
+        );
+        let badge2 = BT(
+            Condition::NofT(
+                2,
+                vec![svid0.condition(), svid1.condition(), svid2.condition()],
+            ),
+            0,
+        );
+        let mut sig_prep0 = badge0.start_signature_no_badge(&msg)?;
+        let mut sig_prep1 = badge1.start_signature_no_badge(&msg)?;
+        let mut sig_prep2 = badge2.start_signature_no_badge(&msg)?;
+
+        assert_ne!(sig_prep0.cs.msg, sig_prep1.cs.msg);
+        assert_ne!(sig_prep0.cs.msg, sig_prep2.cs.msg);
+        assert_ne!(sig_prep1.cs.msg, sig_prep2.cs.msg);
+
+        // Wrong signer vs. correct signer
+        assert!(!sig_prep0.is_final()?);
+        sig_prep0.sign(&*svid2.signer)?;
+        assert!(!sig_prep0.is_final()?);
+        sig_prep0.sign(&*svid0.signer)?;
+        assert!(sig_prep0.is_final()?);
+
+        // Too many signers (is accepted)
+        sig_prep0.sign(&*svid1.signer)?;
+        assert!(sig_prep0.is_final()?);
+
+        // Second signer
+        let mut sig_prep0 = badge0.start_signature_no_badge(&msg)?;
+        sig_prep0.sign(&*svid1.signer)?;
+        assert!(sig_prep0.is_final()?);
+
+        // Too few signers vs. enough signers
+        sig_prep1.sign(&*svid0.signer)?;
+        assert!(!sig_prep1.is_final()?);
+        sig_prep1.sign(&*svid1.signer)?;
+        assert!(sig_prep1.is_final()?);
+
+        // Different signers
+        sig_prep2.sign(&*svid0.signer)?;
+        sig_prep2.sign(&*svid1.signer)?;
+        assert!(sig_prep2.is_final()?);
+        for (_, sig) in &mut sig_prep2.cs.signatures {
+            *sig = None;
+        }
+        assert!(!sig_prep2.is_final()?);
+        sig_prep2.sign(&*svid0.signer)?;
+        sig_prep2.sign(&*svid2.signer)?;
+        assert!(sig_prep2.is_final()?);
+        for (_, sig) in &mut sig_prep2.cs.signatures {
+            *sig = None;
+        }
+        sig_prep2.sign(&*svid1.signer)?;
+        sig_prep2.sign(&*svid2.signer)?;
+        assert!(sig_prep2.is_final()?);
+
+        Ok(())
+    }
+
+    // #[derive(Default)]
+    // struct IDS {
+    //     ids: HashMap<Version<BadgeID>, Box<dyn Badge>>,
+    // }
+
+    // impl IDS {
+    //     fn get_badge(&self, idv: &Version<BadgeID>) -> Option<Box<dyn Badge>> {
+    //         self.ids.get(idv).cloned()
+    //     }
+
+    //     fn add_badge(&mut self, vers_bid: Version<BadgeID>, vers: u32) -> BT {
+    //         let bt = BT(Condition::Badge(vers_bid.clone()), vers);
+    //         self.ids.insert(vers_bid, bt.clone_self());
+    //         bt
+    //     }
+    // }
+
+    // #[test]
+    // fn test_badge() -> Result<(), Box<dyn Error>> {
+    //     let msg = Bytes::from("123");
+    //     let svid0 = SVID::new();
+    //     let svid1 = SVID::new();
+    //     let mut ids = IDS::default();
+    //     let badge0_0 = ids.add_badge(Version::Minimal(svid0.badge.badge_id(), 0), 0);
+    //     let badge0_1 = ids.add_badge(Version::Minimal(svid0.badge.badge_id(), 1), 1);
+    //     let badge1_0 = ids.add_badge(Version::Minimal(svid1.badge.badge_id(), 0), 0);
+
+    //     let mut sig_prep0 = badge0_0.start_signature(&msg, &|vb| ids.get_badge(vb))?;
+    //     let mut sig_prep1 = badge0_1.start_signature(&msg, &|vb| ids.get_badge(vb))?;
+    //     let mut sig_prep2 = badge1_0.start_signature(&msg, &|vb| ids.get_badge(vb))?;
+
+    //     Ok(())
+    // }
+}
diff --git a/flcrypto/src/lib.rs b/flcrypto/src/lib.rs
new file mode 100644
index 00000000..283018e9
--- /dev/null
+++ b/flcrypto/src/lib.rs
@@ -0,0 +1,4 @@
+pub mod access;
+pub mod signer;
+pub mod signer_ed25519;
+pub mod tofrombytes;
\ No newline at end of file
diff --git a/flcrypto/src/signer.rs b/flcrypto/src/signer.rs
new file mode 100644
index 00000000..f130b721
--- /dev/null
+++ b/flcrypto/src/signer.rs
@@ -0,0 +1,52 @@
+use bytes::Bytes;
+use flarch::{broker::asy::Async, nodeids::U256};
+use flmacro::AsU256;
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+pub type Signature = Bytes;
+
+#[derive(Debug, Error, PartialEq)]
+pub enum SignerError {
+    #[error("Signature doesn't match message")]
+    SignatureMessageMismatch,
+    #[error("Didn't find Identity")]
+    BadgeMissing,
+    #[error("Couldn't match message to sign")]
+    SigningMessageMismatch,
+}
+
+#[derive(AsU256, Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
+pub struct KeyPairID(U256);
+
+#[typetag::serde(tag = "type")]
+pub trait Signer: std::fmt::Debug {
+    fn sign(&self, msg: &Bytes) -> Result<Signature, SignerError>;
+
+    fn verifier(&self) -> Box<dyn Verifier>;
+
+    fn get_id(&self) -> KeyPairID;
+
+    fn clone(&self) -> Box<dyn Signer>;
+}
+
+#[typetag::serde(tag = "type")]
+pub trait Verifier: std::fmt::Debug + Async {
+    fn verify(&self, msg: &Bytes, sig: &Bytes) -> Result<(), SignerError>;
+
+    fn get_id(&self) -> KeyPairID;
+
+    fn clone_self(&self) -> Box<dyn Verifier>;
+}
+
+impl Clone for Box<dyn Verifier> {
+    fn clone(&self) -> Self {
+        self.clone_self()
+    }
+}
+
+impl PartialEq for Box<dyn Verifier>{
+    fn eq(&self, other: &Self) -> bool {
+        self.get_id() == other.get_id()
+    }
+}
\ No newline at end of file
diff --git a/flcrypto/src/signer_ed25519.rs b/flcrypto/src/signer_ed25519.rs
new file mode 100644
index 00000000..7287b51b
--- /dev/null
+++ b/flcrypto/src/signer_ed25519.rs
@@ -0,0 +1,98 @@
+use bytes::Bytes;
+use ed25519_dalek::ed25519::signature::SignerMut;
+use rand::rngs::OsRng;
+use serde::{Deserialize, Serialize};
+
+use super::signer::{Signature, Signer, SignerError, KeyPairID, Verifier};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct SignerEd25519 {
+    keypair: ed25519_dalek::SigningKey,
+}
+
+impl SignerEd25519 {
+    pub fn new_box() -> Box<dyn Signer> {
+        Box::new(SignerEd25519 {
+            keypair: ed25519_dalek::SigningKey::generate(&mut OsRng),
+        })
+    }
+}
+
+#[typetag::serde]
+impl Signer for SignerEd25519 {
+    fn sign(&self, msg: &Bytes) -> Result<Signature, SignerError> {
+        Ok(self.keypair.clone().sign(msg).to_bytes().to_vec().into())
+    }
+
+    fn verifier(&self) -> Box<dyn Verifier> {
+        Box::new(VerifierEd25519 {
+            verifier: self.keypair.verifying_key(),
+        })
+    }
+
+    fn get_id(&self) -> KeyPairID {
+        (*self.verifier().get_id()).into()
+    }
+
+    fn clone(&self) -> Box<dyn Signer> {
+        Box::new(Self {
+            keypair: self.keypair.clone(),
+        })
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct VerifierEd25519 {
+    verifier: ed25519_dalek::VerifyingKey,
+}
+
+#[typetag::serde]
+impl Verifier for VerifierEd25519 {
+    fn verify(&self, msg: &Bytes, sig: &Bytes) -> Result<(), SignerError> {
+        let s: ed25519_dalek::Signature =
+            TryInto::<[u8; 64]>::try_into(sig.as_ref()).unwrap().into();
+        match self.verifier.verify_strict(msg, &s) {
+            Ok(_) => Ok(()),
+            Err(_) => Err(SignerError::SignatureMessageMismatch),
+        }
+    }
+
+    fn get_id(&self) -> KeyPairID {
+        KeyPairID::hash_domain_parts(
+            "ican.re.fledg.flmodules.crypto.verifier_ed25519",
+            &[self.verifier.as_bytes()],
+        )
+    }
+
+    fn clone_self(&self) -> Box<dyn Verifier> {
+        Box::new(VerifierEd25519 {
+            verifier: self.verifier.clone(),
+        })
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::error::Error;
+
+    use super::*;
+
+    #[test]
+    fn test_ed25519() -> Result<(), Box<dyn Error>> {
+        let signer = SignerEd25519::new_box();
+        let verifier = signer.verifier();
+        let msg1 = Bytes::from("message1");
+        let msg2 = Bytes::from("message2");
+
+        let sig1 = signer.sign(&msg1)?;
+        let sig2 = signer.sign(&msg2)?;
+
+        verifier.verify(&msg1, &sig1)?;
+        verifier.verify(&msg2, &sig2)?;
+
+        assert!(verifier.verify(&msg1, &sig2).is_err());
+        assert!(verifier.verify(&msg2, &sig1).is_err());
+
+        Ok(())
+    }
+}
diff --git a/flcrypto/src/tofrombytes.rs b/flcrypto/src/tofrombytes.rs
new file mode 100644
index 00000000..ff1a3114
--- /dev/null
+++ b/flcrypto/src/tofrombytes.rs
@@ -0,0 +1,26 @@
+use bytes::Bytes;
+use serde::{de::DeserializeOwned, Serialize};
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum TFBError {
+    #[error("Couldn't deserialize {0}: '{1:?}'")]
+    Deserialization(String, String),
+}
+
+pub trait ToFromBytes: Serialize + DeserializeOwned {
+    fn to_bytes(&self) -> Bytes {
+        rmp_serde::to_vec(self).unwrap().into()
+    }
+
+    fn from_bytes(name: &str, bytes: &Bytes) -> Result<Self, TFBError> {
+        rmp_serde::from_slice(bytes)
+            .map_err(|e| TFBError::Deserialization(name.into(), e.to_string()))
+    }
+
+    fn size(&self) -> usize {
+        self.to_bytes().len()
+    }
+}
+
+impl<T: Serialize + DeserializeOwned> ToFromBytes for T {}
diff --git a/flarch_macro/Cargo.lock b/flmacro/Cargo.lock
similarity index 62%
rename from flarch_macro/Cargo.lock
rename to flmacro/Cargo.lock
index 25aa2ba0..7d4e06ee 100644
--- a/flarch_macro/Cargo.lock
+++ b/flmacro/Cargo.lock
@@ -1,9 +1,9 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
-name = "flarch_macro"
+name = "flmacro"
 version = "0.8.0"
 dependencies = [
  "proc-macro2",
@@ -13,27 +13,27 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -42,6 +42,6 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
diff --git a/flarch_macro/Cargo.toml b/flmacro/Cargo.toml
similarity index 79%
rename from flarch_macro/Cargo.toml
rename to flmacro/Cargo.toml
index d7400cbb..ad3588fd 100644
--- a/flarch_macro/Cargo.toml
+++ b/flmacro/Cargo.toml
@@ -1,15 +1,18 @@
 [package]
-name = "flarch_macro"
-version = "0.8.0"
+name = "flmacro"
+version = "0.9.0"
 edition = "2021"
 authors = ["Linus Gasser <linus@gasser.blue>"]
-description = "Arch-dependant macros"
+description = "Macros for fledger"
 repository = "https://github.com/ineiti/fledger"
 license = "MIT OR Apache-2.0"
 homepage = "https://fledg.re"
 readme = "README.md"
 keywords = ["utils", "fledger"]
 
+[features]
+node = []
+
 [lib]
 proc-macro = true
 
diff --git a/flmacro/README.md b/flmacro/README.md
new file mode 100644
index 00000000..29eb092c
--- /dev/null
+++ b/flmacro/README.md
@@ -0,0 +1,188 @@
+# flmacro
+
+Macros for the use in fledger.
+
+## platrform_async_trait
+
+This holds the macro for defining an `async_trait` either with or without the
+`Send` trait.
+You can use it like this:
+
+```rust
+#[platform_async_trait()]
+impl SubsystemHandler<Message> for SomeBroker {
+    async fn messages(&mut self, _: Vec<Message>) -> Vec<Message> {
+        todo!();
+    }
+}
+```
+
+Depending on `wasm` or `unix`, it will either remove or keep the `Send` trait.
+
+## proc_macro_derive(AsU256)
+
+This allows to use tuple struct, or a newtype struct, based on `U256`, to export
+all methods from `U256`.
+Instead of using a type definition, which is not unique and can be replaced by any
+of the other types, tuple structs allow for more type safety.
+You can use it like this:
+
+```rust
+#[derive(AsU256)]
+struct MyID(U256);
+```
+
+And now you can have `MyID::rnd()` and all the other methods from `U256`.
+
+## proc_macro_derive(VersionedSerde, attributes(versions, serde))
+
+To store configuration and other data in different version, you can use this 
+derive macro:
+
+```rust
+use bytes::Bytes;
+use flmacro::VersionedSerde;
+use serde::{Deserialize, Serialize};
+use serde_with::{base64::Base64, serde_as};
+
+#[serde_as]
+#[derive(VersionedSerde, Clone, PartialEq, Debug)]
+#[versions = "[ConfigV1, ConfigV2]"]
+struct Config {
+    #[serde_as(as = "Base64")]
+    name3: Bytes,
+}
+
+impl From<ConfigV2> for Config {
+    fn from(value: ConfigV2) -> Self {
+        Self { name3: value.name2 }
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+struct ConfigV2 {
+    name2: Bytes,
+}
+
+impl From<ConfigV1> for ConfigV2 {
+    fn from(value: ConfigV1) -> Self {
+        Self { name2: value.name }
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+struct ConfigV1 {
+    name: Bytes,
+}
+```
+
+It will do the following:
+- create a copy of the `struct Config` as `struct ConfigV3` with appropriate `FROM` implementations
+- create a `ConfigVersion` enum with all configs in it
+- implement `serde::Serialize` and `serde::Deserialize` on `Config` which will
+  - wrap `Config` in the `ConfigVersion`
+  - serialize the `ConfigVersion`, or
+  - deserialize the `ConfigVersion` and convert it to `Config`
+
+This allows you to use any serde implementation to store any version of your structure,
+and retrieve always the latest version:
+
+```rust
+#[test]
+fn test_config() -> Result<(), Box<dyn std::error::Error>> {
+    // Simulate the storage of an old configuration.
+    let v1 = ConfigV1 { name: "123".into() };
+    let cv1 = ConfigVersion::V1(v1);
+    let c: Config = cv1.clone().into();
+    let cv1_str = serde_yaml::to_string(&cv1)?;
+
+    // Now the old version is recovered, and automatically converted
+    // to the latest version.
+    let c_recover: Config = serde_yaml::from_str(&cv1_str)?;
+    assert_eq!(c_recover, cv1.into());
+
+    // Storing and retrieving the latest version is always
+    // done using the original struct, `Config` in this case.
+    let c_str = serde_yaml::to_string(&c)?;
+    let c_recover = serde_yaml::from_str(&c_str)?;
+    assert_eq!(c, c_recover);
+    Ok(())
+}
+```
+
+### Usage of serde_as and others
+
+To allow usage of `serde_as`, the `VersionedSerde` also defines the `serde` attribute.
+However, `VersionedSerde` does not use it itself.
+
+### Usage of a new configuration structure
+
+When you start with a new configuration structure, the `versions` can be omitted:
+
+```rust
+#[derive(VersionedSerde, Clone)]
+struct NewStruct {
+    field: String
+}
+```
+
+When converting this using `serde`, it will store it as `V1`.
+So whenever you create a new version, you can add it with
+a converter to the latest structure:
+
+```rust
+#[derive(VersionedSerde, Clone)]
+#[versions = "[NewStructV1]"]
+struct NewStruct {
+    field: String,
+    other: String
+}
+
+impl From<NewStructV1> for NewStruct {
+    fn from(value: NewStructV1) -> Self {
+        Self {
+            field: value.field,
+            other: "default".into(),
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+struct NewStructV1 {
+    field: String
+}
+```
+
+## target_send
+
+This macro does two things:
+- for traits, it creates a version of the trait with `Box` at the end, and
+it adds `+ Send` for non-wasm targets
+- for types, it adds `+ Send` three characters from the end of the type in
+rust-macro-format
+
+So the following
+
+```rust
+#[target_send]
+trait Something<T>{}
+
+#[target_send]
+type SomethingElse<T> = Box<dyn SomethingMore<T>>;
+```
+
+Will be translated to:
+
+```rust
+trait Something<T>{}
+
+type SomethingBox<T> = Box<dyn Something<T> $SEND>
+
+type SomethingElse<T> = Box<dyn SomethingMore<T> $SEND>;
+```
+
+with `$SEND` either an empty string for `wasm` targets, or `+ Send` for non-`wasm` targets.
+Specifically the handling of the `type` is very ugly, as it converts the type to a string,
+adds conditionally `+ Send` three characters from the end, and parses the resulting string.
+
+Kids, don't do this at home...
\ No newline at end of file
diff --git a/flmacro/src/lib.rs b/flmacro/src/lib.rs
new file mode 100644
index 00000000..74d6021b
--- /dev/null
+++ b/flmacro/src/lib.rs
@@ -0,0 +1,341 @@
+use std::any::Any;
+
+// Define a custom attribute macro for platform-specific async_trait
+use proc_macro::TokenStream;
+use quote::{format_ident, quote};
+use syn::*;
+
+#[proc_macro_attribute]
+pub fn platform_async_trait(_attr: TokenStream, input: TokenStream) -> TokenStream {
+    if let Ok(input_impl) = syn::parse::<ItemImpl>(input.clone()) {
+        let expanded = quote! {
+            #[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
+            #[cfg_attr(target_family = "unix", async_trait::async_trait)]
+            #input_impl
+        };
+        return TokenStream::from(expanded);
+    }
+
+    if let Ok(input_trait) = syn::parse::<ItemTrait>(input) {
+        let expanded = quote! {
+            #[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
+            #[cfg_attr(target_family = "unix", async_trait::async_trait)]
+            #input_trait
+        };
+        return TokenStream::from(expanded);
+    }
+
+    let error = syn::Error::new(proc_macro2::Span::call_site(), "Unsupported type");
+    TokenStream::from(error.to_compile_error())
+}
+
+#[proc_macro_derive(AsU256)]
+pub fn as_u256_derive(input: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+    let name = &input.ident;
+
+    let expanded = quote! {
+        impl #name {
+            pub fn rnd() -> Self {
+                Self(U256::rnd())
+            }
+
+            pub fn zero() -> Self {
+                Self(U256::zero())
+            }
+
+            pub fn hash_data(data: &[u8]) -> Self {
+                Self(U256::hash_data(data))
+            }
+
+            pub fn hash_domain_parts(domain: &str, parts: &[&[u8]]) -> Self {
+                Self(U256::hash_domain_parts(domain, parts))
+            }
+
+            pub fn hash_domain_hashmap<K: Serialize, V: Serialize>(domain: &str, hm: &std::collections::HashMap<K, V>) -> Self {
+                Self(U256::hash_domain_hashmap(domain, hm))
+            }
+
+            pub fn from_vec<V: Serialize>(domain: &str, v: &Vec<V>) -> Self {
+                Self(U256::from_vec(domain, v))
+            }
+
+            pub fn to_bytes(&self) -> [u8; 32] {
+                self.0.to_bytes()
+            }
+
+            pub fn len(&self) -> usize {
+                32
+            }
+        }
+
+        impl std::fmt::Display for #name {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                f.write_fmt(format_args!("{}", self.0))
+            }
+        }
+
+        impl std::fmt::Debug for #name {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                f.write_fmt(format_args!("{:?}", self.0))
+            }
+        }
+
+        impl std::ops::Deref for #name {
+            type Target = U256;
+
+            fn deref(&self) -> &Self::Target {
+                &self.0
+            }
+        }
+
+        impl std::ops::DerefMut for #name {
+            fn deref_mut(&mut self) -> &mut Self::Target {
+                &mut self.0
+            }
+        }
+
+        impl std::str::FromStr for #name {
+            type Err = flarch::nodeids::ParseError;
+
+            fn from_str(s: &str) -> Result<#name, flarch::nodeids::ParseError> {
+                Ok(Self(U256::from_str(s)?))
+            }
+        }
+
+        impl AsRef<[u8]> for #name {
+            fn as_ref(&self) -> &[u8] {
+                &self.0.as_ref()
+            }
+        }
+        impl From<sha2::digest::generic_array::GenericArray<u8, sha2::digest::consts::U32>> for #name {
+            fn from(ga: sha2::digest::generic_array::GenericArray<u8, sha2::digest::consts::U32>) -> Self {
+                Self(ga.into())
+            }
+        }
+
+        impl From<[u8; 32]> for #name {
+            fn from(b: [u8; 32]) -> Self {
+                Self(b.into())
+            }
+        }
+
+        impl From<U256> for #name {
+            fn from(u: U256) -> Self {
+                Self(u)
+            }
+        }
+
+        impl std::fmt::LowerHex for #name {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                f.write_fmt(format_args!("{:x}", self.0))?;
+                Ok(())
+            }
+        }
+
+        impl Into<U256> for #name {
+            fn into(self) -> U256 {
+                self.0.clone()
+            }
+        }
+    };
+
+    TokenStream::from(expanded)
+}
+
+#[proc_macro_derive(VersionedSerde, attributes(versions, serde))]
+pub fn versioned_serde(input: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+    let struct_name = &input.ident;
+
+    // Extract the older configurations
+    let versions: Vec<syn::Ident> = input
+        .attrs
+        .iter()
+        .find(|attr| attr.path().is_ident("versions"))
+        .and_then(|attr| match &attr.meta {
+            Meta::NameValue(meta) => {
+                if let Expr::Lit(ExprLit {
+                    lit: Lit::Str(lit), ..
+                }) = &meta.value
+                {
+                    lit.parse::<syn::ExprArray>().ok().map(|list| {
+                        list.elems
+                            .into_iter()
+                            .filter_map(|expr| {
+                                if let syn::Expr::Path(expr_path) = expr {
+                                    expr_path.path.get_ident().cloned()
+                                } else {
+                                    None
+                                }
+                            })
+                            .collect()
+                    })
+                } else {
+                    None
+                }
+            }
+            _ => None,
+        })
+        .unwrap_or_default();
+
+    let enum_name = format_ident!("{}Version", struct_name);
+    let mut variants = vec![];
+    let mut conversions = vec![];
+    for (idx, version) in versions.iter().enumerate() {
+        let version_number = idx + 1;
+        let variant_name = format_ident!("V{}", version_number);
+        variants.push(quote! {
+            #variant_name(#version)
+        });
+        let next_variant_name = format_ident!("V{}", version_number + 1);
+        conversions.push(quote! {
+            #enum_name::#variant_name(#variant_name) => #enum_name::#next_variant_name(#variant_name.into()).into()
+        });
+    }
+
+    // Add current variant to the enum and to the match conversion
+    let mut latest_version = input.clone();
+    let latest_version_name_m1 = format_ident!("{}V{}", struct_name, versions.len());
+    let latest_version_name = format_ident!("{}V{}", struct_name, versions.len() + 1);
+    latest_version.ident = latest_version_name.clone();
+    // Don't copy 'versions' attribute, as it won't work recursively.
+    latest_version
+        .attrs
+        .retain(|a| !a.path().is_ident("versions"));
+
+    let m1_conversion = if versions.len() > 0 {
+        quote! {
+            impl From<#latest_version_name_m1> for #latest_version_name {
+                fn from(value: #latest_version_name_m1) -> Self {
+                    Into::<#struct_name>::into(value).into()
+                }
+            }
+        }
+    } else {
+        quote! {}
+    };
+
+    let latest_enum = format_ident!("V{}", versions.len() + 1);
+    variants.push(quote! {
+        #latest_enum(#latest_version_name)
+    });
+    conversions.push(quote! {
+        #enum_name::#latest_enum(orig) => orig.into()
+    });
+
+    let fields = match &input.data {
+        syn::Data::Struct(struct_data) => match &struct_data.fields {
+            syn::Fields::Named(fields_named) => &fields_named.named,
+            _ => panic!("Only named fields are supported"),
+        },
+        _ => panic!("Only structs are supported"),
+    };
+
+    let field_names: Vec<_> = fields.iter().map(|f| &f.ident).collect();
+
+    quote! {
+        #[derive(serde::Serialize, serde::Deserialize, Clone)]
+        enum #enum_name {
+            #(#variants),*
+        }
+
+        #[derive(serde::Serialize, serde::Deserialize, Clone)]
+        #latest_version
+
+        #m1_conversion
+
+        impl From<#struct_name> for #latest_version_name {
+            fn from(orig: #struct_name) -> Self {
+                Self {
+                    #(#field_names: orig.#field_names),*
+                }
+            }
+        }
+
+        impl From<#latest_version_name> for #struct_name {
+            fn from(new: #latest_version_name) -> Self {
+                Self {
+                    #(#field_names: new.#field_names),*
+                }
+            }
+        }
+
+        impl From<#enum_name> for #struct_name {
+            fn from(value: #enum_name) -> #struct_name {
+                return match value {
+                    #(#conversions),*
+                }
+            }
+        }
+
+        impl serde::Serialize for #struct_name {
+            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+            where
+                S: serde::Serializer,
+            {
+                #enum_name::#latest_enum(self.clone().into()).serialize(serializer)
+            }
+        }
+
+        impl<'de> serde::Deserialize<'de> for #struct_name {
+            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where
+                D: serde::Deserializer<'de>,
+            {
+                let version = #enum_name::deserialize(deserializer)?;
+                Ok(version.into())
+            }
+        }
+    }
+    .into()
+}
+
+#[proc_macro_attribute]
+pub fn target_send(_attr: TokenStream, input: TokenStream) -> TokenStream {
+    if let Ok(input_trait) = syn::parse::<ItemTrait>(input.clone()) {
+        let struct_name = &input_trait.ident;
+        let box_name = format_ident!("{}Box", struct_name);
+        let mut generics = input_trait.generics.clone();
+        generics.type_params_mut().for_each(|param| {
+            param.bounds.clear();
+        });
+
+        return quote! {
+            #input_trait
+
+            #[cfg(target_family = "wasm")]
+            type #box_name #generics = Box<dyn #struct_name #generics>;
+
+            #[cfg(target_family = "unix")]
+            type #box_name #generics = Box<dyn #struct_name #generics + Send>;
+        }
+        .into();
+    }
+
+    if let Ok(input_type) = syn::parse::<ItemType>(input.clone()) {
+        #[cfg(all(target_family = "unix", not(feature = "node")))]
+        {
+            let mut type_as_string = quote! {#input_type}.to_string();
+            type_as_string.insert_str(type_as_string.len() - 3, " + Send".into());
+            let modified_type: syn::ItemType =
+                syn::parse_str(&type_as_string).expect("Failed to parse modified type");
+
+            return quote! {
+                #modified_type
+            }
+            .into();
+        }
+        #[cfg(all(any(target_family = "unix"), feature = "node"))]
+        return quote! {
+            #input_type
+        }
+        .into();
+    }
+
+    let error = syn::Error::new(
+        proc_macro2::Span::call_site(),
+        format!("Unsupported type {:?}", input.type_id()),
+    );
+    TokenStream::from(error.to_compile_error())
+}
diff --git a/flmodules/Cargo.lock b/flmodules/Cargo.lock
index 9d3c895d..9d64dfa2 100644
--- a/flmodules/Cargo.lock
+++ b/flmodules/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,36 +93,37 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -143,7 +144,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -158,7 +159,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -182,7 +183,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -205,14 +206,25 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -221,24 +233,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -249,23 +261,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -315,9 +327,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 dependencies = [
  "serde",
 ]
@@ -340,11 +352,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -354,9 +372,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -372,9 +390,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -397,11 +415,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -424,19 +448,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "const-oid"
@@ -462,9 +476,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -484,6 +498,31 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
 [[package]]
 name = "crypto-bigint"
 version = "0.5.5"
@@ -509,9 +548,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -531,6 +570,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -545,7 +585,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -569,7 +609,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -580,14 +620,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -657,7 +697,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -674,6 +714,17 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
 [[package]]
 name = "ed25519-compact"
 version = "2.1.1"
@@ -681,7 +732,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
- "getrandom",
+ "ed25519",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -713,9 +780,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -723,9 +790,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -740,6 +807,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -761,20 +838,23 @@ name = "flarch"
 version = "0.8.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "wasm-bindgen",
@@ -786,43 +866,71 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
+name = "flcrypto"
+version = "0.8.0"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "flarch",
+ "flmacro",
+ "log",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde_with",
+ "sha2",
+ "thiserror 2.0.11",
+ "typetag",
+]
+
+[[package]]
+name = "flmacro"
 version = "0.8.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "flmodules"
 version = "0.8.0"
 dependencies = [
+ "async-recursion",
  "async-stream",
  "async-trait",
  "bimap",
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "bytes",
  "ed25519-compact",
+ "ed25519-dalek",
  "env_logger",
  "flarch",
+ "flcrypto",
+ "flmacro",
+ "flmodules",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
+ "num-bigint",
  "rand",
+ "rayon",
  "reqwest",
+ "rmp-serde",
  "serde",
  "serde_derive",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "strum_macros",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "toml",
+ "typetag",
 ]
 
 [[package]]
@@ -842,9 +950,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -857,9 +965,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -867,15 +975,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -884,38 +992,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -949,10 +1057,22 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -965,9 +1085,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "group"
@@ -988,15 +1108,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hex"
@@ -1024,9 +1144,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1058,9 +1178,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "humantime"
@@ -1070,9 +1190,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1089,9 +1209,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http",
@@ -1107,9 +1227,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1120,16 +1240,15 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1148,6 +1267,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1156,12 +1393,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1177,12 +1425,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1209,18 +1457,27 @@ dependencies = [
  "rand",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
  "webrtc-util",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1239,16 +1496,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1260,9 +1518,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linked-hash-map"
@@ -1270,6 +1528,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1282,9 +1546,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "md-5"
@@ -1319,9 +1583,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1335,22 +1599,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1394,6 +1657,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1422,9 +1686,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1440,9 +1704,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1452,9 +1716,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1470,9 +1734,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1503,6 +1767,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1528,31 +1798,11 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1584,9 +1834,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1614,18 +1864,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -1634,46 +1884,50 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.15",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1705,14 +1959,34 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -1724,18 +1998,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1745,9 +2019,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1756,15 +2030,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -1794,6 +2068,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-util",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -1822,13 +2097,35 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rtcp"
 version = "0.11.0"
@@ -1836,7 +2133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1850,7 +2147,7 @@ dependencies = [
  "portable-atomic",
  "rand",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1862,9 +2159,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -1886,9 +2183,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -1913,36 +2210,44 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -1955,19 +2260,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -1982,7 +2281,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand",
  "substring",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2006,7 +2305,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2015,9 +2314,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2025,15 +2324,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2051,20 +2350,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -2074,9 +2373,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2095,15 +2394,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2113,14 +2412,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2199,9 +2498,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2223,12 +2522,31 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "stun"
 version = "0.6.0"
@@ -2242,7 +2560,7 @@ dependencies = [
  "rand",
  "ring",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2276,9 +2594,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2287,9 +2605,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -2314,34 +2632,54 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2360,19 +2698,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2385,9 +2733,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2402,31 +2750,30 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2451,9 +2798,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2464,9 +2811,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2485,11 +2832,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -2498,14 +2845,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
  "pin-project-lite",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -2525,9 +2872,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -2535,9 +2882,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -2564,7 +2911,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2583,12 +2930,18 @@ dependencies = [
  "rand",
  "ring",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -2596,31 +2949,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typetag"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "typetag-impl"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unicode-ident"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -2640,9 +3002,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2655,6 +3017,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2663,11 +3037,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2710,14 +3084,24 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2725,36 +3109,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2762,33 +3146,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -2796,20 +3181,20 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -2820,9 +3205,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -2834,9 +3219,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2844,9 +3239,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -2879,7 +3274,7 @@ dependencies = [
  "sha2",
  "smol_str",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -2904,7 +3299,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -2940,7 +3335,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -2962,7 +3357,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -2980,7 +3375,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -2995,7 +3390,7 @@ dependencies = [
  "bytes",
  "rand",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3011,7 +3406,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3034,7 +3429,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3055,7 +3450,7 @@ dependencies = [
  "nix",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3214,13 +3609,34 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -3247,7 +3663,7 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3269,6 +3685,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3287,7 +3727,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -3307,5 +3768,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/flmodules/Cargo.toml b/flmodules/Cargo.toml
index 7283f419..4fdd2a66 100644
--- a/flmodules/Cargo.toml
+++ b/flmodules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flmodules"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 authors = ["Linus Gasser <linus@gasser.blue>"]
 description = "Modules used in fledger"
@@ -14,9 +14,13 @@ keywords = ["test", "utils", "fledger"]
 testing = []
 
 [dependencies]
-flarch = { path = "../flarch", version = "0.8" }
+flarch = { path = "../flarch", version = "0.9" }
+flcrypto = { path = "../flcrypto", version = "0.9" }
+flmacro = { path = "../flmacro", version = "0.9" }
 
+async-recursion = "1"
 bimap = "0.6"
+btparse = "0.2"
 getrandom = { version = "0.2" }
 serde = { version = "1", features = ["derive"] }
 serde_derive = "1"
@@ -26,6 +30,7 @@ serde_yaml = "0.8"
 serde_with = { version = "3", features = ["hex", "json", "base64"] }
 sha2 = "0.10"
 rand = "0.8"
+rmp-serde = "1"
 thiserror = "1"
 log = "0.4"
 itertools = "0.13"
@@ -33,7 +38,9 @@ async-trait = "0.1"
 futures = "0.3"
 tokio = { version = "1", features = ["sync"] }
 tokio-stream = "0.1"
-ed25519-compact = "2"
+typetag = "0.2"
+ed25519-compact = { version="2", features = ["traits"] }
+ed25519-dalek = { version="2", features = ["serde", "rand_core"] }
 toml = "0.8"
 serde_json = "1"
 names = { version = "0.14", default-features = false }
@@ -44,6 +51,11 @@ reqwest = { version = "0.12", features = [
     "rustls-tls",
 ], default-features = false }
 bitflags = { version = "2", features = ["serde"] }
+num-bigint = { version = "0.4.6", features = ["serde"] }
+strum_macros = "0.26.4"
 
 [dev-dependencies]
+flmodules = { path=".", features = ["testing"]}
+flcrypto = { path="../flcrypto", features = ["testing"]}
 env_logger = "0.11"
+rayon = "1.6"
diff --git a/flmodules/README.md b/flmodules/README.md
index e337c206..92a1e558 100644
--- a/flmodules/README.md
+++ b/flmodules/README.md
@@ -7,28 +7,44 @@ For this, most modules have the following structure:
 - `broker.rs` - which contains the code to interact with the other modules
 - `module.rs` - with the main code of the module, with at least a `process_msg` method
 that inputs a message and outputs a vector of answers
-- `data-structures` - implementing the basic functionality of the module.
+- `core.rs` - implementing the basic functionality of the module.
 
-Currently the following modules are available:
+The following modules are available:
 
-- `timer` sends out one message per second and one message per minute
-- `random_connections` takes a list of nodes and randomly selects enough nodes for
-a fully connected network
-- `ping` uses `random_connections` to send regular messages to the connected nodes
-to make sure they answer. If a node doesn't answer in due time, a failure message 
-is emitted.
-- `gossip_events` exchanges events emitted by the nodes and updates the list. It
+- [dht_router](./src/dht_router/README.md) implements a message routing system based on kademlia. It can
+  send messages directly to connected nodes, to the closest nodes (useful for
+  DHT storage), or broadcast to directly connected nodes.
+- [dht_storage](./src/dht_storage/README.md) allows to store blobs of data on the nodes, which can be
+  updated and read by all other nodes.
+- [gossip_events](./src/gossip_events/README.md) exchanges events emitted by the nodes and updates the list. It
 works both in active mode - sending new messages to neighbours - as in passive
 mode - requesting list of available events from other nodes.
-- `network` is the basic networking code to set up a new connection using
+- [network](./src/network/README.md) is the basic networking code to set up a new connection using
 the signalling server.
-- `web_proxy` allows sending a http GET request to another node, using the other
-node as a proxy.
-- `overlay` is an intermediate layer that contains all messages to be implemented
+- [ping](./src/ping/README.md) uses `random_connections` to send regular messages to the connected nodes
+to make sure they answer. If a node doesn't answer in due time, a failure message 
+is emitted.
+- [random_connections](./src/random_connections/README.md) takes a list of nodes and randomly selects enough nodes for
+a fully connected network
+- [router](./src/router/README.md) is an intermediate layer that contains all messages to be implemented
 for current and future communication layers. 
 Currently it's implemented for `random_connections` and `network`.
-Future implementations might include a `dht_router` and a `mix_net` communication
-layer.
+- [timer](./src/timer.rs) sends out one message per second and one message per minute
+- [web_proxy](./src/web_proxy/README.md) allows sending a http GET request to another node, using the other
+node as a proxy.
+
+## Dependencies
+
+
+This is the dependencies between the different modules:
+
+- `Signal` is the root of all control
+  - `Network` sets up its connections using `Signal`
+    - `RandomConnection` uses the `Network` to set up connections
+    - `Router` is an abstraction of the `Network` or the `RandomConnection`
+        - `DHT_Router` uses `Router`
+            - `DHT_Storage` uses `DHT_Router`
+        - `WebProxy` uses `Router`
 
 # Adding your own modules
 
@@ -41,25 +57,45 @@ the actual algorithm.
 This might include cryptographic calculations, caching, updating, and other
 tasks necessary for the functionality.
 Write it in a way that it can also be used by a non-fledger project.
+If possible, no async should be used in this implementation.
+
 2. Message Handling: create all messages that this module should receive or
 send during its lifetime.
 All messages defined here must be self-contained: this part must not depend
 directly on any other module's message definitions.
+
 3. Translation: this part defines the interactions with the other modules.
-This is mostly done with defining a `Translator` which takes incoming messages
-and outputs messges defined in the `Message Handling` file.
-
-# Broker
-
-I wanted to create a common code for both the libc- and wasm-implementation for
-Fledger.
-Unfortunately it is difficult by the fact that libc allows to use threads
-(and sometimes needs them), so some structures need to have the `Send` and `Sync`
-traits.
-But these traits are not available for all necessary websys-modules!
-So I came up with the idea of linking all modules using a `Broker` system.
-
-In short, all input and output for a module are defined as messages.
-Then each module handles incoming messages and produces outgoing messages.
-Modules can be linked together by defining `Translators` that take messages
-from one module and translate them into messages for the other module.
+This is mostly done with defining `translator` methods which take incoming messages
+and output messges for this module.
+
+## Testing
+
+Testing your new module should be done in three steps:
+
+1. Write tests for the core logic.
+   Make sure that all the necessary logic functions as it should.
+   Test edge-cases, and add more tests as the core logic expands.
+   The `Message Handling` part should be as simple as possible, and as
+   much of the logic should be here.
+
+2. Then go on to test the `Message Handling` part.
+   Create multiple objects of the structure, and let them interact using
+   simple simulators.
+   In this stage, it might be enough to do all message-passing manually,
+   so you have full control over what is going on.
+   This also helps to test edge-cases, because it allows you to 'delay' messages
+   artificially between modules.
+
+3. At the very end should you start implementing the more end-to-end tests.
+   As a first step it is good to use the router simulator in 
+   [router_simul](./src/testing/router_simul.rs).
+   It abstracts the router in a useful way, while still allowing you to have
+   some control of the message flow.
+   Depending on what you're doing, it might also be worth using the
+   [full_simul](./src/testing/full_simul.rs) which has an as-close-as-possible
+   simulation of all the messages.
+
+### Full end-to-end Tests
+
+Once all these tests work, you can do real tests with the binaries and set them
+up to use a signalling server.
\ No newline at end of file
diff --git a/flmodules/TESTING.md b/flmodules/TESTING.md
new file mode 100644
index 00000000..385c4c81
--- /dev/null
+++ b/flmodules/TESTING.md
@@ -0,0 +1,14 @@
+# Testing
+
+Here is a list of all testing harnesses in `flmodules/testing` and what they do:
+
+- [flo.rs](./src/testing/flo.rs) - provides a `Wallet` to simplify setting up the signatures for the Flos
+- [router_simul.rs](./src/testing/router_simul.rs) - bad copy of NetworkBrokerSimul
+- [network_broker_simul.rs](./src/testing/network_broker_simul.rs) - quite complete, creates RouterNodes
+- [full_simul.rs](./src/testing/full_simul.rs) - TODO: implement full signal/network/flnode simulation
+
+These are used here:
+- in `flmodules`:
+  - [dht_storage/broker.rs](./src/dht_storage/broker.rs) - `SimulStorage` - uses `NetworkBrokerSimul` and creates `DHTStorage` - very simplistic
+  - [tests/webpage.rs](./tests/webpage.rs) - uses flmodules::network::NetworkBrokerSimul and creates Nodes with wallets
+- [flnode/tests/helpers](../flnode/tests/helpers/mod.rs) - `NetworkSimul` - `NodeTimer` - manual processing of messages
diff --git a/flmodules/src/dht_router/README.md b/flmodules/src/dht_router/README.md
new file mode 100644
index 00000000..ee1983cb
--- /dev/null
+++ b/flmodules/src/dht_router/README.md
@@ -0,0 +1,38 @@
+# DHT Router
+
+This module offers message sending and receiving of messages using ideas based on 
+[Kademlia](https://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf).
+Contrary to Kademlia, the DHT_Router does not set up a connection to the closest
+destination of the message.
+Instead it sets up a list of buckets as in the Kademlia paper to have a restricted
+set of nodes with which it talks.
+Messages are then actually forwarded through these nodes until they reach destination.
+The advantage is that it doesn't need to set up new connections for every destination.
+The disadvantage is that the attack surface with regard to dropping messages is much bigger.
+
+The DHT Router offers these three types of messages:
+- `MessageClosest` which correspond the most to the original Kademlia messages. It sends
+  a message as close as possible to the destination.
+- `MessageDirect` is used for replies in the system - it tries to match a node directly,
+  but can fail silently if the destination is not reachable.
+- `MessageBroadcast` sends the message to all currently connected nodes.
+
+## Performance
+
+As long as all nodes get a full list of all other nodes, the system performs very nice:
+as well `MessageClosest` and `MessageDirect` reach the defined targets.
+Using the tests, it is shown that even with very short bucket lengths of 1 every message
+reaches its target.
+
+However, if some of the nodes only have a partial view of the network, this completely breaks.
+In this case, not all of the messages get to the closest or the target node.
+But for replies even in this scenario it should still hold:
+unless the network changed a lot between the request and the reply, the reply should be
+able to find the source node.
+
+# Implementation
+
+The implementation in [kademlia.rs](./kademlia.rs) is split in two structures:
+- `Kademlia` to manage adding/removing nodes and finding the relevant buckets
+- `KBucket` to implement one bucket of nodes, including calculation of the distance
+  and handling the life-cycle of the nodes
diff --git a/flmodules/src/dht_router/broker.rs b/flmodules/src/dht_router/broker.rs
new file mode 100644
index 00000000..bb5d2210
--- /dev/null
+++ b/flmodules/src/dht_router/broker.rs
@@ -0,0 +1,225 @@
+use flarch::{
+    broker::{Broker, BrokerError},
+    nodeids::U256,
+};
+use serde::{Deserialize, Serialize};
+use tokio::sync::watch;
+
+use crate::{
+    router::{broker::BrokerRouter, messages::NetworkWrapper},
+    timer::Timer,
+};
+use flarch::nodeids::NodeID;
+
+use super::{
+    kademlia::Config,
+    messages::{Messages, InternIn, InternOut, Stats},
+};
+
+pub(super) const MODULE_NAME: &str = "DHTRouter";
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum DHTRouterIn {
+    /// Sends a message to all nodes connected directly to this node.
+    MessageBroadcast(NetworkWrapper),
+    /// Routes the message to the closest node representing the ID.
+    MessageClosest(U256, NetworkWrapper),
+    /// Routes the message to a specific node. No guarantee can be given
+    /// as to the delivery of the message.
+    MessageDirect(NodeID, NetworkWrapper),
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum DHTRouterOut {
+    MessageBroadcast(NodeID, NetworkWrapper),
+    // MessageRouting(origin, last_hop, next_hop, key, msg)
+    MessageRouting(NodeID, NodeID, NodeID, U256, NetworkWrapper),
+    // MessageClosest(origin, last_hop, key, msg)
+    MessageClosest(NodeID, NodeID, U256, NetworkWrapper),
+    // MessageDest(origin, last_hop, msg)
+    MessageDest(NodeID, NodeID, NetworkWrapper),
+    NodeList(Vec<NodeID>),
+}
+
+pub type BrokerDHTRouter = Broker<DHTRouterIn, DHTRouterOut>;
+
+/// This links the DHTRouter module with other modules, so that
+/// all messages are correctly translated from one to the other.
+/// For this example, it uses the RandomConnections module to communicate
+/// with other nodes.
+#[derive(Clone)]
+pub struct DHTRouter {
+    pub broker: BrokerDHTRouter,
+    pub stats: watch::Receiver<Stats>,
+}
+
+impl DHTRouter {
+    pub async fn start(
+        our_id: NodeID,
+        router: BrokerRouter,
+        tick: &mut Timer,
+        config: Config,
+    ) -> Result<Self, BrokerError> {
+        let (messages, stats) = Messages::new(our_id, config);
+        let mut intern = Broker::new();
+        intern.add_handler(Box::new(messages)).await?;
+        intern
+            .add_translator_link(
+                router,
+                Box::new(|msg| match msg {
+                    InternOut::Network(to_router) => Some(to_router),
+                    _ => None,
+                }),
+                Box::new(|msg| Some(InternIn::Network(msg))),
+            )
+            .await?;
+        tick.tick_second(intern.clone(), InternIn::Tick).await?;
+
+        let broker = Broker::new();
+        intern
+            .add_translator_direct(
+                broker.clone(),
+                Box::new(|msg| Some(InternIn::DHTRouter(msg))),
+                Box::new(|msg| match msg {
+                    InternOut::DHTRouter(dht) => Some(dht),
+                    _ => None,
+                }),
+            )
+            .await?;
+
+        Ok(DHTRouter { broker, stats })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{error::Error, str::FromStr};
+
+    use flarch::{start_logging_filter_level, tasks::wait_ms};
+
+    use crate::{
+        router::messages::RouterOut, testing::router_simul::RouterSimul, timer::TimerMessage,
+    };
+
+    use super::*;
+
+    const LOG_LVL: log::LevelFilter = log::LevelFilter::Info;
+
+    #[tokio::test]
+    async fn test_routing() -> Result<(), Box<dyn Error>> {
+        start_logging_filter_level(vec![], LOG_LVL);
+
+        let mut tick = Timer::simul();
+        let config = Config {
+            k: 1,
+            ping_interval: 2,
+            ping_timeout: 4,
+        };
+
+        let mut simul = RouterSimul::new().await?;
+        let mut node_ids = vec![];
+        let mut node_infos = vec![];
+        let mut router_nets = vec![];
+        let mut dht_nets = vec![];
+        let mut dhts = vec![];
+        let mut taps = vec![];
+        for start in ["00", "40", "41", "42", "43"] {
+            let (node_conf, brok) = simul.new_node_id(Some(U256::from_str(start)?)).await?;
+            let id = node_conf.info.get_id();
+            let mut dht = DHTRouter::start(id, brok.clone(), &mut tick, config.clone()).await?;
+            router_nets.push(brok);
+            taps.push(dht.broker.get_tap_out().await?.0);
+            dht_nets.push(dht.broker.clone());
+            dhts.push(dht);
+            node_ids.push(id);
+            node_infos.push(node_conf.info);
+        }
+
+        log::info!("After for");
+        
+        for mut net in router_nets {
+            net.settle_msg_out(RouterOut::NodeInfoAvailable(node_infos.clone()))
+                .await?;
+        }
+
+        tick.broker.settle_msg_out(TimerMessage::Second).await?;
+
+        let dhtm_closest = |id: NodeID, module: &str, msg: &str| {
+            DHTRouterIn::MessageClosest(
+                id,
+                NetworkWrapper {
+                    module: module.into(),
+                    msg: msg.into(),
+                },
+            )
+        };
+
+        let mut nodes = node_ids.clone();
+        nodes.push(U256::from_str("44")?);
+        let mut routing = 0;
+        for (i, node) in nodes.iter().enumerate() {
+            if i == 0 {
+                continue;
+            }
+            log::info!("{i} Sending to node {node}");
+            dht_nets[0]
+                .settle_msg_in(dhtm_closest(*node, "Test", &format!("Msg{i}")))
+                .await?;
+            for b in &mut dht_nets {
+                b.settle(vec![]).await?;
+            }
+            let mut dest = 0;
+            let mut closest = 0;
+            for (j, tap) in taps.iter_mut().enumerate() {
+                while let Ok(msg) = tap.try_recv() {
+                    log::debug!("{j} got {msg:?}");
+                    match msg {
+                        DHTRouterOut::MessageRouting(_, _, _, _, _) => routing += 1,
+                        DHTRouterOut::MessageClosest(_, _, _, _) => closest += 1,
+                        DHTRouterOut::MessageDest(_, _, _) => dest += 1,
+                        _ => {}
+                    }
+                }
+            }
+            match i {
+                5 => assert_eq!([0, 1], [dest, closest]),
+                _ => assert_eq!([1, 0], [dest, closest]),
+            }
+        }
+        assert!(routing > 0);
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn test_update_nodes() -> Result<(), Box<dyn Error>> {
+        start_logging_filter_level(vec!["flmodules"], log::LevelFilter::Info);
+
+        let mut tick = Timer::simul();
+        let config = Config {
+            k: 1,
+            ping_interval: 2,
+            ping_timeout: 4,
+        };
+
+        let mut simul = RouterSimul::new().await?;
+        let mut node_ids = vec![];
+        let mut node_infos = vec![];
+        let mut router_nets = vec![];
+        let mut dht_nets = vec![];
+        let mut taps = vec![];
+        for start in ["00", "40", "41"] {
+            let (node_conf, brok) = simul.new_node_id(Some(U256::from_str(start)?)).await?;
+            let id = node_conf.info.get_id();
+            let mut dht = DHTRouter::start(id, brok.clone(), &mut tick, config).await?;
+            router_nets.push(brok);
+            taps.push(dht.broker.get_tap_out().await?.0);
+            dht_nets.push(dht.broker.clone());
+            node_ids.push(id);
+            node_infos.push(node_conf.info);
+        }
+        wait_ms(1000).await;
+
+        Ok(())
+    }
+}
diff --git a/flmodules/src/dht_router/kademlia.rs b/flmodules/src/dht_router/kademlia.rs
new file mode 100644
index 00000000..f8e62142
--- /dev/null
+++ b/flmodules/src/dht_router/kademlia.rs
@@ -0,0 +1,959 @@
+use core::fmt;
+use std::fmt::Debug;
+
+use flarch::nodeids::{NodeID, NodeIDs};
+use itertools::Itertools;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub struct Kademlia {
+    // All buckets starting with a distance of 0..depth-1 0s followed by at least
+    // one 1.
+    buckets: Vec<KBucket>,
+    // The home of the root bucket.
+    root_bucket: KBucket,
+    // The root node of this Kademlia instance
+    pub root: NodeID,
+    // Configuration for the buckets
+    config: Config,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq)]
+pub struct Config {
+    pub k: usize,
+    pub ping_interval: u32,
+    pub ping_timeout: u32,
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            k: 5,
+            ping_interval: 10,
+            ping_timeout: 20,
+        }
+    }
+}
+
+impl Kademlia {
+    pub fn new(root: NodeID, config: Config) -> Self {
+        Self {
+            buckets: vec![],
+            root_bucket: KBucket::new_root(config),
+            root,
+            config,
+        }
+    }
+
+    pub fn add_node(&mut self, id: NodeID) {
+        if id == self.root || self.has_node_id(&id) {
+            return;
+        }
+        let node = KNode::new(&self.root, id);
+        if let Some(bucket) = self.buckets.get_mut(node.depth) {
+            bucket.add_node(node);
+        } else {
+            self.root_bucket.add_node(node);
+            if self.root_bucket.status() == BucketStatus::Overflowing {
+                self.rebalance_overflow();
+            }
+        };
+    }
+
+    pub fn add_nodes(&mut self, ids: Vec<NodeID>) {
+        for id in ids {
+            self.add_node(id);
+        }
+    }
+
+    #[cfg(feature = "testing")]
+    pub fn add_nodes_active(&mut self, ids: Vec<NodeID>) {
+        for id in ids {
+            let node = KNode::new(&self.root, id);
+            if let Some(bucket) = self.buckets.get_mut(node.depth) {
+                bucket.add_node_active(node);
+            } else {
+                self.root_bucket.add_node_active(node);
+                if self.root_bucket.status() == BucketStatus::Overflowing {
+                    self.rebalance_overflow();
+                }
+            }
+        }
+    }
+
+    pub fn remove_node(&mut self, id: &NodeID) {
+        let node = KNode::new(&self.root, *id);
+        if let Some(bucket) = self.buckets.get_mut(node.depth) {
+            bucket.remove_node(id);
+        } else {
+            self.root_bucket.remove_node(id);
+            if self.root_bucket.status() == BucketStatus::Wanting {
+                self.rebalance_wanting();
+            }
+        };
+    }
+
+    /// Returns the next hop to get the message as close to the destination as possible.
+    /// If a needed bucket is empty, the closest nodes on the 'wrong' branch will be returned.
+    pub fn route_closest(&self, dst: &NodeID, last: Option<&NodeID>) -> Vec<NodeID> {
+        let depth = KNode::get_depth(&self.root, *dst);
+        match last {
+            Some(l) => {
+                let depth_last = depth.max(KNode::get_depth(&self.root, *l));
+                let depth_root_last = self.root_bucket.last_depth().unwrap_or(depth_last);
+                for d in std::iter::once(depth).chain(depth_last + 1..depth_root_last) {
+                    let ret = self.get_nodes_depth(d);
+                    if ret.len() > 0 {
+                        return ret;
+                    }
+                }
+                vec![]
+            }
+            None => self.get_nodes_depth(depth),
+        }
+    }
+
+    /// Returns the next hop to get the message to the exact destination as possible.
+    /// If a needed bucket is empty, an empty vector is returned, and the routing will fail.
+    pub fn route_direct(&self, dst: &NodeID) -> Vec<NodeID> {
+        let depth = KNode::get_depth(&self.root, *dst);
+        self.get_nodes_depth(depth)
+    }
+
+    /// Returns all nodes at a given depth.
+    pub fn get_nodes_depth(&self, depth: usize) -> Vec<NodeID> {
+        if let Some(ret) = self.buckets.get(depth).map(|b| b.get_active_ids(depth)) {
+            ret
+        } else {
+            self.root_bucket.get_active_ids(depth)
+        }
+    }
+
+    /// Returns all the active nodes of the kademlia system.
+    pub fn active_nodes(&self) -> Vec<NodeID> {
+        self.buckets
+            .iter()
+            .flat_map(|b| &b.active)
+            .chain(&self.root_bucket.active)
+            .map(|kn| kn.id)
+            .collect()
+    }
+
+    /// Returns all the nodes waiting to be activated of the kademlia system.
+    pub fn cache_nodes(&self) -> Vec<NodeID> {
+        self.buckets
+            .iter()
+            .flat_map(|b| &b.cache)
+            .chain(&self.root_bucket.cache)
+            .map(|kn| kn.id)
+            .collect()
+    }
+
+    /// The system received a message from this node, so its considered
+    /// active.
+    pub fn node_active(&mut self, id: &NodeID) -> bool {
+        let depth = KNode::get_depth(&self.root, *id);
+        self.buckets
+            .get_mut(depth)
+            .unwrap_or_else(|| &mut self.root_bucket)
+            .node_active(id)
+    }
+
+    /// Advances the clock by one tick and returns the nodes which were removed,
+    /// and the nodes which need to be pinged.
+    pub fn tick(&mut self) -> TickIDs {
+        let mut ping_ids = TickIDs::default();
+        for bucket in self.buckets.iter_mut() {
+            ping_ids.extend(bucket.tick());
+        }
+        ping_ids.extend(self.root_bucket.tick());
+        ping_ids
+    }
+
+    // The root bucket overflows - split it until it has between k and 2k
+    // nodes.
+    fn rebalance_overflow(&mut self) {
+        while self.root_bucket.status() == BucketStatus::Overflowing {
+            let mut bucket = KBucket::new(self.config);
+            let (active, cache) = self
+                .root_bucket
+                .remove_all_nodes_at_depth(self.buckets.len());
+            bucket.add_nodes_active(active);
+            bucket.add_nodes(cache);
+            self.buckets.push(bucket);
+        }
+    }
+
+    // The root bucket is wanting - merge with non-empty upper buckets until
+    // it's safe again.
+    fn rebalance_wanting(&mut self) {
+        while self.root_bucket.status() == BucketStatus::Wanting {
+            if let Some(bucket) = self.buckets.pop() {
+                self.root_bucket.add_nodes_active(bucket.active);
+                self.root_bucket.add_nodes(bucket.cache);
+            } else {
+                return;
+            }
+        }
+    }
+
+    fn _get_active_bucket_ids(&self, depth: usize) -> Option<Vec<NodeID>> {
+        if let Some(bucket) = self.buckets.get(depth) {
+            if bucket.active.len() > 0 {
+                return Some(bucket.active.iter().map(|kn| kn.id).collect());
+            }
+        }
+        None
+    }
+
+    fn has_node_id(&self, id: &NodeID) -> bool {
+        for bucket in &self.buckets {
+            if bucket.has_node_id(id) {
+                return true;
+            }
+        }
+        self.root_bucket.has_node_id(id)
+    }
+}
+
+impl fmt::Display for Kademlia {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_fmt(format_args!("Kademlia root: {}\n", self.root))?;
+        f.write_fmt(format_args!("k: {}\n", self.config.k))?;
+        for (index, bucket) in self.buckets.iter().enumerate() {
+            f.write_fmt(format_args!("Bucket[{index}] = {}\n", bucket))?;
+        }
+        f.write_fmt(format_args!("Root-bucket: {}", self.root_bucket))
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+struct KBucket {
+    active: Vec<KNode>,
+    cache: Vec<KNode>,
+    config: Config,
+    is_root: bool,
+}
+
+impl KBucket {
+    fn new(config: Config) -> Self {
+        Self {
+            active: vec![],
+            cache: vec![],
+            config,
+            is_root: false,
+        }
+    }
+
+    fn new_root(config: Config) -> Self {
+        Self {
+            active: vec![],
+            cache: vec![],
+            config,
+            is_root: true,
+        }
+    }
+
+    fn add_node(&mut self, node: KNode) {
+        if self.is_root || self.cache.len() < 2 * self.config.k {
+            self.cache.push(node);
+        }
+    }
+
+    fn add_nodes(&mut self, nodes: Vec<KNode>) {
+        for node in nodes.into_iter() {
+            self.add_node(node);
+        }
+    }
+
+    fn add_nodes_active(&mut self, nodes: Vec<KNode>) {
+        for node in nodes {
+            self.add_node_active(node);
+        }
+    }
+
+    fn add_node_active(&mut self, node: KNode) {
+        if self.is_root || self.active.len() < self.config.k {
+            self.active.push(node);
+            self.active.sort_by(|a, b| a.depth.cmp(&b.depth));
+        } else if self.cache.len() < self.config.k {
+            self.cache.push(node);
+        }
+    }
+
+    fn remove_node(&mut self, id: &NodeID) {
+        self.active.retain(|kn| &kn.id != id);
+        self.cache.retain(|kn| &kn.id != id);
+    }
+
+    // Removes the node at depth, but avoids draining the
+    // node lists below config.k nodes.
+    // It may still happen that all active nodes get drained, and only
+    // cached nodes remain.
+    fn remove_all_nodes_at_depth(&mut self, depth: usize) -> (Vec<KNode>, Vec<KNode>) {
+        let max_nodes = (self.cache.len() + self.active.len()).saturating_sub(self.config.k);
+        let mut cache = vec![];
+        for _ in 0..max_nodes {
+            if let Some(pos) = self.cache.iter().position(|kn| kn.depth == depth) {
+                cache.push(self.cache.remove(pos));
+            }
+        }
+
+        let mut active = vec![];
+        for _ in 0..max_nodes - cache.len() {
+            if let Some(pos) = self.active.iter().position(|kn| kn.depth == depth) {
+                active.push(self.active.remove(pos));
+            }
+        }
+
+        (active, cache)
+    }
+
+    fn get_active_ids(&self, depth: usize) -> Vec<NodeID> {
+        self.active
+            .iter()
+            .filter_map(|kn| (kn.depth == depth).then(|| kn.id))
+            .collect()
+    }
+
+    fn last_depth(&self) -> Option<usize> {
+        self.active.last().map(|kn| kn.depth)
+    }
+
+    // Rust range expressions:
+    // 0..k nodes: wanting
+    // k..=2k nodes: stable
+    // 2k+1.. nodes: overflowing
+    fn status(&mut self) -> BucketStatus {
+        let nodes = self.active.len() + self.cache.len();
+        if nodes >= 2 * self.config.k {
+            // Check if we're in the edge-case of having too few different nodes.
+            if self.overflow_imbalance() {
+                BucketStatus::Stable
+            } else {
+                BucketStatus::Overflowing
+            }
+        } else if nodes < self.config.k {
+            BucketStatus::Wanting
+        } else {
+            BucketStatus::Stable
+        }
+    }
+
+    fn overflow_imbalance(&self) -> bool {
+        let depths: Vec<usize> = self
+            .active
+            .iter()
+            .chain(self.cache.iter())
+            .map(|kn| kn.depth)
+            .sorted()
+            .collect();
+        if let Some(first) = depths.first() {
+            if let Some(first_nbr) = depths.iter().counts_by(|d| d).get(first) {
+                return depths.len() - first_nbr < self.config.k;
+            }
+        }
+        false
+    }
+
+    fn _get_knode(&mut self, id: &NodeID) -> Option<&mut KNode> {
+        self.active
+            .iter_mut()
+            .chain(self.cache.iter_mut())
+            .find(|kn| &kn.id == id)
+    }
+
+    fn tick(&mut self) -> TickIDs {
+        let mut ticks = self.tick_active();
+        ticks.extend(self.tick_cache());
+        ticks
+    }
+
+    fn tick_active(&mut self) -> TickIDs {
+        let mut tick_ids = TickIDs::default();
+
+        // Active nodes get only pinged when they were active for ping_interval.
+        for node in self.active.iter_mut() {
+            node.tick();
+            if node.ticks_last % self.config.ping_interval == 0 {
+                tick_ids.ping.push(node.id);
+            }
+            if node.ticks_last >= self.config.ping_timeout {
+                tick_ids.deleted.push(node.id);
+            }
+        }
+
+        tick_ids
+    }
+
+    fn tick_cache(&mut self) -> TickIDs {
+        let mut tick_ids = TickIDs::default();
+
+        // Cached nodes get pinged directly.
+        // Up to twice the missig nodes get pinged to fill up self.active.
+        let fillup_nodes = if self.is_root {
+            self.cache.len()
+        } else {
+            2 * (self.config.k - self.active.len())
+        };
+        for node in self.cache.iter_mut().take(fillup_nodes) {
+            if node.ticks_last % self.config.ping_interval == 0 {
+                tick_ids.ping.push(node.id);
+            }
+            node.tick();
+            if node.ticks_last >= self.config.ping_timeout {
+                tick_ids.deleted.push(node.id);
+            }
+        }
+
+        tick_ids
+    }
+
+    fn node_active(&mut self, id: &NodeID) -> bool {
+        if let Some(kn) = self.active.iter_mut().find(|kn| &kn.id == id) {
+            kn.active();
+        } else if let Some(pos) = self.cache.iter().position(|kn| &kn.id == id) {
+            let mut kn = self.cache.remove(pos);
+            kn.active();
+            if self.is_root || self.active.len() < self.config.k {
+                self.active.push(kn);
+                self.active.sort_by(|a, b| a.depth.cmp(&b.depth));
+                return true;
+            } else {
+                self.cache.push(kn);
+            }
+        }
+        false
+    }
+
+    fn has_node_id(&self, id: &NodeID) -> bool {
+        self.active
+            .iter()
+            .chain(self.cache.iter())
+            .any(|kn| &kn.id == id)
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
+pub struct TickIDs {
+    pub deleted: Vec<NodeID>,
+    pub ping: Vec<NodeID>,
+}
+
+impl TickIDs {
+    pub fn extend(&mut self, other: TickIDs) {
+        self.deleted.extend_from_slice(&other.deleted);
+        self.ping.extend_from_slice(&other.ping);
+    }
+}
+
+impl fmt::Display for KBucket {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_fmt(format_args!(
+            "Active: {} :: Cache: {}",
+            NodeIDs::from(self.active.iter().map(|kn| kn.id).collect::<Vec<NodeID>>()),
+            NodeIDs::from(self.cache.iter().map(|kn| kn.id).collect::<Vec<NodeID>>()),
+        ))?;
+        Ok(())
+    }
+}
+
+#[derive(PartialEq)]
+enum BucketStatus {
+    // #nodes > 2k
+    Overflowing,
+    // k <= #nodes <= 2k
+    Stable,
+    // #nodes < k
+    Wanting,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct KNode {
+    id: NodeID,
+    depth: usize,
+    ticks_active: u32,
+    ticks_last: u32,
+}
+
+impl KNode {
+    pub fn new(root: &NodeID, id: NodeID) -> Self {
+        Self {
+            id,
+            depth: Self::get_depth(root, id),
+            ticks_active: 0,
+            ticks_last: 0,
+        }
+    }
+
+    fn _reset(&mut self) {
+        self.ticks_active = 0;
+        self.ticks_last = 0;
+    }
+
+    pub fn get_depth(root: &NodeID, id: NodeID) -> usize {
+        for (index, (root_byte, id_byte)) in
+            root.as_ref().iter().zip(id.as_ref().iter()).enumerate()
+        {
+            let xor_result = root_byte ^ id_byte;
+
+            // Instead of checking each bit individually, iterate over the bits.
+            for i in (0..8).rev() {
+                if (xor_result & (1 << i)) != 0 {
+                    return index * 8 + 7 - i;
+                }
+            }
+        }
+        return id.as_ref().len() * 8 - 1;
+    }
+
+    fn tick(&mut self) {
+        self.ticks_active += 1;
+        self.ticks_last += 1;
+    }
+
+    fn active(&mut self) {
+        self.ticks_last = 0;
+    }
+}
+
+impl PartialEq for KNode {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::{iter::once, str::FromStr};
+
+    use flarch::{nodeids::U256, start_logging_filter_level};
+    use rand::seq::SliceRandom;
+
+    use super::*;
+
+    const LOG_LVL: log::LevelFilter = log::LevelFilter::Info;
+
+    const CONFIG: Config = Config {
+        k: 2,
+        ping_interval: 2,
+        ping_timeout: 4,
+    };
+
+    pub fn rnd_node_depth(root: &NodeID, depth: usize) -> NodeID {
+        loop {
+            let node = NodeID::rnd();
+            let nd = KNode::get_depth(root, node);
+            if nd == depth {
+                return node;
+            }
+        }
+    }
+    
+    pub fn rnd_nodes_depth(root: &NodeID, depth: usize, nbr: usize) -> Vec<NodeID> {
+        (0..nbr).map(|_| rnd_node_depth(root, depth)).collect()
+    }
+    
+    pub fn distance_str(root: &NodeID, node_str: &str) -> usize {
+        let node = U256::from_str(node_str).expect("NodeID init");
+        KNode::get_depth(root, node)
+    }
+    
+    pub fn kademlia_add_nodes(kademlia: &mut Kademlia, depth: usize, nbr: usize) {
+        kademlia.add_nodes_active(rnd_nodes_depth(&kademlia.root, depth, nbr));
+    }
+    
+    pub fn kademlia_add_nodes_cache(kademlia: &mut Kademlia, depth: usize, nbr: usize) {
+        kademlia.add_nodes(rnd_nodes_depth(&kademlia.root, depth, nbr));
+    }    
+
+    #[test]
+    fn test_get_depth() {
+        start_logging_filter_level(vec![], LOG_LVL);
+
+        let root = U256::from_str("00").expect("NodeID init");
+        assert_eq!(255, KNode::get_depth(&root, root));
+        assert_eq!(0, distance_str(&root, "80"));
+        assert_eq!(1, distance_str(&root, "40"));
+        assert_eq!(2, distance_str(&root, "20"));
+        assert_eq!(3, distance_str(&root, "10"));
+        assert_eq!(4, distance_str(&root, "08"));
+        assert_eq!(5, distance_str(&root, "04"));
+        assert_eq!(6, distance_str(&root, "02"));
+        assert_eq!(7, distance_str(&root, "01"));
+        assert_eq!(8, distance_str(&root, "0080"));
+    }
+
+    #[test]
+    fn test_rnd_node_depth() {
+        start_logging_filter_level(vec![], LOG_LVL);
+
+        let node = U256::from_str("00").expect("NodeID init");
+        log::debug!("{}", node);
+        for i in 0..16 {
+            log::debug!("{} - {}", i, rnd_node_depth(&node, i));
+        }
+    }
+
+    fn kademlia_test(kademlia: &Kademlia, buckets: usize, root_active: usize) {
+        kademlia_test_cache(kademlia, buckets, root_active, 0);
+    }
+    fn kademlia_test_cache(
+        kademlia: &Kademlia,
+        buckets: usize,
+        root_active: usize,
+        root_cache: usize,
+    ) {
+        assert_eq!(buckets, kademlia.buckets.len(), "Wrong number of buckets");
+        assert_eq!(
+            root_active,
+            kademlia.root_bucket.active.len(),
+            "Active KBucket number mismatch"
+        );
+        assert_eq!(
+            root_cache,
+            kademlia.root_bucket.cache.len(),
+            "Cache KBucket number mismatch"
+        );
+        for (depth, bucket) in kademlia.buckets.iter().enumerate() {
+            for node in bucket.active.iter().chain(bucket.cache.iter()) {
+                assert_eq!(
+                    depth, node.depth,
+                    "Node {} in bucket depth {} has wrong depth: {}",
+                    node.id, depth, node.depth
+                );
+            }
+        }
+        for node in kademlia
+            .root_bucket
+            .active
+            .iter()
+            .chain(kademlia.root_bucket.cache.iter())
+        {
+            assert!(
+                node.depth >= kademlia.buckets.len(),
+                "Node {} in root has wrong depth: {} <= {}",
+                node.id,
+                node.depth,
+                kademlia.buckets.len()
+            );
+        }
+    }
+
+    #[test]
+    fn test_adding_nodes() {
+        start_logging_filter_level(vec![], LOG_LVL);
+
+        let root = U256::from_str("00").expect("NodeID init");
+        let mut kademlia = Kademlia::new(root, CONFIG);
+        kademlia_add_nodes(&mut kademlia, 0, CONFIG.k);
+        kademlia_test(&kademlia, 0, CONFIG.k);
+
+        kademlia_add_nodes(&mut kademlia, 2, CONFIG.k);
+        kademlia_test(&kademlia, 1, CONFIG.k);
+
+        kademlia_add_nodes(&mut kademlia, 3, 1);
+        kademlia_test(&kademlia, 1, CONFIG.k + 1);
+
+        kademlia_add_nodes(&mut kademlia, 4, CONFIG.k);
+        kademlia_test(&kademlia, 3, CONFIG.k + 1);
+
+        let mut kademlia = Kademlia::new(root, CONFIG);
+        kademlia_add_nodes(&mut kademlia, 2, 3 * CONFIG.k);
+        kademlia_test(&kademlia, 0, 3 * CONFIG.k);
+    }
+
+    #[test]
+    fn test_removing_nodes() {
+        let root = U256::from_str("00").expect("NodeID init");
+        let mut kademlia = Kademlia::new(root, CONFIG);
+        kademlia_add_nodes(&mut kademlia, 0, CONFIG.k);
+        kademlia_add_nodes(&mut kademlia, 2, CONFIG.k);
+        kademlia_add_nodes(&mut kademlia, 3, 1);
+        kademlia_add_nodes(&mut kademlia, 4, CONFIG.k);
+
+        kademlia_test(&kademlia, 3, CONFIG.k + 1);
+        let id = kademlia.root_bucket.active.get(0).unwrap().id;
+        kademlia.remove_node(&id);
+        kademlia_test(&kademlia, 3, CONFIG.k);
+        let id = kademlia.root_bucket.active.get(0).unwrap().id;
+        kademlia.remove_node(&id);
+        kademlia_test(&kademlia, 2, CONFIG.k + 1);
+    }
+
+    // Test the standard edge-cases: no nodes, only depth==0 nodes
+    #[test]
+    fn test_closest_nodes_simple() {
+        start_logging_filter_level(vec![], LOG_LVL);
+
+        let root = U256::from_str("00").expect("NodeID init");
+        let mut kademlia = Kademlia::new(root, CONFIG);
+
+        let dst_0 = rnd_node_depth(&root, 0);
+        let dst_1 = rnd_node_depth(&root, 1);
+        let dst_2 = rnd_node_depth(&root, 2);
+
+        let nodes = kademlia.route_closest(&dst_2, None);
+        assert_eq!(0, nodes.len());
+
+        kademlia_add_nodes(&mut kademlia, 0, 1);
+        let nodes = kademlia.route_closest(&dst_0, None);
+        assert_eq!(1, nodes.len());
+        let nodes = kademlia.route_closest(&dst_1, None);
+        assert_eq!(0, nodes.len());
+
+        kademlia_add_nodes(&mut kademlia, 2, 1);
+        let nodes = kademlia.route_closest(&dst_2, None);
+        assert_eq!(1, nodes.len());
+
+        kademlia_add_nodes(&mut kademlia, 2, 2 * CONFIG.k);
+        let nodes = kademlia.route_closest(&dst_2, None);
+        assert_eq!(2 * CONFIG.k + 1, nodes.len());
+    }
+
+    // Do some more complicated cases
+    #[test]
+    fn test_closest_nodes_last() {
+        start_logging_filter_level(vec![], LOG_LVL);
+
+        let root = U256::from_str("00").expect("NodeID init");
+        let mut kademlia = Kademlia::new(root, CONFIG);
+
+        kademlia_add_nodes(&mut kademlia, 2, CONFIG.k);
+        kademlia_add_nodes(&mut kademlia, 3, CONFIG.k);
+        // As the depth==4 nodes are entered one-by-one, the first one
+        // triggers the overflow, and the second one goes to the cache.
+        // So the active KBucket of the root_bucket has a depth 3 and a
+        // depth 4 inside.
+        kademlia_add_nodes(&mut kademlia, 4, CONFIG.k + 1);
+
+        let tests = vec![
+            (0, 2, CONFIG.k),
+            (1, 2, CONFIG.k),
+            (2, 2, CONFIG.k),
+            (3, 3, CONFIG.k),
+            (4, 4, CONFIG.k + 1),
+            (5, 4, 0),
+        ];
+
+        for (depth, returned, nbr) in tests {
+            let dst = rnd_node_depth(&root, depth);
+            let nodes = kademlia.route_closest(&dst, Some(&dst));
+            assert_eq!(
+                nbr,
+                nodes.len(),
+                "{depth} - {returned} - {nbr} - {}\n{kademlia}",
+                NodeIDs::from(nodes),
+            );
+            for node in nodes {
+                let d = KNode::get_depth(&root, node);
+                assert_eq!(
+                    returned, d,
+                    "Node {node} with depth {d} in {depth} - {returned} - {nbr}"
+                );
+            }
+        }
+    }
+
+    fn tick_len(kademlia: &mut Kademlia, ping: usize, deleted: usize) -> TickIDs {
+        let ticks = kademlia.tick();
+        assert_eq!(
+            ping,
+            ticks.ping.len(),
+            "Got ping for {} instead of {ping} nodes",
+            ticks.ping.len()
+        );
+        assert_eq!(
+            deleted,
+            ticks.deleted.len(),
+            "Got deleted for {} instead of {deleted} nodes",
+            ticks.deleted.len()
+        );
+        ticks
+    }
+
+    #[test]
+    fn test_tick() {
+        start_logging_filter_level(vec![], LOG_LVL);
+
+        let root = U256::from_str("00").expect("NodeID init");
+        let mut kademlia = Kademlia::new(root, CONFIG);
+
+        kademlia_add_nodes(&mut kademlia, 2, 10);
+        kademlia_add_nodes(&mut kademlia, 3, 10);
+
+        tick_len(&mut kademlia, 0, 0);
+        let ticks = tick_len(&mut kademlia, 12, 0);
+        for ping in &ticks.ping[0..3] {
+            kademlia.node_active(&ping);
+        }
+        tick_len(&mut kademlia, 0, 0);
+        tick_len(&mut kademlia, 12, 9);
+    }
+
+    #[test]
+    fn test_distribution() {
+        start_logging_filter_level(vec![], LOG_LVL);
+
+        let root = NodeID::rnd();
+        let mut kademlia = Kademlia::new(
+            root,
+            Config {
+                k: 2,
+                ping_interval: 10,
+                ping_timeout: 20,
+            },
+        );
+
+        kademlia.add_nodes_active((0..256).map(|_| NodeID::rnd()).collect());
+
+        for (index, bucket) in kademlia
+            .buckets
+            .iter()
+            .chain(once(&kademlia.root_bucket))
+            .enumerate()
+        {
+            log::info!("{index}: {}+{}", bucket.active.len(), bucket.cache.len())
+        }
+    }
+
+    #[test]
+    fn test_reach() {
+        start_logging_filter_level(vec![], log::LevelFilter::Info);
+        // use rayon::prelude::*;
+
+        let mut res = vec![];
+        let total = 100;
+        (0..5).rev().for_each(|ki| {
+            let k = (total / 50) * ki + 1;
+            (0..=5).collect::<Vec<_>>().iter().for_each(|&missing| {
+                log::info!("{ki}/{missing}");
+                let visible = total - missing * 50 / (1000 / total);
+                let missed = reach_one(total, visible, 200, 2);
+                res.push([k, visible, missed]);
+            });
+        });
+        log::info!("\n{res:?}");
+    }
+
+    fn reach_one(node_nbr: usize, node_visible: usize, max_hops: usize, k: usize) -> usize {
+        let config = Config {
+            k,
+            ping_interval: 10,
+            ping_timeout: 20,
+        };
+        let nodes: Vec<NodeID> = (0..node_nbr).map(|_| NodeID::rnd()).collect();
+        let rng = &mut rand::thread_rng();
+        let kademlias: Vec<Kademlia> = nodes
+            .iter()
+            .map(|root| {
+                let mut kad = Kademlia::new(*root, config);
+                let mut shuffled = nodes.clone();
+                shuffled.retain(|id| id != root);
+                kad.add_nodes_active(shuffled.partial_shuffle(rng, node_visible).0.to_vec());
+                // kad.add_nodes(shuffled);
+                kad
+            })
+            .collect();
+
+        // log::debug!("{}", &kademlias[0]);
+        let mut hops_stat = vec![];
+        let mut missing = 0;
+        for (run, node) in nodes[1..node_nbr].iter().enumerate() {
+            log::debug!("*** {run} ***: Searching route from {} to {node}", nodes[0]);
+            let mut hop_kademlia = kademlias.choose(rng).unwrap();
+            for hop in 0..max_hops {
+                // log::trace!("{hop_kademlia}");
+                let next_hops =
+                    hop_kademlia.route_closest(node, (hop > 0).then(|| &hop_kademlia.root));
+                if let Some(next_hop) = next_hops.choose(rng) {
+                    hop_kademlia = kademlias.iter().find(|k| k.root == *next_hop).unwrap();
+                    log::trace!("{hop}/{}: {next_hop}", KNode::get_depth(node, *next_hop));
+                } else {
+                    if node != &hop_kademlia.root {
+                        log::trace!(
+                            "{hop}: empty node returned before end: {} != {}",
+                            node,
+                            hop_kademlia.root
+                        );
+                        missing += 1;
+                        // log::info!("{}", hop_kademlia);
+                        // panic!();
+                        break;
+                    }
+                    log::trace!("{hop}: found");
+                    hops_stat.push(hop);
+                    break;
+                }
+                if max_hops - 1 == hop {
+                    log::trace!(
+                        "Run {run}: Didn't find destination for this node in {max_hops} hops"
+                    );
+                    missing += 1;
+                    // panic!();
+                }
+            }
+        }
+        log::debug!(
+            "Stats for {}: missing, route-length\n{missing} - {:?}",
+            config.k,
+            hops_stat.iter().counts_by(|u| u).iter().sorted()
+        );
+
+        missing
+    }
+
+    fn kademlia_bucket(kademlia: &Kademlia, depth: usize, active: usize, cache: usize) {
+        let bucket = kademlia
+            .buckets
+            .get(depth)
+            .expect(&format!("Bucket with depth {depth} doesn't exist"));
+        assert_eq!(
+            active,
+            bucket.active.len(),
+            "{} active instead of {active}",
+            bucket.active.len()
+        );
+        assert_eq!(
+            cache,
+            bucket.cache.len(),
+            "{} cache instead of {cache}",
+            bucket.cache.len()
+        );
+    }
+
+    #[test]
+    fn test_add_node_activate() {
+        start_logging_filter_level(vec![], LOG_LVL);
+
+        let root = NodeID::rnd();
+        let mut kademlia = Kademlia::new(root, CONFIG);
+
+        // Create some nodes
+        kademlia_add_nodes_cache(&mut kademlia, 2, 2 * CONFIG.k);
+        kademlia_add_nodes_cache(&mut kademlia, 3, 2 * CONFIG.k);
+        kademlia_test_cache(&kademlia, 3, 0, 2 * CONFIG.k);
+        let ticks = tick_len(&mut kademlia, 4 * CONFIG.k, 0);
+
+        // Ping some of the nodes
+        for id in &ticks.ping[0..2] {
+            kademlia.node_active(id);
+        }
+        for id in &ticks.ping[6..8] {
+            kademlia.node_active(id);
+        }
+        kademlia_test_cache(&kademlia, 3, CONFIG.k, CONFIG.k);
+        kademlia_bucket(&kademlia, 2, CONFIG.k, CONFIG.k);
+
+        // Ping rest of nodes
+        for id in &ticks.ping[2..6] {
+            kademlia.node_active(id);
+        }
+        kademlia_test_cache(&kademlia, 3, 2 * CONFIG.k, 0);
+        kademlia_bucket(&kademlia, 2, CONFIG.k, CONFIG.k);
+
+        tick_len(&mut kademlia, 0, 0);
+        log::info!("{kademlia}");
+        tick_len(&mut kademlia, 3 * CONFIG.k, 0);
+    }
+}
diff --git a/flmodules/src/dht_router/messages.rs b/flmodules/src/dht_router/messages.rs
new file mode 100644
index 00000000..d69211e0
--- /dev/null
+++ b/flmodules/src/dht_router/messages.rs
@@ -0,0 +1,311 @@
+use flarch::{
+    broker::{SubsystemHandler, TranslateFrom, TranslateInto},
+    nodeids::{NodeID, U256},
+    platform_async_trait,
+};
+use rand::seq::SliceRandom;
+use serde::{Deserialize, Serialize};
+use tokio::sync::watch;
+
+use crate::{
+    nodeconfig::NodeInfo,
+    router::messages::{NetworkWrapper, RouterIn, RouterOut},
+    timer::TimerMessage,
+};
+
+use super::{
+    broker::{DHTRouterIn, DHTRouterOut, MODULE_NAME},
+    kademlia::*,
+};
+
+/// These are the messages which will be exchanged between the nodes for this
+/// module.
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum ModuleMessage {
+    Ping,
+    Pong,
+    /// A broadcast message to all connected nodes.
+    /// Carries the originator of the broadcast message.
+    Broadcast(NodeID, NetworkWrapper),
+    /// Sends the message to the closest node and emits messages
+    /// on the path.
+    Closest(NodeID, U256, NetworkWrapper),
+    /// Sends the message to a specific node, using Kademlia routing.
+    /// No messages are emitted during routing.
+    Direct(NodeID, NodeID, NetworkWrapper),
+}
+
+/// The messages here represent all possible interactions with this module.
+#[derive(Debug, Clone)]
+pub(super) enum InternIn {
+    DHTRouter(DHTRouterIn),
+    Network(RouterOut),
+    Tick,
+}
+
+#[derive(Debug, Clone)]
+pub(super) enum InternOut {
+    DHTRouter(DHTRouterOut),
+    Network(RouterIn),
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Stats {
+    pub nodes: Vec<NodeID>,
+    pub active: usize,
+}
+
+/// The message handling part, but only for DHTRouter messages.
+#[derive(Debug)]
+pub(super) struct Messages {
+    core: Kademlia,
+    tx: Option<watch::Sender<Stats>>,
+}
+
+impl Messages {
+    /// Returns a new routing module.
+    pub(super) fn new(root: NodeID, cfg: Config) -> (Self, watch::Receiver<Stats>) {
+        let (tx, rx) = watch::channel(Stats::default());
+        (
+            Self {
+                core: Kademlia::new(root, cfg),
+                tx: Some(tx),
+            },
+            rx,
+        )
+    }
+
+    // Processes a node to node message and returns zero or more
+    // MessageOut.
+    fn process_node_message(&mut self, from: NodeID, msg: NetworkWrapper) -> Vec<InternOut> {
+        let mut out = match msg.unwrap_yaml(MODULE_NAME) {
+            Some(msg) => match msg {
+                ModuleMessage::Ping => vec![(ModuleMessage::Pong).wrapper_network(from)],
+                ModuleMessage::Pong => vec![],
+                ModuleMessage::Closest(orig, key, msg) => {
+                    self.message_closest(orig, from, key, msg)
+                }
+                ModuleMessage::Direct(orig, dst, msg) => self.message_direct(orig, from, dst, msg),
+                ModuleMessage::Broadcast(u256, network_wrapper) => {
+                    vec![DHTRouterOut::MessageBroadcast(u256, network_wrapper).into()]
+                }
+            },
+            None => vec![],
+        };
+        if self.core.node_active(&from) {
+            out.push(InternOut::DHTRouter(DHTRouterOut::NodeList(
+                self.core.active_nodes(),
+            )));
+        }
+        out
+    }
+
+    // Stores the new node list, excluding the ID of this node.
+    fn node_list(&mut self, infos: Vec<NodeInfo>) -> Vec<InternOut> {
+        self.core
+            .add_nodes(infos.iter().map(|i| i.get_id()).collect());
+        vec![InternOut::DHTRouter(DHTRouterOut::NodeList(
+            self.core.active_nodes(),
+        ))]
+    }
+
+    // One second passes - and return messages for nodes to ping.
+    fn tick(&mut self) -> Vec<InternOut> {
+        self.core
+            .tick()
+            .ping
+            .iter()
+            .map(|&id| ModuleMessage::Ping.wrapper_network(id))
+            .collect()
+    }
+
+    fn new_closest(&self, key: U256, msg: NetworkWrapper) -> Vec<InternOut> {
+        if let Some(&next_hop) = self.core.route_closest(&key, None).first() {
+            vec![ModuleMessage::Closest(self.core.root, key, msg.clone()).wrapper_network(next_hop)]
+        } else {
+            log::warn!("Couldn't send new request because no closer nodes found!");
+            vec![]
+        }
+    }
+
+    fn new_direct(&self, dst: NodeID, msg: NetworkWrapper) -> Vec<InternOut> {
+        if let Some(&next_hop) = self.core.route_closest(&dst, None).first() {
+            vec![ModuleMessage::Direct(self.core.root, dst, msg.clone()).wrapper_network(next_hop)]
+        } else {
+            log::warn!("Couldn't send new request because direct node not found!");
+            vec![]
+        }
+    }
+
+    fn message_closest(
+        &self,
+        orig: NodeID,
+        last_hop: NodeID,
+        key: U256,
+        msg: NetworkWrapper,
+    ) -> Vec<InternOut> {
+        match self.core.route_closest(&key, Some(&last_hop)).first() {
+            Some(&next_hop) => vec![
+                ModuleMessage::Closest(orig, key, msg.clone()).wrapper_network(next_hop),
+                DHTRouterOut::MessageRouting(orig, last_hop, next_hop, key, msg).into(),
+            ],
+            None => {
+                if key == self.core.root {
+                    vec![DHTRouterOut::MessageDest(orig, last_hop, msg).into()]
+                } else {
+                    vec![DHTRouterOut::MessageClosest(orig, last_hop, key, msg).into()]
+                }
+            }
+        }
+    }
+
+    fn message_direct(
+        &self,
+        orig: NodeID,
+        last: NodeID,
+        dst: NodeID,
+        msg: NetworkWrapper,
+    ) -> Vec<InternOut> {
+        if dst == self.core.root {
+            return vec![DHTRouterOut::MessageDest(orig, last, msg).into()];
+        }
+        let next_hops = self.core.route_direct(&dst);
+        next_hops
+            .choose(&mut rand::thread_rng())
+            .map(|next_hop| vec![ModuleMessage::Direct(orig, dst, msg).wrapper_network(*next_hop)])
+            .unwrap_or(vec![])
+    }
+
+    fn update_stats(&mut self) {
+        self.tx.clone().map(|tx| {
+            tx.send(Stats {
+                nodes: self
+                    .core
+                    .active_nodes()
+                    .iter()
+                    .chain(self.core.cache_nodes().iter())
+                    .cloned()
+                    .collect::<Vec<_>>(),
+                active: self.core.active_nodes().len(),
+            })
+                .is_err()
+                .then(|| self.tx = None)
+        });
+    }
+}
+
+#[platform_async_trait()]
+impl SubsystemHandler<InternIn, InternOut> for Messages {
+    async fn messages(&mut self, msgs: Vec<InternIn>) -> Vec<InternOut> {
+        let id = self.core.root.clone();
+        let out = msgs
+            .into_iter()
+            // .inspect(|msg| log::debug!("{_id}: DHTRouterIn: {msg:?}"))
+            .flat_map(|msg| match msg {
+                InternIn::Tick => self.tick(),
+                InternIn::DHTRouter(DHTRouterIn::MessageBroadcast(msg)) => self
+                    .core
+                    .active_nodes()
+                    .iter()
+                    .map(|dst| {
+                        ModuleMessage::Broadcast(id, msg.clone()).wrapper_network(dst.clone())
+                    })
+                    .collect(),
+                InternIn::DHTRouter(DHTRouterIn::MessageClosest(key, msg)) => {
+                    self.new_closest(key, msg)
+                }
+                InternIn::DHTRouter(DHTRouterIn::MessageDirect(key, msg)) => {
+                    self.new_direct(key, msg)
+                }
+                InternIn::Network(from_router) => match from_router {
+                    RouterOut::NodeInfoAvailable(node_infos) => self.node_list(node_infos),
+                    RouterOut::NetworkWrapperFromNetwork(from, network_wrapper) => {
+                        self.process_node_message(from, network_wrapper)
+                    }
+                    _ => vec![],
+                },
+            })
+            // .inspect(|msg| log::debug!("{id}: Out: {msg:?}"))
+            .collect();
+        self.update_stats();
+        out
+    }
+}
+
+impl ModuleMessage {
+    pub(super) fn wrapper_network(&self, dst: NodeID) -> InternOut {
+        InternOut::Network(RouterIn::NetworkWrapperToNetwork(
+            dst,
+            NetworkWrapper::wrap_yaml(MODULE_NAME, self).unwrap(),
+        ))
+    }
+
+    fn _from_wrapper(msg: NetworkWrapper) -> Option<ModuleMessage> {
+        msg.unwrap_yaml(MODULE_NAME)
+    }
+}
+
+impl From<DHTRouterOut> for InternOut {
+    fn from(value: DHTRouterOut) -> Self {
+        InternOut::DHTRouter(value)
+    }
+}
+
+impl TranslateFrom<TimerMessage> for InternIn {
+    fn translate(msg: TimerMessage) -> Option<Self> {
+        (msg == TimerMessage::Second).then(|| InternIn::Tick)
+    }
+}
+
+impl TranslateInto<TimerMessage> for InternOut {
+    fn translate(self) -> Option<TimerMessage> {
+        None
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{error::Error, str::FromStr};
+
+    use flarch::{nodeids::U256, start_logging_filter_level};
+
+    use super::*;
+
+    const LOG_LVL: log::LevelFilter = log::LevelFilter::Info;
+
+    #[tokio::test]
+    async fn test_depth() -> Result<(), Box<dyn Error>> {
+        start_logging_filter_level(vec![], LOG_LVL);
+
+        let root = U256::from_str("00").unwrap();
+        let node1 = U256::from_str("80").unwrap();
+        let node2 = U256::from_str("81").unwrap();
+        let node3 = U256::from_str("40").unwrap();
+        let node4 = U256::from_str("41").unwrap();
+
+        let infos: Vec<NodeInfo> = [node1, node2, node3, node4]
+            .iter()
+            .map(|&id| NodeInfo::new_from_id(id))
+            .collect();
+
+        let mut msg = Messages::new(
+            root,
+            Config {
+                k: 1,
+                ping_interval: 2,
+                ping_timeout: 4,
+            },
+        );
+
+        let out = msg
+            .0
+            .messages(vec![
+                InternIn::Network(RouterOut::NodeInfoAvailable(infos)),
+                InternIn::Tick,
+            ])
+            .await;
+        assert_eq!(5, out.len());
+
+        Ok(())
+    }
+}
diff --git a/flmodules/src/dht_router/mod.rs b/flmodules/src/dht_router/mod.rs
new file mode 100644
index 00000000..a4c63f54
--- /dev/null
+++ b/flmodules/src/dht_router/mod.rs
@@ -0,0 +1,7 @@
+// The core algorithm of this module
+pub mod kademlia;
+// pub mod core;
+// Messages for this module
+pub mod messages;
+// Integrating with other modules
+pub mod broker;
diff --git a/flmodules/src/dht_storage/README.md b/flmodules/src/dht_storage/README.md
new file mode 100644
index 00000000..74eb1f2f
--- /dev/null
+++ b/flmodules/src/dht_storage/README.md
@@ -0,0 +1,26 @@
+# DHT-Storage
+
+Creates a DHT storage which can hold [Realm]s containing [Flo](../flo/README.md)s.
+A Realm is a configuration of a storage, defining how long it holds the data,
+and what the replication factor for the data is.
+It uses the [dht_router](../dht_router/README.md) module to contact other nodes and 
+exchange data.
+
+## Initialization
+
+Before the DHT-Storage system can be used, it needs to be initialized with a Realm.
+You can find an example of how to set it up in [webpage.rs](../../tests/webpage.rs).
+For instructions how to set it up on the CLI, you can have a look at 
+[fledger](../../../cli/fledger/README.md).
+If you want to use it in the browser, go to [fledg.re](https://web.fledg.re) and follow
+the instructions there.
+
+# Elements
+
+Here is a short overview of the elements of the DHT-Storage.
+For more details, refer to [Flo](../flo/README.md).
+- `Realm` is a configuration for one DHT-storage. Each realm is independant of the others.
+- `Flo` is a Fledger Object and can store any data. Several pre-defined Flos exist, but most
+  usage will be done with the `Blob`.
+- `Badge`, `ACE` and `Rules` refer to control structures for the signatures and the verification,
+  allowing flexible configuration of the access to the `Flo`s.
\ No newline at end of file
diff --git a/flmodules/src/dht_storage/broker.rs b/flmodules/src/dht_storage/broker.rs
new file mode 100644
index 00000000..832d3e8d
--- /dev/null
+++ b/flmodules/src/dht_storage/broker.rs
@@ -0,0 +1,440 @@
+use std::{collections::HashMap, time::Duration};
+
+use async_recursion::async_recursion;
+use flarch::{
+    broker::{Broker, BrokerError},
+    data_storage::DataStorage,
+};
+use flcrypto::{
+    access::{Badge, BadgeID, BadgeSignature, CalcSignature, Condition, Version},
+    signer::{Signature, SignerError, Verifier, KeyPairID},
+};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use thiserror::Error;
+use tokio::{sync::watch, time::timeout};
+
+use crate::{
+    dht_router::broker::BrokerDHTRouter,
+    flo::{
+        crypto::{BadgeCond, Rules, ACE},
+        flo::{Flo, FloError, FloID, FloWrapper, UpdateSign},
+        realm::{GlobalID, RealmID},
+    },
+    timer::Timer,
+};
+use flarch::nodeids::NodeID;
+
+use super::{
+    core::{CoreError, DHTConfig, FloCuckoo},
+    messages::{InternIn, InternOut, Messages, Stats},
+};
+
+pub(super) const MODULE_NAME: &str = "DHTStorage";
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum DHTStorageIn {
+    StoreFlo(Flo),
+    ReadFlo(GlobalID),
+    ReadCuckooIDs(GlobalID),
+    GetRealms,
+    /// Ask all neighbors for their realms and Flos
+    SyncNeighbors,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum DHTStorageOut {
+    FloValue(FloCuckoo),
+    RealmIDs(Vec<RealmID>),
+    CuckooIDs(GlobalID, Vec<FloID>),
+    ValueMissing(GlobalID),
+}
+
+/// This links the DHTStorage module with other modules, so that
+/// all messages are correctly translated from one to the other.
+/// For this example, it uses the RandomConnections module to communicate
+/// with other nodes.
+///
+/// The [DHTStorage] holds the [Translate] and offers convenience methods
+/// to interact with [Translate] and [DHTStorageMessage].
+#[derive(Clone)]
+pub struct DHTStorage {
+    /// Represents the underlying broker.
+    pub broker: Broker<DHTStorageIn, DHTStorageOut>,
+    pub stats: watch::Receiver<Stats>,
+    intern: Broker<InternIn, InternOut>,
+    config: DHTConfig,
+    _our_id: NodeID,
+}
+
+#[derive(Error, Debug)]
+pub enum StorageError {
+    #[error("CoreError({0})")]
+    CoreError(#[from] CoreError),
+    #[error("FloError({0})")]
+    FloError(#[from] FloError),
+    #[error("BrokerError({0})")]
+    BrokerError(#[from] BrokerError),
+    #[error("SignerError({0})")]
+    SignerError(#[from] SignerError),
+    #[error("FloWrapper.rules has no update rule")]
+    UpdateRuleMissing,
+    #[error("Couldn't find a Flo with this ID")]
+    FloNotFound,
+    #[error("Timeout while waiting for response")]
+    TimeoutError,
+    #[error("Coudn't serialize: {0}")]
+    SerdeError(#[from] serde_yaml::Error),
+}
+
+impl DHTStorage {
+    pub async fn start(
+        ds: Box<dyn DataStorage + Send>,
+        our_id: NodeID,
+        config: DHTConfig,
+        dht_router: BrokerDHTRouter,
+        timer: &mut Timer,
+    ) -> Result<Self, StorageError> {
+        let (messages, stats) = Messages::new(ds, config.clone(), our_id.clone());
+        let mut intern = Broker::new();
+        intern.add_handler(Box::new(messages)).await?;
+
+        intern
+            .add_translator_link(
+                dht_router,
+                Box::new(|msg| match msg {
+                    InternOut::Routing(dhtrouting_in) => Some(dhtrouting_in),
+                    _ => None,
+                }),
+                Box::new(|msg| Some(InternIn::Routing(msg))),
+            )
+            .await?;
+
+        let broker = Broker::new();
+        intern
+            .add_translator_direct(
+                broker.clone(),
+                Box::new(|msg| Some(InternIn::Storage(msg))),
+                Box::new(|msg| match msg {
+                    InternOut::Storage(dhtstorage_out) => Some(dhtstorage_out),
+                    _ => None,
+                }),
+            )
+            .await?;
+        timer
+            .tick_minute(
+                intern.clone(),
+                InternIn::Storage(DHTStorageIn::SyncNeighbors),
+            )
+            .await?;
+
+        Ok(DHTStorage {
+            broker,
+            stats,
+            intern,
+            config,
+            _our_id: our_id,
+        })
+    }
+
+    pub fn store_flo(&mut self, flo: Flo) -> Result<(), BrokerError> {
+        self.broker.emit_msg_in(DHTStorageIn::StoreFlo(flo))
+    }
+
+    pub fn propagate(&mut self) -> Result<(), StorageError> {
+        Ok(self.intern.emit_msg_in(InternIn::BroadcastSync)?)
+    }
+
+    pub async fn get_realm_ids(&mut self) -> Result<Vec<RealmID>, StorageError> {
+        self.send_wait(DHTStorageIn::GetRealms, &|msg| match msg {
+            DHTStorageOut::RealmIDs(realms) => Some(realms),
+            _ => None,
+        })
+        .await
+    }
+
+    pub async fn get_flo<T: Serialize + DeserializeOwned + Clone>(
+        &mut self,
+        id: &GlobalID,
+    ) -> Result<FloWrapper<T>, StorageError> {
+        Ok(self
+            .send_wait(DHTStorageIn::ReadFlo(id.clone()), &|msg| match msg {
+                DHTStorageOut::FloValue((flo, _)) => (flo.global_id() == *id).then_some(flo),
+                _ => None,
+            })
+            .await?
+            .try_into()?)
+    }
+
+    pub async fn get_cuckoos(&mut self, id: &GlobalID) -> Result<Vec<FloID>, StorageError> {
+        Ok(self
+            .send_wait(DHTStorageIn::ReadCuckooIDs(id.clone()), &|msg| match msg {
+                DHTStorageOut::CuckooIDs(rid, ids) => (&rid == id).then_some(ids),
+                _ => None,
+            })
+            .await?)
+    }
+
+    pub fn sync(&mut self) -> Result<(), BrokerError> {
+        self.broker.emit_msg_in(DHTStorageIn::SyncNeighbors)
+    }
+
+    pub async fn get_badge_signature<T: Serialize + DeserializeOwned + Clone>(
+        &mut self,
+        fw: &FloWrapper<T>,
+        update: &T,
+    ) -> Result<BadgeSignature, StorageError> {
+        let cond = match fw.rules() {
+            Rules::ACE(version) => self
+                .get_flo::<ACE>(&GlobalID::new(fw.realm_id(), (*version.get_id()).into()))
+                .await?
+                .cache()
+                .update()
+                .ok_or(StorageError::UpdateRuleMissing),
+            Rules::Update(condition) => Ok(condition.clone()),
+            Rules::None => Err(StorageError::UpdateRuleMissing),
+        }?;
+        let msg = fw.hash_update(update).bytes();
+        let badges = self
+            .recurse_condition(&fw.realm_id(), BadgeSig::default(), &cond)
+            .await?;
+        let cs =
+            CalcSignature::from_cond_badges(&cond, badges.badges, badges.signatures, msg.clone())?;
+        Ok(BadgeSignature::from_calc_signature(cs, cond, msg))
+    }
+
+    pub async fn get_update_sign<T: Serialize + DeserializeOwned + Clone>(
+        &mut self,
+        fw: &FloWrapper<T>,
+        update: T,
+        rules: Option<Rules>,
+    ) -> Result<UpdateSign<T>, StorageError> {
+        let bs = self.get_badge_signature(fw, &update).await?;
+        Ok(UpdateSign::new(
+            update,
+            rules.unwrap_or_else(|| fw.rules().clone()),
+            bs,
+        ))
+    }
+
+    async fn send_wait<T>(
+        &mut self,
+        msg_in: DHTStorageIn,
+        check: &(dyn Fn(DHTStorageOut) -> Option<T> + Send + Sync),
+    ) -> Result<T, StorageError> {
+        // using the internal broker directly to avoid one conversion.
+        let dur = Duration::from_millis(self.config.timeout);
+        let (mut tap, tap_id) = self.intern.get_tap_out().await?;
+        self.intern.emit_msg_in(InternIn::Storage(msg_in))?;
+        let res = timeout(dur, async move {
+            while let Some(msg_int) = tap.recv().await {
+                if let InternOut::Storage(msg_out) = msg_int {
+                    if let Some(res) = check(msg_out) {
+                        return Ok(res);
+                    }
+                }
+            }
+            Err(BrokerError::Translation)
+        })
+        .await
+        .map_err(|_| StorageError::TimeoutError);
+        // Need to remove subsystem before checking error.
+        self.intern.remove_subsystem(tap_id).await?;
+        Ok(res??)
+    }
+
+    #[async_recursion(?Send)]
+    async fn recurse_condition(
+        &mut self,
+        realm_id: &RealmID,
+        mut bad_sig: BadgeSig,
+        condition: &Condition,
+    ) -> Result<BadgeSig, StorageError> {
+        match condition {
+            Condition::Verifier(vid) => {
+                bad_sig.signatures.insert(vid.clone(), None);
+            }
+            Condition::Badge(version) => {
+                if bad_sig.badges.contains_key(version) {
+                    log::warn!("Loop in condition");
+                } else {
+                    let cond = self
+                        .get_flo::<BadgeCond>(&GlobalID::new(
+                            realm_id.clone(),
+                            (*version.get_id()).into(),
+                        ))
+                        .await?;
+                    bad_sig
+                        .badges
+                        .insert(version.clone(), cond.badge_cond().clone());
+                }
+            }
+            Condition::NofT(_, vec) => {
+                for v in vec {
+                    bad_sig = self.recurse_condition(realm_id, bad_sig, v).await?;
+                }
+            }
+            Condition::Pass => (),
+        }
+        Ok(bad_sig)
+    }
+}
+
+#[derive(Default, Debug)]
+struct BadgeSig {
+    badges: HashMap<Version<BadgeID>, Condition>,
+    signatures: HashMap<KeyPairID, Option<(Box<dyn Verifier>, Signature)>>,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::error::Error;
+
+    use crate::{
+        dht_router::{broker::DHTRouter, kademlia::Config},
+        dht_storage::core::{Cuckoo, RealmConfig},
+        flo::realm::{FloRealm, Realm},
+        testing::{
+            flo::{FloTesting, Wallet},
+            network_simul::NetworkSimul,
+        },
+        timer::{Timer, TimerMessage},
+    };
+    use flarch::{data_storage::DataStorageTemp, start_logging_filter_level};
+
+    struct SimulStorage {
+        simul: NetworkSimul,
+        tick: Timer,
+        nodes: Vec<DHTStorage>,
+        realm: FloRealm,
+        _wallet: Wallet,
+    }
+
+    impl SimulStorage {
+        async fn new() -> Result<Self, Box<dyn Error>> {
+            let mut wallet = Wallet::new();
+            Ok(Self {
+                simul: NetworkSimul::new().await?,
+                tick: Timer::simul(),
+                nodes: vec![],
+                realm: FloRealm::new(
+                    "root",
+                    wallet.get_badge_rules(),
+                    RealmConfig {
+                        max_space: 1e6 as u64,
+                        max_flo_size: 1e4 as u32,
+                    },
+                )?,
+                _wallet: wallet,
+            })
+        }
+
+        async fn node(&mut self) -> Result<DHTStorage, Box<dyn Error>> {
+            let n = self.simul.new_node().await?;
+            let id = n.config.info.get_id();
+            let dht_router =
+                DHTRouter::start(id, n.router, &mut self.tick, Config::default()).await?;
+            let n_s = DHTStorage::start(
+                Box::new(DataStorageTemp::new()),
+                n.config.info.get_id(),
+                DHTConfig::default(),
+                dht_router.broker.clone(),
+                &mut self.tick,
+            )
+            .await?;
+            self.nodes.push(n_s.clone());
+            self.simul.send_node_info().await?;
+            self.tick.broker.emit_msg_out(TimerMessage::Second)?;
+            Ok(n_s)
+        }
+
+        async fn settle_all(&mut self) {
+            for n in &mut self.nodes {
+                n.broker.settle(vec![]).await.expect("Settling node broker");
+            }
+            self.simul.settle().await.expect("Settling simul broker");
+        }
+
+        async fn sync_all(&mut self) -> Result<(), Box<dyn Error>> {
+            for n in &mut self.nodes {
+                n.sync()?;
+            }
+            self.settle_all().await;
+            Ok(())
+        }
+    }
+
+    #[tokio::test]
+    async fn test_storage_propagation() -> Result<(), Box<dyn Error>> {
+        start_logging_filter_level(vec!["flmodules"], log::LevelFilter::Info);
+
+        let mut router = SimulStorage::new().await?;
+        let mut ds_0 = router.node().await?;
+        let mut ds_1 = router.node().await?;
+        router.simul.send_node_info().await?;
+
+        // Testing copy of flo in other node(s) when they are present during
+        // the storage operation.
+        ds_0.store_flo(router.realm.clone().into())?;
+        router.sync_all().await?;
+        assert!(ds_0
+            .get_flo::<Realm>(&router.realm.global_id())
+            .await
+            .is_ok());
+        assert!(ds_1
+            .get_flo::<Realm>(&router.realm.global_id())
+            .await
+            .is_ok());
+
+        // Testing copy of flo in other node(s) who join later.
+        log::info!("Copying realm to new nodes");
+        let mut ds_2 = router.node().await?;
+
+        router.simul.send_node_info().await?;
+        ds_2.sync()?;
+        ds_0.broker.settle(vec![]).await?;
+        ds_1.broker.settle(vec![]).await?;
+        ds_2.broker.settle(vec![]).await?;
+        assert!(ds_2
+            .get_flo::<Realm>(&router.realm.global_id())
+            .await
+            .is_ok());
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn test_cuckoo_propagation() -> Result<(), Box<dyn Error>> {
+        start_logging_filter_level(vec!["flmodules::dht_storage"], log::LevelFilter::Info);
+
+        let mut router = SimulStorage::new().await?;
+        let mut ds_0 = router.node().await?;
+        let mut ds_1 = router.node().await?;
+        router.simul.send_node_info().await?;
+
+        // Testing copy of flo in other node(s) when they are present during
+        // the storage operation.
+        ds_0.store_flo(router.realm.clone().into())?;
+        router.sync_all().await?;
+
+        let t0 = FloTesting::new_cuckoo(router.realm.realm_id(), "test0", Cuckoo::Duration(100000));
+        let t1 = FloTesting::new_cuckoo(
+            router.realm.realm_id(),
+            "test1",
+            Cuckoo::Parent(t0.flo_id()),
+        );
+
+        ds_0.store_flo(t0.flo().clone())?;
+        ds_0.store_flo(t1.flo().clone())?;
+        router.settle_all().await;
+
+        log::info!("Cuckoo in ds_0");
+        assert_eq!(1, ds_0.get_cuckoos(&t0.global_id()).await?.len());
+        router.settle_all().await;
+
+        log::info!("Cuckoo in ds_1");
+        router.sync_all().await?;
+        assert_eq!(1, ds_1.get_cuckoos(&t0.global_id()).await?.len());
+
+        Ok(())
+    }
+}
diff --git a/flmodules/src/dht_storage/core.rs b/flmodules/src/dht_storage/core.rs
new file mode 100644
index 00000000..16c09cee
--- /dev/null
+++ b/flmodules/src/dht_storage/core.rs
@@ -0,0 +1,514 @@
+use std::collections::HashMap;
+
+use flmacro::VersionedSerde;
+use itertools::Itertools;
+use serde::{Deserialize, Serialize};
+
+use flarch::{
+    nodeids::{NodeID, U256},
+    tasks::now,
+};
+use flcrypto::tofrombytes::ToFromBytes;
+use thiserror::Error;
+
+use crate::{
+    dht_router::kademlia::KNode,
+    flo::{
+        flo::{Flo, FloID},
+        realm::{FloRealm, RealmID},
+    },
+};
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub struct RealmConfig {
+    /// 16 exa bytes should be enough for everybody
+    pub max_space: u64,
+    pub max_flo_size: u32,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub struct FloMeta {
+    pub id: FloID,
+    pub cuckoos: u32,
+    pub version: u32,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub struct DHTConfig {
+    // Realms allowed in this instance. If the Vec is empty, all new realms are
+    // allowed.
+    pub realms: Vec<RealmID>,
+    // Flos owned by this instance, which will not be removed.
+    pub owned: Vec<FloID>,
+    // How long the get_ methods will wait before returning a timeout.
+    pub timeout: u64,
+}
+
+impl Default for DHTConfig {
+    fn default() -> Self {
+        Self {
+            realms: vec![],
+            owned: vec![],
+            timeout: 1000,
+        }
+    }
+}
+
+pub type FloCuckoo = (Flo, Vec<FloID>);
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
+pub struct FloConfig {
+    // Linking a Flo to a foreign flo - how long and to whom it links.
+    pub cuckoo: Cuckoo,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub enum Cuckoo {
+    Duration(u32),
+    Parent(FloID),
+    None,
+}
+
+impl Default for Cuckoo {
+    fn default() -> Self {
+        Cuckoo::None
+    }
+}
+
+/// The DHTStorageCore structure holds a configuration and the storage
+/// needed to persist over reloads of the node.
+#[derive(VersionedSerde, Debug, Clone, PartialEq)]
+pub struct RealmStorage {
+    dht_config: DHTConfig,
+    realm_config: RealmConfig,
+    realm_id: RealmID,
+    root: U256,
+    flos: HashMap<FloID, FloStorage>,
+    distances: HashMap<usize, Vec<FloID>>,
+    size: usize,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+struct FloStorage {
+    flo: Flo,
+    cuckoos: Vec<FloID>,
+    time_create: i64,
+    time_update: i64,
+    time_read: i64,
+    reads: i64,
+}
+
+#[derive(Error, Debug)]
+pub enum CoreError {
+    #[error("No Flo with a domain stored")]
+    DomainMissing,
+    #[error("Domain without history")]
+    DomainNoHistory,
+    #[error("Domain is not a root domain")]
+    DomainNotRoot,
+    #[error("This realm is not accepted")]
+    RealmNotAccepted,
+}
+
+impl RealmStorage {
+    pub fn new(dht_config: DHTConfig, root: NodeID, realm: FloRealm) -> Result<Self, CoreError> {
+        let realm_config = realm.cache().get_config();
+        let realm_id = realm.flo().realm_id();
+        let mut s = Self {
+            dht_config,
+            realm_config,
+            realm_id,
+            root,
+            flos: HashMap::new(),
+            distances: HashMap::new(),
+            size: 0,
+        };
+        s.put(realm.flo().clone());
+        Ok(s)
+    }
+
+    pub fn get_flo_cuckoo(&self, id: &FloID) -> Option<FloCuckoo> {
+        self.flos
+            .get(id)
+            .map(|fs| (fs.flo.clone(), fs.cuckoos.clone()))
+    }
+
+    pub fn get_cuckoo_ids(&self, key: &FloID) -> Option<Vec<FloID>> {
+        self.flos
+            .get(key)
+            .map(|dbs| dbs.cuckoos.iter().cloned().collect())
+    }
+
+    pub fn get_flo_metas(&self) -> Vec<FloMeta> {
+        self.flos
+            .values()
+            .map(|df| FloMeta {
+                id: df.flo.flo_id(),
+                version: df.version(),
+                cuckoos: df.cuckoos.len() as u32,
+            })
+            .collect()
+    }
+
+    pub fn store_cuckoo_id(&mut self, parent: &FloID, cuckoo: FloID) {
+        self.flos
+            .get_mut(parent)
+            .map(|fs| (!fs.cuckoos.contains(&cuckoo)).then(|| fs.cuckoos.push(cuckoo)));
+    }
+
+    /// TODO: decide which IDs need to be stored.
+    pub fn sync_available(&self, available: &Vec<FloMeta>) -> Option<Vec<FloID>> {
+        let a: Vec<_> = available
+            .iter()
+            // This is actually correct, but perhaps not readable enough...
+            .filter_map(|remote| {
+                (self.flos.get(&remote.id).map(|local| {
+                    local.flo.version() >= remote.version
+                        && local.cuckoos.len() as u32 >= remote.cuckoos
+                }) != Some(true))
+                .then(|| remote.id.clone())
+            })
+            .collect();
+        (a.len() > 0).then(|| a)
+    }
+
+    pub fn upsert_flo(&mut self, flo: Flo) -> bool {
+        if flo.size() as u64 * 3 > self.realm_config.max_space {
+            log::debug!(
+                "Cannot store flo of size {} > max_space({}) / 3",
+                flo.size(),
+                self.realm_config.max_space
+            );
+            return false;
+        }
+
+        let mut updated = false;
+        let flo_id = flo.flo_id();
+        flo.flo_config()
+            .cuckoo_parent()
+            .map(|pid| self.store_cuckoo_id(pid, flo_id.clone()));
+
+        if let Some(old) = self.flos.get(&flo.flo_id()) {
+            if old.version() < flo.version() {
+                self.put(flo);
+                updated = true;
+            }
+        } else {
+            self.put(flo);
+            updated = true;
+        }
+
+        while self.size as u64 > self.realm_config.max_space {
+            self.remove_furthest(&flo_id);
+        }
+        updated
+    }
+
+    // pub fn upsert_flo_cuckoo(&mut self, fc: FloCuckoo) -> bool {
+    //     let fid = fc.0.flo_id();
+    //     let updated = self.upsert_flo(fc.0);
+    //     fc.1.into_iter()
+    //         .for_each(|id| self.store_cuckoo_id(&fid, id));
+    //     updated
+    // }
+
+    fn put(&mut self, flo: Flo) {
+        let id = flo.flo_id();
+        // log::trace!(
+        //     "{} Storing {}/{}/{}",
+        //     self.root,
+        //     id,
+        //     flo.version(),
+        //     flo.flo_type()
+        // );
+        self.remove_entry(&id);
+        let depth = KNode::get_depth(&self.root, *id);
+        self.distances
+            .entry(depth)
+            .or_insert_with(Vec::new)
+            .push(id.clone());
+        let df: FloStorage = flo.into();
+        self.size += df.size();
+        self.flos.insert(id, df);
+    }
+
+    fn remove_entry(&mut self, id: &FloID) {
+        if let Some(df) = self.flos.remove(id) {
+            let distance = KNode::get_depth(&self.root, **id);
+            self.distances
+                .entry(distance)
+                .and_modify(|v| v.retain(|i| i != id));
+            self.size -= df.size();
+        }
+    }
+
+    fn remove_furthest(&mut self, not_delete: &FloID) {
+        if let Some(furthest) = self
+            .distances
+            .iter()
+            .filter_map(|(dist, flos)| {
+                if flos.contains(not_delete) {
+                    flos.len() > 1
+                } else {
+                    flos.len() > 0
+                }
+                .then(|| dist)
+            })
+            .sorted()
+            .unique()
+            .next()
+        {
+            if let Some(id) = self
+                .distances
+                .get(furthest)
+                .and_then(|ids| {
+                    ids.iter()
+                        .filter(|&id| id != not_delete)
+                        .collect::<Vec<&FloID>>()
+                        .first()
+                        .cloned()
+                })
+                .cloned()
+            {
+                log::trace!(
+                    "{}: Removing furthest {id}/{}",
+                    self.root,
+                    KNode::get_depth(&self.root, *id.clone())
+                );
+
+                self.remove_entry(&id);
+            }
+        }
+    }
+}
+
+impl From<Flo> for FloStorage {
+    fn from(flo: Flo) -> Self {
+        Self {
+            flo,
+            cuckoos: vec![],
+            time_create: now(),
+            time_update: 0,
+            time_read: 0,
+            reads: 0,
+        }
+    }
+}
+
+impl FloStorage {
+    fn version(&self) -> u32 {
+        self.flo.version()
+    }
+}
+
+impl DHTConfig {
+    pub fn accepts_realm(&self, id: &RealmID) -> bool {
+        self.realms.len() == 0 || self.realms.contains(id)
+    }
+}
+
+impl FloConfig {
+    pub fn allows_cuckoo(&self, age: u32) -> bool {
+        match self.cuckoo {
+            Cuckoo::Duration(t) => age < t,
+            _ => false,
+        }
+    }
+
+    pub fn is_cuckoo_of(&self, parent: &FloID) -> bool {
+        match &self.cuckoo {
+            Cuckoo::Parent(flo_id) => flo_id == parent,
+            _ => false,
+        }
+    }
+
+    pub fn cuckoo_parent(&self) -> Option<&FloID> {
+        match &self.cuckoo {
+            Cuckoo::Parent(flo_id) => Some(flo_id),
+            _ => None,
+        }
+    }
+}
+
+/// Here you must write the necessary unit-tests to make sure that your core algorithms
+/// work the way you want them to.
+#[cfg(test)]
+mod tests {
+    use std::{error::Error, str::FromStr};
+
+    use flarch::start_logging_filter_level;
+    use flcrypto::access::Condition;
+
+    use crate::flo::{
+        blob::{Blob, FloBlob},
+        crypto::Rules,
+    };
+
+    use super::*;
+
+    // use crate::flo::testing::{new_ace, new_dht_flo_depth};
+    // use flcrypto::access::Version;
+
+    #[test]
+    fn test_cuckoo() -> Result<(), Box<dyn Error>> {
+        let root = U256::from_str("00").unwrap();
+        let fr = FloRealm::new(
+            "root",
+            crate::flo::crypto::Rules::None,
+            RealmConfig {
+                max_space: 1000000,
+                max_flo_size: 1000,
+            },
+        )?;
+        let rid = fr.realm_id();
+        let mut storage = RealmStorage::new(DHTConfig::default(), root.into(), fr.clone())?;
+
+        let data = &("".to_string());
+        let fp = Flo::new(rid.clone(), Rules::None, data, FloConfig::default())?;
+        let fp_cuckoo = Flo::new(
+            rid.clone(),
+            Rules::None,
+            data,
+            FloConfig {
+                cuckoo: Cuckoo::Parent(fp.flo_id()),
+            },
+        )?;
+        storage.put(fp.clone().into());
+        storage.put(fp_cuckoo.into());
+        assert!(storage.get_cuckoo_ids(&fp.flo_id()).is_some());
+
+        Ok(())
+    }
+
+    fn get_flo_depth(root: &NodeID, rid: &RealmID, depth: usize) -> Flo {
+        loop {
+            let flo =
+                Flo::new(rid.clone(), Rules::None, &U256::rnd(), FloConfig::default()).unwrap();
+            let nd = KNode::get_depth(root, *flo.flo_id());
+            if nd == depth {
+                return flo;
+            }
+        }
+    }
+
+    #[test]
+    fn test_furthest() -> Result<(), Box<dyn Error>> {
+        start_logging_filter_level(vec![], log::LevelFilter::Info);
+        let root = U256::from_str("00").unwrap();
+        let realm = FloRealm::new(
+            "name",
+            Rules::None,
+            RealmConfig {
+                max_space: 1e6 as u64,
+                max_flo_size: 1e6 as u32,
+            },
+        )?;
+        let rid = realm.realm_id();
+        let mut storage = RealmStorage::new(DHTConfig::default(), root, realm)?;
+        let _flos1: Vec<Flo> = (1..=3)
+            .map(|i| get_flo_depth(&root, &rid, i))
+            .inspect(|flo| storage.put(flo.clone()))
+            .collect();
+
+        assert_eq!(4, storage.distances.len());
+        assert_eq!(4, storage.flos.len());
+        let size = storage.size;
+
+        let _flos2: Vec<Flo> = (1..=3)
+            .map(|i| get_flo_depth(&root, &rid, i))
+            .inspect(|flo| storage.put(flo.clone()))
+            .collect();
+
+        assert_eq!(4, storage.distances.len());
+        assert_eq!(1, storage.distances.get(&0).unwrap().len());
+        assert_eq!(2, storage.distances.get(&1).unwrap().len());
+        assert_eq!(2, storage.distances.get(&2).unwrap().len());
+        assert_eq!(2, storage.distances.get(&3).unwrap().len());
+        assert_eq!(7, storage.flos.len());
+        assert!(storage.size > size);
+        let size = storage.size;
+
+        storage.remove_furthest(&root.into());
+        assert_eq!(4, storage.distances.len());
+        assert_eq!(0, storage.distances.get(&0).unwrap().len());
+        assert_eq!(2, storage.distances.get(&1).unwrap().len());
+        assert_eq!(2, storage.distances.get(&2).unwrap().len());
+        assert_eq!(2, storage.distances.get(&3).unwrap().len());
+        assert_eq!(6, storage.flos.len());
+        assert!(storage.size < size);
+        let size = storage.size;
+
+        storage.remove_furthest(&root.into());
+        assert_eq!(4, storage.distances.len());
+        assert_eq!(0, storage.distances.get(&0).unwrap().len());
+        assert_eq!(1, storage.distances.get(&1).unwrap().len());
+        assert_eq!(2, storage.distances.get(&2).unwrap().len());
+        assert_eq!(2, storage.distances.get(&3).unwrap().len());
+        assert_eq!(5, storage.flos.len());
+        assert!(storage.size < size);
+
+        storage.remove_furthest(&root.into());
+        assert_eq!(4, storage.distances.len());
+        assert_eq!(0, storage.distances.get(&0).unwrap().len());
+        assert_eq!(0, storage.distances.get(&1).unwrap().len());
+        assert_eq!(2, storage.distances.get(&2).unwrap().len());
+        assert_eq!(2, storage.distances.get(&3).unwrap().len());
+        assert_eq!(4, storage.flos.len());
+        assert!(storage.size < size);
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_update() -> Result<(), Box<dyn Error>> {
+        start_logging_filter_level(vec![], log::LevelFilter::Info);
+
+        let root = U256::from_str("00").unwrap();
+        let realm = FloRealm::new(
+            "name",
+            Rules::None,
+            RealmConfig {
+                max_space: 1e6 as u64,
+                max_flo_size: 1e6 as u32,
+            },
+        )?;
+        let rid = realm.realm_id();
+        let mut storage = RealmStorage::new(DHTConfig::default(), root, realm)?;
+
+        let mut fw = FloBlob::from_type(
+            rid.clone(),
+            Rules::Update(Condition::Pass),
+            Blob::new("test"),
+        )?;
+        storage.put(fw.flo().clone());
+
+        let fid = fw.flo_id();
+        assert_eq!(
+            Some(vec![fid.clone()]),
+            storage.sync_available(&vec![FloMeta {
+                id: fid.clone(),
+                version: 1,
+                cuckoos: 0,
+            }])
+        );
+        fw.edit_sign_update(
+            |b| b.set_path("path"),
+            Condition::Pass,
+            Rules::Update(Condition::Pass),
+            vec![],
+            &[],
+        )?;
+
+        assert!(storage.upsert_flo(fw.into()));
+        assert_eq!(
+            None,
+            storage.sync_available(&vec![FloMeta {
+                id: fid.clone(),
+                version: 1,
+                cuckoos: 0,
+            }])
+        );
+
+        Ok(())
+    }
+}
diff --git a/flmodules/src/dht_storage/messages.rs b/flmodules/src/dht_storage/messages.rs
new file mode 100644
index 00000000..8121d83a
--- /dev/null
+++ b/flmodules/src/dht_storage/messages.rs
@@ -0,0 +1,484 @@
+use std::{collections::HashMap, iter};
+
+use flarch::{
+    broker::SubsystemHandler,
+    data_storage::DataStorage,
+    nodeids::{NodeID, U256},
+    platform_async_trait,
+};
+use flcrypto::tofrombytes::ToFromBytes;
+use serde::{Deserialize, Serialize};
+use tokio::sync::watch;
+
+use crate::{
+    dht_router::broker::{DHTRouterIn, DHTRouterOut},
+    flo::{
+        flo::{Flo, FloID},
+        realm::{FloRealm, GlobalID, RealmID},
+    },
+    router::messages::NetworkWrapper,
+};
+
+use super::{
+    broker::{DHTStorageIn, DHTStorageOut, StorageError, MODULE_NAME},
+    core::*,
+};
+
+/// The messages here represent all possible interactions with this module.
+#[derive(Debug, Clone, PartialEq)]
+pub enum InternIn {
+    Routing(DHTRouterOut),
+    Storage(DHTStorageIn),
+    BroadcastSync,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum InternOut {
+    Routing(DHTRouterIn),
+    Storage(DHTStorageOut),
+}
+
+/// These messages are sent to the closest node given in the DHTRouting message.
+/// Per default, the 'key' value of the DHTRouting will be filled with the FloID.
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum MessageNodeClosest {
+    // Stores the given Flo in the closest node, and all nodes on the route
+    // which have enough place left.
+    StoreFlo(Flo),
+    // Request a Flo. The FloID is in the DHTRouting::Request.
+    ReadFlo(RealmID),
+    // Request Cuckoos for the given ID. The FloID is in the DHTRouting::Request.
+    GetCuckooIDs(RealmID),
+    // Store the Cuckoo-ID in the relevant Flo. The DHTRouting::Request(key) is the
+    // parent Flo, and the given GlobalID is the ID of the Cuckoo and the RealmID of the
+    // parent Flo and the Cuckoo.
+    StoreCuckooID(GlobalID),
+}
+
+/// These messages are sent directly to the requester of the MessageNodeClosest.
+/// As in this case there is no 'key', the IDs need to be transmitted completely.
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum MessageNodeDirect {
+    // Returns the result of the requested Flo, including any available Cuckoo-IDs.
+    FloValue(FloCuckoo),
+    // Indicates this Flo is not in the closest node.
+    UnknownFlo(GlobalID),
+    // The Cuckoo-IDs stored next to the Flo composed of the GlobalID
+    CookooIDs(GlobalID, Vec<FloID>),
+    // The update protocol
+    Update(Sync),
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum MessageBroadcast {
+    // Asks all nodes to sync with the source node.
+    Sync,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum Sync {
+    RequestRealmIDs,
+    RequestFloMetas(RealmID),
+    AvailableRealmIDs(Vec<RealmID>),
+    AvailableFlos(RealmID, Vec<FloMeta>),
+    RequestFlos(RealmID, Vec<FloID>),
+    Flos(Vec<FloCuckoo>),
+}
+
+#[derive(Debug, Default)]
+pub struct Stats {
+    pub realm_sizes: HashMap<RealmID, usize>,
+}
+
+/// The message handling part, but only for DHTStorage messages.
+pub struct Messages {
+    realms: HashMap<RealmID, RealmStorage>,
+    nodes: Vec<NodeID>,
+    config: DHTConfig,
+    our_id: NodeID,
+    ds: Box<dyn DataStorage + Send>,
+    tx: Option<watch::Sender<Stats>>,
+}
+
+impl Messages {
+    /// Returns a new chat module.
+    pub fn new(
+        ds: Box<dyn DataStorage + Send>,
+        config: DHTConfig,
+        our_node: NodeID,
+    ) -> (Self, watch::Receiver<Stats>) {
+        let str = ds.get(MODULE_NAME).unwrap_or("".into());
+        let realms = serde_yaml::from_str(&str).unwrap_or(HashMap::new());
+        let (tx, rx) = watch::channel(Stats::default());
+        (
+            Self {
+                realms,
+                config,
+                our_id: our_node,
+                nodes: vec![],
+                ds,
+                tx: Some(tx),
+            },
+            rx,
+        )
+    }
+
+    fn msg_in_routing(&mut self, msg: DHTRouterOut) -> Vec<InternOut> {
+        match msg {
+            DHTRouterOut::MessageRouting(origin, _last_hop, _next_hop, key, msg) => msg
+                .unwrap_yaml(MODULE_NAME)
+                .map(|mn| self.msg_routing(false, origin, key, mn)),
+            DHTRouterOut::MessageClosest(origin, _last_hop, key, msg) => msg
+                .unwrap_yaml(MODULE_NAME)
+                .map(|mn| self.msg_routing(true, origin, key, mn)),
+            DHTRouterOut::MessageDest(origin, _last_hop, msg) => msg
+                .unwrap_yaml(MODULE_NAME)
+                .map(|mn| self.msg_dest(origin, mn)),
+            DHTRouterOut::NodeList(nodes) => {
+                self.nodes = nodes;
+                None
+            }
+            DHTRouterOut::MessageBroadcast(origin, msg) => msg
+                .unwrap_yaml(MODULE_NAME)
+                .map(|mn| self.msg_broadcast(origin, mn)),
+        }
+        .unwrap_or(vec![])
+    }
+
+    fn msg_in_storage(&mut self, msg: DHTStorageIn) -> Vec<InternOut> {
+        // log::warn!("Storing {msg:?}");
+        match msg {
+            DHTStorageIn::StoreFlo(flo) => self.store_flo(flo),
+            DHTStorageIn::ReadFlo(id) => vec![match self.read_flo(&id) {
+                Some(df) => DHTStorageOut::FloValue(df.clone()).into(),
+                None => MessageNodeClosest::ReadFlo(id.realm_id().clone())
+                    .to_intern_out(id.flo_id().clone().into())
+                    .expect("Creating ReadFlo message"),
+            }],
+            DHTStorageIn::ReadCuckooIDs(id) => {
+                let mut out: Vec<InternOut> = self
+                    .realms
+                    .get(id.realm_id())
+                    .and_then(|realm| realm.get_cuckoo_ids(id.flo_id()))
+                    .map(|cids| vec![DHTStorageOut::CuckooIDs(id.clone(), cids).into()])
+                    .unwrap_or_default();
+                out.push(
+                    MessageNodeClosest::GetCuckooIDs(id.realm_id().clone())
+                        .to_intern_out(id.flo_id().clone().into())
+                        .expect("Creating GetCuckoos"),
+                );
+                out
+            }
+            DHTStorageIn::SyncNeighbors => self
+                .nodes
+                .iter()
+                .flat_map(|n| {
+                    iter::once(Sync::RequestRealmIDs)
+                        .chain(
+                            self.realms
+                                .keys()
+                                .map(|rid| Sync::RequestFloMetas(rid.clone())),
+                        )
+                        .filter_map(|msg| MessageNodeDirect::Update(msg).to_intern_out(*n))
+                        .collect::<Vec<_>>()
+                })
+                .collect(),
+            DHTStorageIn::GetRealms => {
+                vec![DHTStorageOut::RealmIDs(self.realms.keys().cloned().collect()).into()]
+            }
+        }
+    }
+
+    fn msg_routing(
+        &mut self,
+        _closest: bool,
+        origin: NodeID,
+        key: U256,
+        msg: MessageNodeClosest,
+    ) -> Vec<InternOut> {
+        let fid: FloID = key.into();
+        match msg {
+            MessageNodeClosest::StoreFlo(flo) => {
+                return self.store_flo(flo);
+            }
+            MessageNodeClosest::ReadFlo(rid) => {
+                if let Some(fc) = self
+                    .realms
+                    .get(&rid)
+                    .and_then(|realm| realm.get_flo_cuckoo(&fid))
+                {
+                    return MessageNodeDirect::FloValue(fc)
+                        .to_intern_out(origin)
+                        .map_or(vec![], |msg| vec![msg]);
+                }
+            }
+            MessageNodeClosest::GetCuckooIDs(rid) => {
+                let parent = GlobalID::new(rid.clone(), fid.clone());
+                return self
+                    .realms
+                    .get(&rid)
+                    .and_then(|realm| realm.get_cuckoo_ids(&fid))
+                    .map_or(vec![], |ids| {
+                        MessageNodeDirect::CookooIDs(parent, ids)
+                            .to_intern_out(origin)
+                            .map_or(vec![], |msg| vec![msg])
+                    });
+            }
+            MessageNodeClosest::StoreCuckooID(gid) => {
+                self.realms
+                    .get_mut(&gid.realm_id())
+                    .map(|realm| realm.store_cuckoo_id(&fid, gid.flo_id().clone()));
+            }
+        }
+        vec![]
+    }
+
+    fn msg_dest(&mut self, origin: NodeID, msg: MessageNodeDirect) -> Vec<InternOut> {
+        match msg {
+            MessageNodeDirect::FloValue(flo) => {
+                self.store_flo(flo.0.clone());
+                Some(DHTStorageOut::FloValue(flo).into())
+            }
+            MessageNodeDirect::UnknownFlo(key) => Some(DHTStorageOut::ValueMissing(key).into()),
+            MessageNodeDirect::Update(sync) => return self.msg_sync(origin, sync),
+            MessageNodeDirect::CookooIDs(gid, cids) => {
+                Some(DHTStorageOut::CuckooIDs(gid, cids).into())
+            }
+        }
+        .map_or(vec![], |msg| vec![msg])
+    }
+
+    fn msg_broadcast(&mut self, origin: NodeID, msg: MessageBroadcast) -> Vec<InternOut> {
+        match msg {
+            MessageBroadcast::Sync => iter::once(Sync::RequestRealmIDs)
+                .chain(
+                    self.realms
+                        .keys()
+                        .map(|rid| Sync::RequestFloMetas(rid.clone())),
+                )
+                .filter_map(|msg| MessageNodeDirect::Update(msg).to_intern_out(origin))
+                .collect::<Vec<_>>(),
+        }
+    }
+
+    fn msg_sync(&mut self, origin: NodeID, msg: Sync) -> Vec<InternOut> {
+        // log::debug!("{} syncs {:?}", self.our_id, msg);
+        match msg {
+            Sync::RequestRealmIDs => vec![Sync::AvailableRealmIDs(
+                self.realms.keys().cloned().collect(),
+            )],
+            Sync::RequestFloMetas(realm_id) => self
+                .realms
+                .get(&realm_id)
+                .map(|realm| realm.get_flo_metas())
+                .map_or(vec![], |fm| vec![Sync::AvailableFlos(realm_id, fm)]),
+            Sync::AvailableRealmIDs(realm_ids) => realm_ids
+                .into_iter()
+                .filter(|rid| !self.realms.contains_key(&rid) && self.config.accepts_realm(&rid))
+                .map(|rid| Sync::RequestFlos(rid.clone(), vec![(*rid).into()]))
+                .collect(),
+            Sync::AvailableFlos(realm_id, flo_metas) => self
+                .realms
+                .get(&realm_id)
+                .and_then(|realm| realm.sync_available(&flo_metas))
+                .map_or(vec![], |needed| vec![Sync::RequestFlos(realm_id, needed)]),
+            Sync::RequestFlos(realm_id, flo_ids) => self
+                .realms
+                .get(&realm_id)
+                .map(|realm| {
+                    flo_ids
+                        .iter()
+                        .filter_map(|id| realm.get_flo_cuckoo(id))
+                        .collect::<Vec<_>>()
+                })
+                .map_or(vec![], |flos| vec![Sync::Flos(flos)]),
+            Sync::Flos(flo_cuckoos) => {
+                for (flo, cuckoos) in flo_cuckoos {
+                    self.store_flo(flo.clone());
+                    self.realms.get_mut(&flo.realm_id()).map(|realm| {
+                        cuckoos
+                            .into_iter()
+                            .for_each(|cuckoo| realm.store_cuckoo_id(&flo.flo_id(), cuckoo))
+                    });
+                }
+                vec![]
+            }
+        }
+        .into_iter()
+        .filter_map(|msg| msg.to_intern_out(origin))
+        .collect()
+    }
+
+    fn read_flo(&self, id: &GlobalID) -> Option<FloCuckoo> {
+        self.realms
+            .get(id.realm_id())
+            .and_then(|realm| realm.get_flo_cuckoo(id.flo_id()))
+    }
+
+    fn store_flo(&mut self, flo: Flo) -> Vec<InternOut> {
+        let mut res = vec![];
+        if self.upsert_flo(flo.clone()) {
+            res.extend(vec![MessageNodeClosest::StoreFlo(flo.clone())
+                .to_intern_out(flo.flo_id().into())
+                .expect("Storing new DHT")]);
+        }
+        if let Some(parent) = flo.flo_config().cuckoo_parent() {
+            res.extend(vec![MessageNodeClosest::StoreCuckooID(flo.global_id())
+                .to_intern_out(*parent.clone())
+                .expect("Storing new Cuckoo")])
+        }
+        res
+    }
+
+    // Try really hard to store the flo.
+    // Either its realm is already known, or it is a new realm.
+    // When 'true' is returned, then the flo has been stored.
+    fn upsert_flo(&mut self, flo: Flo) -> bool {
+        // log::trace!("{} store_flo {flo:?}", self.our_id);
+        let modification = self
+            .realms
+            .get_mut(&flo.realm_id())
+            .map(|dsc| dsc.upsert_flo(flo.clone()))
+            .unwrap_or_else(|| {
+                TryInto::<FloRealm>::try_into(flo)
+                    .ok()
+                    .and_then(|realm| self.create_realm(realm).ok())
+                    .is_some()
+            });
+
+        if modification {
+            self.store();
+        }
+        modification
+    }
+
+    fn create_realm(&mut self, realm: FloRealm) -> Result<(), CoreError> {
+        log::debug!("{} creating realm {}", self.our_id, realm.realm_id());
+        if !self.config.accepts_realm(&realm.realm_id()) {
+            return Err(CoreError::RealmNotAccepted);
+        }
+        let id = realm.flo().realm_id();
+        let dsc = RealmStorage::new(self.config.clone(), self.our_id, realm)?;
+        self.realms.insert(id, dsc);
+        Ok(())
+    }
+
+    fn store(&mut self) {
+        self.tx.clone().map(|tx| {
+            tx.send(Stats::from_realms(&self.realms))
+                .is_err()
+                .then(|| self.tx = None)
+        });
+        serde_yaml::to_string(&self.realms)
+            .ok()
+            .map(|s| (*self.ds).set(MODULE_NAME, &s));
+    }
+}
+
+#[platform_async_trait()]
+impl SubsystemHandler<InternIn, InternOut> for Messages {
+    async fn messages(&mut self, inputs: Vec<InternIn>) -> Vec<InternOut> {
+        let _id = self.our_id;
+        inputs
+            .into_iter()
+            // .inspect(|msg| log::debug!("{_id}: In: {msg:?}"))
+            .flat_map(|msg| match msg {
+                InternIn::Routing(dhtrouting_out) => __self.msg_in_routing(dhtrouting_out),
+                InternIn::Storage(dhtstorage_in) => __self.msg_in_storage(dhtstorage_in),
+                InternIn::BroadcastSync => MessageBroadcast::Sync
+                    .try_into()
+                    .map(|dht| vec![InternOut::Routing(dht)])
+                    .unwrap_or(vec![]),
+            })
+            // .inspect(|msg| log::debug!("{_id}: Out: {msg:?}"))
+            .collect()
+    }
+}
+
+impl Stats {
+    fn from_realms(realms: &HashMap<RealmID, RealmStorage>) -> Self {
+        Self {
+            realm_sizes: realms.iter().map(|(k, v)| (k.clone(), v.size())).collect(),
+        }
+    }
+}
+
+impl MessageNodeClosest {
+    fn to_intern_out(&self, dst: NodeID) -> Option<InternOut> {
+        NetworkWrapper::wrap_yaml(MODULE_NAME, self)
+            .ok()
+            .map(|msg_wrap| InternOut::Routing(DHTRouterIn::MessageClosest(dst, msg_wrap)))
+    }
+}
+
+impl MessageNodeDirect {
+    fn to_intern_out(&self, dst: NodeID) -> Option<InternOut> {
+        NetworkWrapper::wrap_yaml(MODULE_NAME, self)
+            .ok()
+            .map(|msg_wrap| InternOut::Routing(DHTRouterIn::MessageDirect(dst, msg_wrap)))
+    }
+}
+
+impl TryInto<DHTRouterIn> for MessageBroadcast {
+    type Error = StorageError;
+
+    fn try_into(self) -> Result<DHTRouterIn, Self::Error> {
+        Ok(DHTRouterIn::MessageBroadcast(NetworkWrapper::wrap_yaml(
+            MODULE_NAME,
+            &self,
+        )?))
+    }
+}
+
+impl From<DHTStorageOut> for InternOut {
+    fn from(value: DHTStorageOut) -> Self {
+        InternOut::Storage(value)
+    }
+}
+
+impl Sync {
+    fn to_intern_out(self, dst: NodeID) -> Option<InternOut> {
+        (match &self {
+            Sync::AvailableRealmIDs(realm_ids) => realm_ids.len(),
+            Sync::AvailableFlos(_, flo_metas) => flo_metas.len(),
+            Sync::RequestFlos(_, flo_ids) => flo_ids.len(),
+            Sync::Flos(items) => items.len(),
+            _ => 1,
+        } > 0)
+            .then(|| MessageNodeDirect::Update(self).to_intern_out(dst))
+            .flatten()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use flarch::data_storage::DataStorageTemp;
+
+    use crate::testing::flo::Wallet;
+
+    use super::*;
+
+    use std::error::Error;
+
+    #[test]
+    fn test_choice() -> Result<(), Box<dyn Error>> {
+        let our_id = NodeID::rnd();
+        let mut dht = Messages::new(
+            Box::new(DataStorageTemp::new()),
+            DHTConfig::default(),
+            our_id,
+        )
+        .0;
+
+        let mut wallet = Wallet::new();
+        let realm = wallet.get_realm();
+        dht.msg_in_storage(DHTStorageIn::StoreFlo(realm.flo().clone()));
+        let out = dht.msg_in_storage(DHTStorageIn::ReadFlo(realm.global_id()));
+        assert_eq!(1, out.len());
+        assert_eq!(
+            *out.get(0).unwrap(),
+            InternOut::Storage(DHTStorageOut::FloValue((realm.flo().clone(), vec![])))
+        );
+        Ok(())
+    }
+}
diff --git a/flmodules/src/dht_storage/mod.rs b/flmodules/src/dht_storage/mod.rs
new file mode 100644
index 00000000..1f86bcbb
--- /dev/null
+++ b/flmodules/src/dht_storage/mod.rs
@@ -0,0 +1,8 @@
+// The core algorithm of this module
+pub mod core;
+// Messages for this module
+pub mod messages;
+// Integrating with other modules
+pub mod broker;
+// Easy interaction with dht_storage and realms
+pub mod realm_view;
\ No newline at end of file
diff --git a/flmodules/src/dht_storage/realm_view.rs b/flmodules/src/dht_storage/realm_view.rs
new file mode 100644
index 00000000..4f5454a7
--- /dev/null
+++ b/flmodules/src/dht_storage/realm_view.rs
@@ -0,0 +1,242 @@
+use crate::{
+    dht_storage::{
+        broker::DHTStorage,
+        core::{Cuckoo, RealmConfig},
+    },
+    flo::{
+        blob::{BlobID, FloBlobPage, FloBlobTag},
+        crypto::Rules,
+        flo::{FloError, FloID, FloWrapper},
+        realm::{FloRealm, GlobalID, Realm, RealmID},
+    },
+};
+use bytes::Bytes;
+use flarch::broker::BrokerError;
+use flcrypto::signer::{Signer, SignerError};
+use serde::{de::DeserializeOwned, Serialize};
+use thiserror::Error;
+
+use super::broker::StorageError;
+
+pub struct RealmView {
+    dht_storage: DHTStorage,
+    pub realm: FloRealm,
+    pub pages: Vec<FloBlobPage>,
+    pub tags: Vec<FloBlobTag>,
+}
+
+#[derive(Error, Debug)]
+pub enum RVError {
+    #[error("Didn't find a realm")]
+    NoRealm,
+    #[error("Couldn't find a page")]
+    NoPage,
+    #[error("Couldn't find a tag")]
+    NoTag,
+    #[error("Couldn't find or convert this flo")]
+    NoSuchFlo,
+    #[error("BrokerError({0})")]
+    BrokerError(#[from] BrokerError),
+    #[error("FloError({0})")]
+    FloError(#[from] FloError),
+    #[error("StorageError({0})")]
+    StorageError(#[from] StorageError),
+    #[error("SignerError({0})")]
+    SignerError(#[from] SignerError),
+}
+
+impl RealmView {
+    pub async fn new(mut dht_storage: DHTStorage) -> Result<Self, RVError> {
+        if let Some(id) = dht_storage.get_realm_ids().await?.first() {
+            Self::new_from_id(dht_storage, id.clone()).await
+        } else {
+            Err(RVError::NoRealm)
+        }
+    }
+
+    pub async fn new_from_id(mut dht_storage: DHTStorage, id: RealmID) -> Result<Self, RVError> {
+        let realm = Self::get_realm(&mut dht_storage, &id).await?;
+        Self::new_from_realm(dht_storage, realm).await
+    }
+
+    pub async fn new_from_realm(dht_storage: DHTStorage, realm: FloRealm) -> Result<Self, RVError> {
+        let mut rv = Self {
+            realm,
+            pages: vec![],
+            tags: vec![],
+            dht_storage,
+        };
+        rv.get_realm_page().await?;
+        rv.get_realm_tag().await?;
+        Ok(rv)
+    }
+
+    pub async fn new_create_realm(
+        dht_storage: DHTStorage,
+        name: &str,
+        rules: Rules,
+    ) -> Result<Self, RVError> {
+        Self::new_create_realm_config(
+            dht_storage,
+            name,
+            rules,
+            RealmConfig {
+                max_space: 1e6 as u64,
+                max_flo_size: 1e4 as u32,
+            },
+        )
+        .await
+    }
+
+    pub async fn new_create_realm_config(
+        mut dht_storage: DHTStorage,
+        name: &str,
+        rules: Rules,
+        config: RealmConfig,
+    ) -> Result<Self, RVError> {
+        let realm = FloRealm::new(name, rules, config)?;
+        dht_storage.store_flo(realm.clone().into())?;
+        Self::new_from_realm(dht_storage, realm).await
+    }
+
+    pub fn create_http(
+        &mut self,
+        path: &str,
+        content: String,
+        parent: Option<BlobID>,
+        rules: Option<Rules>,
+    ) -> Result<FloBlobPage, RVError> {
+        Self::create_http_cuckoo(self, path, content, parent, rules, Cuckoo::None)
+    }
+
+    pub fn create_http_cuckoo(
+        &mut self,
+        path: &str,
+        content: String,
+        parent: Option<BlobID>,
+        rules: Option<Rules>,
+        cuckoo: Cuckoo,
+    ) -> Result<FloBlobPage, RVError> {
+        let fp = FloBlobPage::new_cuckoo(
+            self.realm.realm_id(),
+            rules.unwrap_or_else(|| self.realm.rules().clone()),
+            path,
+            Bytes::from(content),
+            parent,
+            cuckoo,
+        )?;
+        self.dht_storage.store_flo(fp.clone().into())?;
+        Ok(fp)
+    }
+
+    pub async fn set_realm_http(
+        &mut self,
+        id: FloID,
+        signers: &[&dyn Signer],
+    ) -> Result<(), RVError> {
+        self.set_realm_service("http", id, signers).await
+    }
+
+    pub async fn set_realm_service(
+        &mut self,
+        name: &str,
+        id: FloID,
+        signers: &[&dyn Signer],
+    ) -> Result<(), RVError> {
+        let update = self.realm.edit(|r| r.set_service(name, id));
+        let mut u_s = self
+            .dht_storage
+            .get_update_sign(&self.realm, update, None)
+            .await?;
+        for &signer in signers {
+            u_s.sign(signer)?;
+        }
+        self.realm.apply_update(u_s)?;
+        Ok(self.dht_storage.store_flo(self.realm.clone().into())?)
+    }
+
+    pub fn create_tag(
+        &mut self,
+        name: &str,
+        parent: Option<BlobID>,
+        rules: Option<Rules>,
+    ) -> Result<FloBlobTag, RVError> {
+        Self::create_tag_cuckoo(self, name, parent, rules, Cuckoo::None)
+    }
+
+    pub fn create_tag_cuckoo(
+        &mut self,
+        name: &str,
+        parent: Option<BlobID>,
+        rules: Option<Rules>,
+        cuckoo: Cuckoo,
+    ) -> Result<FloBlobTag, RVError> {
+        let ft = FloBlobTag::new_cuckoo(
+            self.realm.realm_id(),
+            rules.unwrap_or_else(|| self.realm.rules().clone()),
+            name,
+            parent,
+            cuckoo,
+        )?;
+        self.dht_storage.store_flo(ft.clone().into())?;
+        Ok(ft)
+    }
+    pub async fn set_realm_tag(
+        &mut self,
+        id: FloID,
+        signers: &[&dyn Signer],
+    ) -> Result<(), RVError> {
+        self.set_realm_service("tag", id, signers).await
+    }
+
+    pub async fn get_pages(&mut self, id: FloID) -> Result<Vec<FloBlobPage>, RVError> {
+        self.read_parent_cuckoo(id).await
+    }
+
+    pub async fn get_tags(&mut self, id: FloID) -> Result<Vec<FloBlobTag>, RVError> {
+        self.read_parent_cuckoo(id).await
+    }
+
+    async fn read_parent_cuckoo<T: Serialize + DeserializeOwned + Clone>(
+        &mut self,
+        parent: FloID,
+    ) -> Result<Vec<FloWrapper<T>>, RVError> {
+        let mut res = vec![];
+        for id in self
+            .dht_storage
+            .get_cuckoos(&GlobalID::new(self.realm.realm_id(), parent.clone()))
+            .await
+            .unwrap_or_default()
+            .into_iter()
+            .chain(std::iter::once(parent))
+        {
+            self.dht_storage
+                .clone()
+                .get_flo::<T>(&GlobalID::new(self.realm.realm_id(), id))
+                .await
+                .ok()
+                .map(|fw| res.push(fw));
+        }
+        Ok(res)
+    }
+
+    async fn get_realm(dht_storage: &mut DHTStorage, id: &RealmID) -> Result<FloRealm, RVError> {
+        Ok(dht_storage.get_flo::<Realm>(&id.into()).await?)
+    }
+
+    async fn get_realm_page(&mut self) -> Result<(), RVError> {
+        if let Some(id) = self.realm.cache().get_services().get("http") {
+            self.pages = self.get_pages(id.clone()).await?;
+        }
+
+        Ok(())
+    }
+
+    async fn get_realm_tag(&mut self) -> Result<(), RVError> {
+        if let Some(id) = self.realm.cache().get_services().get("tag") {
+            self.tags = self.get_tags(id.clone()).await?;
+        }
+
+        Ok(())
+    }
+}
diff --git a/flmodules/src/flo/README.md b/flmodules/src/flo/README.md
new file mode 100644
index 00000000..5e06e022
--- /dev/null
+++ b/flmodules/src/flo/README.md
@@ -0,0 +1,53 @@
+# Fledger Object (Flo)
+
+A Fledger Object (Flo) is the basic data structure in Fledger.
+It consists of data and a history of signatures on previous versions.
+A Flo can be updated over time, for both of the `data` field or the `Rules`
+field in the `history`.
+
+All data is stored in a `Flo`, even though the [dht_storage](../dht_storage/core.rs)
+module puts it in a `FloMeta` structure, adding timestamps and `Cuckoo`s.
+To make it easier to work with the different data types stored in a `Flo`,
+you can use a `FloWrapper<T>`.
+It holds a copy of the original data, as well as the corresponding `Flo`.
+
+The `FloWrapper`s defined are:
+- [crypto](./crypto.rs)
+  - `FloVerifier` wraps the public key of a keypair
+  - `FloBadge` is a [crypto::Condition], an AND/OR combination of `Verifier`s
+    to validate something
+  - `FloACE` implements an access control system based on rules
+- [realm](./realm.rs)
+  - `FloRealm` for a realm which holds a DHT configuration
+- [blob](./blob.rs)
+  - `FloBlob` a generic data storage
+  - `FloBlobPage` holds a html page, including its resources
+  - `FloBlobTag` points to other tags and Flos
+
+## History
+
+Stores the data necessary to prove that the current version has correctly evolved
+from the genesis version.
+
+### Rules
+
+Define how the Flo can be updated, or, using an ACE, what actions can be performed on
+the flo.
+
+## Updating
+
+A structure allowing to define a next version of a Flo and to collect signatures.
+
+## Cuckoo
+
+Mostly used for FloBlobTag and FloBlobPage, to allow attaching to existing, well-known
+FloBlob* elements.
+
+# Future Flo-types
+
+The following `FloWrapper`s are on the TODO list:
+- `FloNode` to represent the public configuration of a node
+- `FloLedger` holds the definition of a ledger, to serve as a central
+  blackboard
+  - GlobalState and History
+- `FloMana` represents tokens for the Badge
\ No newline at end of file
diff --git a/flmodules/src/flo/blob.rs b/flmodules/src/flo/blob.rs
new file mode 100644
index 00000000..1a75dbda
--- /dev/null
+++ b/flmodules/src/flo/blob.rs
@@ -0,0 +1,247 @@
+use std::collections::HashMap;
+
+use bytes::Bytes;
+use flarch::nodeids::U256;
+use flmacro::AsU256;
+use serde::{Deserialize, Serialize};
+
+use crate::dht_storage::core::Cuckoo;
+
+use super::{
+    crypto::Rules,
+    flo::{FloError, FloWrapper},
+    realm::RealmID,
+};
+
+#[derive(AsU256, Serialize, Deserialize, Clone)]
+pub struct BlobID(U256);
+
+pub type FloBlob = FloWrapper<Blob>;
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct Blob {
+    blob_type: String,
+    links: HashMap<String, Vec<BlobID>>,
+    values: HashMap<String, String>,
+    datas: HashMap<String, Bytes>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct BlobPage(Blob);
+
+pub type FloBlobPage = FloWrapper<BlobPage>;
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct BlobTag(Blob);
+
+pub type FloBlobTag = FloWrapper<BlobTag>;
+
+impl FloBlobPage {
+    pub fn new(
+        realm: RealmID,
+        rules: Rules,
+        path: &str,
+        index: Bytes,
+        parent: Option<BlobID>,
+    ) -> Result<Self, FloError> {
+        Self::new_cuckoo(realm, rules, path, index, parent, Cuckoo::None)
+    }
+
+    pub fn new_cuckoo(
+        realm: RealmID,
+        rules: Rules,
+        path: &str,
+        index: Bytes,
+        parent: Option<BlobID>,
+        cuckoo: Cuckoo,
+    ) -> Result<Self, FloError> {
+        let links = parent
+            .map(|p| [("parent".to_string(), vec![p])].into_iter().collect())
+            .unwrap_or(HashMap::new());
+        Self::from_type_cuckoo(
+            realm,
+            rules,
+            cuckoo,
+            BlobPage(Blob {
+                blob_type: "re.fledg.page".into(),
+                links,
+                datas: [("index.html".to_string(), index)].into(),
+                values: [("path".to_string(), path.into())].into(),
+            }),
+        )
+    }
+}
+
+impl FloBlobTag {
+    pub fn new(
+        realm: RealmID,
+        rules: Rules,
+        name: &str,
+        parent: Option<BlobID>,
+    ) -> Result<Self, FloError> {
+        Self::new_cuckoo(realm, rules, name, parent, Cuckoo::None)
+    }
+
+    pub fn new_cuckoo(
+        realm: RealmID,
+        rules: Rules,
+        name: &str,
+        parent: Option<BlobID>,
+        cuckoo: Cuckoo,
+    ) -> Result<Self, FloError> {
+        let links = parent
+            .map(|p| [("parent".to_string(), vec![p])].into_iter().collect())
+            .unwrap_or(HashMap::new());
+        Self::from_type_cuckoo(
+            realm,
+            rules,
+            cuckoo,
+            BlobTag(Blob {
+                blob_type: "re.fledg.tag".into(),
+                links,
+                datas: HashMap::new(),
+                values: [("name".to_string(), name.into())].into(),
+            }),
+        )
+    }
+}
+
+impl Blob {
+    pub fn new(blob_type: &str) -> Self {
+        Self {
+            blob_type: blob_type.to_string(),
+            links: HashMap::new(),
+            values: HashMap::new(),
+            datas: HashMap::new(),
+        }
+    }
+    pub fn set_parents(&mut self, parents: Vec<BlobID>) {
+        self.links.insert("parent".into(), parents);
+    }
+
+    pub fn set_path(&mut self, path: &str) {
+        self.values.insert("path".into(), path.to_string());
+    }
+}
+
+pub trait BlobAccess {
+    fn links(&self) -> &HashMap<String, Vec<BlobID>>;
+    fn values(&self) -> &HashMap<String, String>;
+    fn datas(&self) -> &HashMap<String, Bytes>;
+    fn links_mut(&mut self) -> &mut HashMap<String, Vec<BlobID>>;
+    fn values_mut(&mut self) -> &mut HashMap<String, String>;
+    fn datas_mut(&mut self) -> &mut HashMap<String, Bytes>;
+}
+
+pub trait BlobParents: BlobAccess {
+    fn set_parents(&mut self, parents: Vec<BlobID>) {
+        self.links_mut().insert("parents".into(), parents);
+    }
+    fn get_parents(&mut self) -> Vec<BlobID> {
+        self.links().get("parents").unwrap_or(&vec![]).clone()
+    }
+}
+
+impl BlobPage {
+    pub fn set_parents(&mut self, parents: Vec<BlobID>) {
+        self.0.set_parents(parents);
+    }
+
+    pub fn set_path(&mut self, path: &str) {
+        self.0.set_path(path);
+    }
+
+    pub fn set_data(&mut self, file: &str, data: Bytes) {
+        self.0.datas.insert(file.into(), data);
+    }
+}
+
+impl BlobAccess for BlobPage {
+    fn links(&self) -> &HashMap<String, Vec<BlobID>> {
+        &self.0.links
+    }
+
+    fn values(&self) -> &HashMap<String, String> {
+        &self.0.values
+    }
+
+    fn datas(&self) -> &HashMap<String, Bytes> {
+        &self.0.datas
+    }
+
+    fn links_mut(&mut self) -> &mut HashMap<String, Vec<BlobID>> {
+        &mut self.0.links
+    }
+
+    fn values_mut(&mut self) -> &mut HashMap<String, String> {
+        &mut self.0.values
+    }
+
+    fn datas_mut(&mut self) -> &mut HashMap<String, Bytes> {
+        &mut self.0.datas
+    }
+}
+
+impl BlobParents for BlobPage {}
+
+impl BlobTag {
+    pub fn set_parents(&mut self, parents: Vec<BlobID>) {
+        self.0.set_parents(parents);
+    }
+
+    pub fn set_path(&mut self, path: &str) {
+        self.0.set_path(path);
+    }
+
+    pub fn set_services(&mut self, services: Vec<BlobID>) {
+        self.0.links.insert("services".into(), services);
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::error::Error;
+
+    use flcrypto::access::Condition;
+
+    use crate::{flo::crypto::FloBadge, testing::flo::Wallet};
+
+    use super::*;
+
+    #[test]
+    fn test_update() -> Result<(), Box<dyn Error>> {
+        let mut wallet = Wallet::new();
+        let badge = FloBadge::from_type(RealmID::rnd(), Rules::None, wallet.get_badge())?;
+        let mut flb = FloBlobPage::new(
+            RealmID::rnd(),
+            Rules::Update(Condition::Verifier(wallet.get_verifier().get_id())),
+            "",
+            Bytes::from(""),
+            None,
+        )?;
+        flb.edit_sign_update(
+            |bp| bp.0.set_parents(vec![BlobID::rnd()]),
+            Condition::Verifier(wallet.get_verifier().get_id()),
+            flb.rules().clone(),
+            vec![Box::new(badge.clone())],
+            &[&*wallet.get_signer()],
+        )?;
+
+        assert_eq!(1, flb.version());
+
+        flb.edit_sign_update(
+            |bp| {
+                bp.0.datas
+                    .insert("index.html".into(), "<html><h1>Root</h1></html>".into());
+            },
+            Condition::Verifier(wallet.get_verifier().get_id()),
+            flb.rules().clone(),
+            vec![Box::new(badge.clone())],
+            &[&*wallet.get_signer()],
+        )?;
+
+        assert_eq!(2, flb.version());
+
+        Ok(())
+    }
+}
diff --git a/flmodules/src/flo/crypto.rs b/flmodules/src/flo/crypto.rs
new file mode 100644
index 00000000..d18e0b0e
--- /dev/null
+++ b/flmodules/src/flo/crypto.rs
@@ -0,0 +1,145 @@
+use std::collections::HashMap;
+
+use flarch::nodeids::U256;
+use flcrypto::{
+    access::{Badge, BadgeID, Condition, Version},
+    signer::Verifier,
+};
+use flmacro::AsU256;
+use serde::{Deserialize, Serialize};
+
+use super::flo::FloWrapper;
+
+#[derive(AsU256, Serialize, Deserialize, Clone, PartialEq)]
+pub struct AceID(U256);
+
+/// A Verifier is a public key which can verify a signature from a private key.
+pub type FloVerifier = FloWrapper<Box<dyn Verifier>>;
+
+/// A badge wraps a Condition with a fixed ID.
+pub type FloBadge = FloWrapper<BadgeCond>;
+
+/// An Access Control Entity (ACE) can define fine-grained rules over Flos
+/// that define how they can be updated or used.
+/// It also gives the possibility to delegate to other ACEs for overwriting
+/// or refining rules.
+pub type FloACE = FloWrapper<ACE>;
+
+#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
+pub enum Rules {
+    ACE(Version<AceID>),
+    Update(Condition),
+    None,
+}
+
+/// ACE protect objects with a set of rules useful for the
+/// given object.
+/// It can:
+/// - be updated with new and modified rules
+/// - delegate some or all of the rules to another ACE
+/// The goal is to have a flexible definition of rules for various
+/// sets of objects.
+#[derive(Serialize, Deserialize, Clone, Default)]
+pub struct ACE {
+    /// How to update a Flo with Rules::ACE(ThisACE)
+    update: Option<Condition>,
+    /// All rules for this ACE.
+    rules: HashMap<String, Condition>,
+    /// All delegations are applied in the order as they appear here.
+    /// This means that `FullOverwrite` should be at the beginning,
+    /// followed by the other delegation types.
+    delegation: Vec<ACEDelegation>,
+}
+
+/// This is overkill - as a first implementation, only `FillMissing` will be implemented.
+#[derive(Clone, Serialize, Deserialize)]
+pub enum ACEDelegation {
+    /// update and all rules from the given ACE replace the update and rules
+    /// with the same name
+    FullOverwrite(Version<AceID>),
+    /// All rules from the delegated ACE replace the rules with the same name
+    RulesOverwrite(Version<AceID>),
+    /// Only this rule from the delegated ACE replaces the rule with the same name
+    RuleOverwrite(String, Version<AceID>),
+    /// Only new rules from the delegated ACE are added
+    FillMissing(Version<AceID>),
+    /// update and all rules can be used as an alternative Identity
+    FullAlternative(Version<AceID>),
+    /// All rules from the delegated ACE can be used as alternative Identity
+    RulesAlternative(Version<AceID>),
+    /// Only this rule from the delegated ACE can be used as an alternative Identity
+    /// for the rule with the same name
+    RuleAlternative(String, Version<AceID>),
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct BadgeCond(Condition);
+
+impl ACE {
+    pub fn new(
+        update: Option<Condition>,
+        rules: HashMap<String, Condition>,
+        delegation: Vec<ACEDelegation>,
+    ) -> Self {
+        Self {
+            update,
+            rules,
+            delegation,
+        }
+    }
+
+    pub fn update(&self) -> Option<Condition> {
+        self.update.clone()
+    }
+
+    pub fn rules(&self) -> HashMap<String, Condition> {
+        self.rules.clone()
+    }
+
+    pub fn delegation(&self) -> Vec<ACEDelegation> {
+        self.delegation.clone()
+    }
+}
+
+impl BadgeCond {
+    pub fn new(cond: Condition) -> Self {
+        Self(cond)
+    }
+
+    pub fn cond(&self) -> &Condition{
+        &self.0
+    }
+}
+
+impl Badge for FloBadge {
+    fn badge_id(&self) -> BadgeID {
+        (*self.flo_id()).into()
+    }
+
+    fn badge_cond(&self) -> Condition {
+        self.cache().0.clone()
+    }
+
+    fn badge_version(&self) -> u32 {
+        self.version() as u32
+    }
+
+    fn clone_self(&self) -> Box<dyn Badge> {
+        Box::new(
+            FloBadge::from_type(self.realm_id(), self.rules().clone(), self.cache().clone())
+                .unwrap(),
+        )
+    }
+}
+
+impl Rules {
+    pub fn update(&self, ace: Option<FloACE>) -> Option<Condition> {
+        match self {
+            Rules::ACE(version) => ace
+                .and_then(|a| version.accepts(a.version()).then(|| a.cache().update()))
+                .flatten(),
+            Rules::Update(condition) => Some(condition.clone()),
+            Rules::None => None,
+        }
+    }
+}
diff --git a/flmodules/src/flo/flo.rs b/flmodules/src/flo/flo.rs
new file mode 100644
index 00000000..c904be83
--- /dev/null
+++ b/flmodules/src/flo/flo.rs
@@ -0,0 +1,358 @@
+use std::{any::type_name, collections::HashMap};
+
+use bytes::Bytes;
+use flarch::nodeids::U256;
+use flmacro::AsU256;
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use serde_with::{hex::Hex, serde_as};
+use thiserror::Error;
+
+use flcrypto::{
+    access::{Badge, BadgeSignature, Condition},
+    signer::{KeyPairID, Signature, Signer, SignerError, Verifier},
+    tofrombytes::{TFBError, ToFromBytes},
+};
+
+use crate::dht_storage::core::{Cuckoo, FloConfig};
+
+use super::{
+    crypto::Rules,
+    realm::{GlobalID, Realm, RealmID},
+};
+
+#[derive(Debug, Error)]
+pub enum FloError {
+    #[error("{0}")]
+    DeserializationTFB(#[from] TFBError),
+    #[error("Couldn't deserialize {0}: '{1:?}'")]
+    Deserialization(String, String),
+    #[error("Couldn't serialize: {0}")]
+    Serialization(String),
+    #[error("RMP serialization error {0}")]
+    RmpSerialization(#[from] rmp_serde::encode::Error),
+    #[error("Expected content to be '{0:?}', but was '{1:?}")]
+    WrongContent(String, String),
+}
+
+#[derive(AsU256, Deserialize, Serialize, Clone, PartialEq, Eq, Hash)]
+pub struct FloID(U256);
+
+/// Flo defines the following actions:
+/// - ican.re.fledg.flmodules.flo.flo
+///   - .update_data - update the data
+///   - .update_ace - update the Version<AceID>
+#[serde_as]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub struct Flo {
+    // In which realm this Flo resides.
+    realm: RealmID,
+    // What type this Flo is - should be a generic mime-type
+    flo_type: String,
+    // Does it allow storing of nearby Cuckoos?
+    flo_config: FloConfig,
+    #[serde_as(as = "Hex")]
+    // The current data of the Flo
+    data: Bytes,
+    // All history to prove that the current Flo is legit.
+    history: History,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+pub struct History {
+    // The first version of this Flo
+    genesis: HistoryStep,
+    // Every new version needs to include the hashes and the new Rules for
+    // the update, as well as the Verifiers used for the signatures.
+    evolve: Vec<HistoryStep>,
+}
+
+/// TODO: work out what the best strategy is for the signature and the
+/// ID of the flo:
+/// 1. ID = H(content, genesis.data_hash, genesis.ace_version), Sign(last_ID, new_ID)
+/// - seems easiest and most straightforward
+/// 2. Hash_n = H(content, version_n.data_hash, version_n.ace_version), Sign(Hash_n-1, Hash_n),
+/// ID = H(Hash_n, Signature_n)
+/// - seems more complicated
+/// - allows for adding a nonce to the Flo
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+pub struct HistoryStep {
+    // Hash of the data of this step - needed to be able to re-create the message which
+    // is signed to prove the update.
+    data_hash: U256,
+    // The new rules of this step. Might be the same as the previous one.
+    rules: Rules,
+    // It is OK to have the verifiers here, because their IDs are in the hash of the FloID.
+    // So an attacker cannot change the verifiers to create a wrong signature.
+    verifiers: Vec<Box<dyn Verifier>>,
+    // All signatures to prove evolution to the next version.
+    signatures: HashMap<KeyPairID, Signature>,
+}
+
+/// A convenience method to handle a type T together with its
+/// Flo-representation of all the history and ACE.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct FloWrapper<T> {
+    flo: Flo,
+    object: T,
+}
+
+pub struct UpdateSign<T: Serialize + DeserializeOwned + Clone> {
+    pub update: T,
+    pub rules: Rules,
+    pub signatures: BadgeSignature,
+}
+
+impl Flo {
+    pub fn new<T: Serialize + DeserializeOwned>(
+        realm: RealmID,
+        rules: Rules,
+        data: &T,
+        flo_config: FloConfig,
+    ) -> Result<Self, FloError> {
+        let data: Bytes = rmp_serde::to_vec(data)?.into();
+        let flo_type = type_name::<T>().into();
+        Ok(Self {
+            realm,
+            flo_type,
+            flo_config,
+            history: History {
+                genesis: HistoryStep {
+                    data_hash: U256::hash_data(&data),
+                    rules,
+                    verifiers: vec![],
+                    signatures: HashMap::new(),
+                },
+                evolve: vec![],
+            },
+            data,
+        })
+    }
+
+    pub fn new_realm(rules: Rules, realm: &Realm) -> Result<Self, FloError> {
+        let mut f = Self::new(RealmID::zero(), rules, realm, FloConfig::default())?;
+        f.realm = (*f.flo_id()).into();
+        Ok(f)
+    }
+
+    pub fn data(&self) -> Bytes {
+        self.data.clone()
+    }
+
+    pub fn latest_step(&self) -> &HistoryStep {
+        if let Some(step) = self.history.evolve.last() {
+            return step;
+        }
+        &self.history.genesis
+    }
+
+    pub fn rules(&self) -> &Rules {
+        &self.latest_step().rules
+    }
+
+    pub fn version(&self) -> u32 {
+        self.history.evolve.len() as u32
+    }
+
+    pub fn flo_id(&self) -> FloID {
+        FloID::hash_domain_parts(
+            "ican.re.fledg.flmodules.flo.Flo",
+            &[
+                &self.flo_type.to_bytes(),
+                self.history.genesis.data_hash.as_ref(),
+                &self.history.genesis.rules.to_bytes(),
+            ],
+        )
+    }
+
+    pub fn global_id(&self) -> GlobalID {
+        GlobalID::new(self.realm.clone(), self.flo_id())
+    }
+
+    pub fn realm_id(&self) -> RealmID {
+        self.realm.clone()
+    }
+
+    pub fn update<T: Serialize + DeserializeOwned + Clone>(
+        &self,
+        update: &mut UpdateSign<T>,
+    ) -> Result<Flo, SignerError> {
+        let data = update.update.to_bytes();
+        let signatures = update.signatures.finalize()?;
+        let mut next_version = self.clone();
+        next_version.history.evolve.push(HistoryStep {
+            data_hash: U256::hash_data(&data),
+            rules: update.rules.clone(),
+            verifiers: vec![],
+            signatures,
+        });
+        next_version.data = data;
+        Ok(next_version)
+    }
+
+    pub fn flo_type(&self) -> String {
+        self.flo_type.clone()
+    }
+
+    pub fn flo_config(&self) -> &FloConfig {
+        &self.flo_config
+    }
+}
+
+impl<T: Serialize + DeserializeOwned + Clone> FloWrapper<T> {
+    pub fn from_type(realm: RealmID, rules: Rules, object: T) -> Result<Self, FloError> {
+        Self::from_type_config(realm, rules, FloConfig::default(), object)
+    }
+
+    pub fn from_type_cuckoo(
+        realm: RealmID,
+        rules: Rules,
+        cuckoo: Cuckoo,
+        object: T,
+    ) -> Result<Self, FloError> {
+        Self::from_type_config(realm, rules, FloConfig { cuckoo }, object)
+    }
+
+    pub fn from_type_config(
+        realm: RealmID,
+        rules: Rules,
+        config: FloConfig,
+        object: T,
+    ) -> Result<Self, FloError> {
+        let flo = Flo::new(realm, rules, &object, config)?;
+        Ok(Self { flo, object })
+    }
+
+    pub fn cache(&self) -> &T {
+        &self.object
+    }
+
+    pub fn flo(&self) -> &Flo {
+        &self.flo
+    }
+
+    pub fn rules(&self) -> &Rules {
+        self.flo.rules()
+    }
+
+    pub fn data(&self) -> &Bytes {
+        &self.flo.data
+    }
+
+    pub fn version(&self) -> u32 {
+        self.flo.history.evolve.len() as u32
+    }
+
+    pub fn flo_id(&self) -> FloID {
+        self.flo.flo_id()
+    }
+
+    pub fn global_id(&self) -> GlobalID {
+        GlobalID::new(self.flo.realm.clone(), self.flo_id())
+    }
+
+    pub fn realm_id(&self) -> RealmID {
+        self.flo.realm.clone()
+    }
+
+    pub fn edit(&self, edit: impl FnOnce(&mut T)) -> T {
+        let mut e = self.cache().clone();
+        edit(&mut e);
+        e
+    }
+
+    pub fn hash_update(&self, update: &T) -> U256 {
+        let new_hash = U256::hash_data(&update.to_bytes()).to_bytes();
+        U256::hash_domain_parts("FloUpdate", &[&self.hash().to_bytes(), &new_hash])
+    }
+
+    pub fn start_sign(
+        &self,
+        condition: Condition,
+        rules: Rules,
+        badges: Vec<Box<dyn Badge>>,
+        update: T,
+    ) -> Result<UpdateSign<T>, SignerError> {
+        let msg_orig = self.hash_update(&update).bytes();
+        let signatures =
+            BadgeSignature::from_cond(condition.clone(), msg_orig, &move |vi| -> Option<
+                Box<dyn Badge>,
+            > {
+                badges
+                    .iter()
+                    .find(|b| b.badge_id() == vi.get_id() && vi.accepts(b.badge_version()))
+                    .cloned()
+            })?;
+        Ok(UpdateSign {
+            update,
+            rules,
+            signatures,
+        })
+    }
+
+    pub fn edit_sign_update(
+        &mut self,
+        edit: impl FnOnce(&mut T),
+        cond: Condition,
+        rules: Rules,
+        badges: Vec<Box<dyn Badge>>,
+        signers: &[&dyn Signer],
+    ) -> Result<u32, SignerError> {
+        let update = self.edit(edit);
+        let mut u_s = self.start_sign(cond, rules, badges, update)?;
+        for &signer in signers {
+            u_s.sign(signer)?;
+        }
+        self.apply_update(u_s)
+    }
+
+    pub fn apply_update(&mut self, mut update: UpdateSign<T>) -> Result<u32, SignerError> {
+        self.flo = self.flo.update(&mut update)?;
+        self.object = update.update;
+        Ok(self.version())
+    }
+
+    pub fn hash(&self) -> U256 {
+        U256::hash_domain_parts("FloWrapper", &[&self.flo.to_bytes()])
+    }
+}
+
+impl<T: Serialize + DeserializeOwned + Clone> UpdateSign<T> {
+    pub fn new(update: T, rules: Rules, signatures: BadgeSignature) -> Self {
+        Self {
+            update,
+            rules,
+            signatures,
+        }
+    }
+
+    pub fn sign(&mut self, signer: &dyn Signer) -> Result<(), SignerError> {
+        self.signatures.sign(signer)
+    }
+}
+
+impl<T: Serialize + DeserializeOwned> TryFrom<Flo> for FloWrapper<T> {
+    type Error = FloError;
+
+    fn try_from(flo: Flo) -> Result<Self, Self::Error> {
+        let flo_type = type_name::<T>();
+        if flo.flo_type != flo_type {
+            return Err(FloError::WrongContent(flo_type.to_string(), flo.flo_type));
+        }
+
+        let cache = T::from_bytes(flo_type, &flo.data)?;
+
+        Ok(Self { flo, object: cache })
+    }
+}
+
+impl<T: Serialize + DeserializeOwned + Clone> From<FloWrapper<T>> for Flo {
+    fn from(value: FloWrapper<T>) -> Self {
+        value.flo
+    }
+}
+
+impl<T: Serialize + DeserializeOwned + Clone> From<&FloWrapper<T>> for Flo {
+    fn from(value: &FloWrapper<T>) -> Self {
+        value.flo.clone()
+    }
+}
diff --git a/flmodules/src/flo/mod.rs b/flmodules/src/flo/mod.rs
new file mode 100644
index 00000000..c16088ae
--- /dev/null
+++ b/flmodules/src/flo/mod.rs
@@ -0,0 +1,5 @@
+pub mod blob;
+pub mod crypto;
+pub mod realm;
+pub mod flo;
+pub mod storage;
\ No newline at end of file
diff --git a/flmodules/src/flo/realm.rs b/flmodules/src/flo/realm.rs
new file mode 100644
index 00000000..53d7b578
--- /dev/null
+++ b/flmodules/src/flo/realm.rs
@@ -0,0 +1,92 @@
+use std::collections::HashMap;
+
+use flarch::nodeids::U256;
+use flmacro::AsU256;
+use serde::{Deserialize, Serialize};
+
+use crate::dht_storage::core::RealmConfig;
+
+use super::{
+    crypto::Rules,
+    flo::{Flo, FloError, FloID, FloWrapper},
+};
+
+pub type FloRealm = FloWrapper<Realm>;
+
+#[derive(AsU256, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
+pub struct RealmID(U256);
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub struct Realm {
+    /// The name cannot be modified and must stay the same.
+    name: String,
+    /// Configuration options for the DHT hosting this realm
+    config: RealmConfig,
+    /// Pointers to root Flos for different services.
+    services: HashMap<String, FloID>,
+}
+
+/// A GlobalID holds the RealmID and the specific FloID.
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
+pub struct GlobalID(RealmID, FloID);
+
+impl Realm {
+    pub fn new(name: String, config: RealmConfig) -> Self {
+        Self {
+            name,
+            config,
+            services: HashMap::new(),
+        }
+    }
+
+    pub fn get_config(&self) -> RealmConfig {
+        self.config.clone()
+    }
+
+    pub fn set_service(&mut self, name: &str, id: FloID) {
+        self.services.insert(name.into(), id);
+    }
+
+    pub fn get_services(&self) -> &HashMap<String, FloID> {
+        &self.services
+    }
+}
+
+impl FloRealm {
+    pub fn new(name: &str, rules: Rules, config: RealmConfig) -> Result<Self, FloError> {
+        Flo::new_realm(rules, &Realm::new(name.into(), config))?.try_into()
+    }
+}
+
+impl GlobalID {
+    pub fn new(realm: RealmID, flo: FloID) -> Self {
+        Self(realm, flo)
+    }
+
+    // pub fn node_id(&self) -> NodeID {
+    //     NodeID::hash_domain_parts(
+    //         "re.fledg.flmodules.flo.global_id",
+    //         &[self.0.as_ref(), self.1.as_ref()],
+    //     )
+    // }
+
+    pub fn realm_id(&self) -> &RealmID {
+        &self.0
+    }
+
+    pub fn flo_id(&self) -> &FloID {
+        &self.1
+    }
+}
+
+impl From<&RealmID> for GlobalID {
+    fn from(value: &RealmID) -> Self {
+        GlobalID::new(value.clone(), (*value.clone()).into())
+    }
+}
+
+impl Default for RealmID {
+    fn default() -> Self {
+        RealmID::zero()
+    }
+}
diff --git a/flmodules/src/flo/storage.rs b/flmodules/src/flo/storage.rs
new file mode 100644
index 00000000..b686d296
--- /dev/null
+++ b/flmodules/src/flo/storage.rs
@@ -0,0 +1,67 @@
+use std::collections::HashMap;
+
+use flarch::data_storage::DataStorage;
+use flcrypto::{access::Condition, signer::Signer, signer_ed25519::SignerEd25519};
+use serde::{Deserialize, Serialize};
+
+use super::{
+    crypto::{FloACE, Rules, ACE},
+    realm::RealmID,
+};
+
+#[derive(Serialize, Deserialize, Default)]
+pub struct CryptoStorage {
+    #[serde(skip)]
+    ds: Option<Box<dyn DataStorage + Send>>,
+    realm_id: RealmID,
+    pub signers: Vec<Box<dyn Signer>>,
+    pub aces: Vec<FloACE>,
+}
+
+const STORAGE_NAME: &str = "CryptoStorage";
+
+impl CryptoStorage {
+    pub fn new(ds: Box<dyn DataStorage + Send>) -> Self {
+        Self {
+            ds: Some(ds.clone()),
+            ..serde_yaml::from_str(&ds.get(STORAGE_NAME).unwrap_or("".to_string()))
+                .unwrap_or(CryptoStorage::default())
+        }
+    }
+
+    pub fn get_signer(&mut self) -> Box<dyn Signer> {
+        if let Some(signer) = self.signers.first() {
+            return (*signer).clone();
+        }
+        self.add_signer()
+    }
+
+    pub fn add_signer(&mut self) -> Box<dyn Signer> {
+        self.signers.push(SignerEd25519::new_box());
+        self.store();
+        self.get_signer()
+    }
+
+    pub fn get_ace(&mut self) -> FloACE {
+        if let Some(fa) = self.aces.first() {
+            return fa.clone();
+        }
+        self.add_ace()
+    }
+
+    pub fn add_ace(&mut self) -> FloACE {
+        let signer = self.get_signer();
+        let cond = Condition::Verifier((*signer).verifier().get_id());
+        let ace = ACE::new(Some(cond.clone()), HashMap::new(), vec![]);
+        self.aces.push(
+            FloACE::from_type(self.realm_id.clone(), Rules::Update(cond), ace)
+                .expect("Creating ACE"),
+        );
+        self.get_ace()
+    }
+
+    pub fn store(&mut self) {
+        let ser = serde_yaml::to_string(&self).unwrap_or("".to_string());
+        self.ds.as_mut().map(|ds| ds.set(STORAGE_NAME, &ser));
+    }
+}
diff --git a/flmodules/src/gossip_events/broker.rs b/flmodules/src/gossip_events/broker.rs
index a3998488..0b921e71 100644
--- a/flmodules/src/gossip_events/broker.rs
+++ b/flmodules/src/gossip_events/broker.rs
@@ -1,209 +1,146 @@
-use std::sync::mpsc::{channel, Receiver, Sender};
-
 use flarch::{
-    broker::{Broker, BrokerError, Subsystem, SubsystemHandler},
-    nodeids::{NodeID, U256},
-    platform_async_trait,
+    broker::{Broker, BrokerError, TranslateFrom, TranslateInto},
+    data_storage::DataStorage,
+    nodeids::U256,
+    tasks::now,
 };
+use tokio::sync::watch;
 
 use super::{
     core::{Category, Event, EventsStorage},
-    messages::{Config, GossipEvents, GossipIn, GossipMessage, GossipOut},
+    messages::{GossipIn, GossipOut, Messages},
 };
 use crate::{
-    overlay::messages::NetworkWrapper,
-    random_connections::messages::{RandomIn, RandomMessage, RandomOut},
-    timer::TimerMessage,
+    nodeconfig::NodeInfo,
+    random_connections::broker::{BrokerRandom, RandomIn, RandomOut},
+    router::messages::NetworkWrapper,
+    timer::Timer,
 };
 
-const MODULE_NAME: &str = "Gossip";
+pub type BrokerGossip = Broker<GossipIn, GossipOut>;
+
+pub const MODULE_NAME: &str = "Gossip";
 
 /// This links the GossipEvent module with a RandomConnections module, so that
 /// all messages are correctly translated from one to the other.
-pub struct GossipBroker {
-    /// This is always updated with the latest view of the GossipEvent module.
-    pub storage: EventsStorage,
+pub struct Gossip {
     /// Represents the underlying broker.
-    pub broker: Broker<GossipMessage>,
+    pub broker: BrokerGossip,
     /// Is used to pass the EventsStorage structure from the Translate to the GossipLink.
-    storage_rx: Receiver<EventsStorage>,
+    pub storage: watch::Receiver<EventsStorage>,
 }
 
-impl GossipBroker {
-    pub async fn start(id: NodeID, rc: Broker<RandomMessage>) -> Result<Self, BrokerError> {
-        let (storage_tx, storage_rx) = channel();
-        let broker = Translate::start(rc, Config::new(id), storage_tx).await?;
-        Ok(GossipBroker {
-            storage: EventsStorage::new(),
-            storage_rx,
-            broker,
+impl Gossip {
+    pub async fn start(
+        storage: Box<dyn DataStorage + Send>,
+        node_info: NodeInfo,
+        rc: BrokerRandom,
+        timer: &mut Timer,
+    ) -> Result<Self, BrokerError> {
+        let (messages, storage) = Messages::new(node_info.get_id(), storage);
+        let mut broker = Broker::new();
+        broker.add_handler(Box::new(messages)).await?;
+
+        timer.tick_minute(broker.clone(), GossipIn::Tick).await?;
+        broker.link_bi(rc).await?;
+
+        let mut gb = Gossip { storage, broker };
+        gb.add_event(Event {
+            category: Category::NodeInfo,
+            src: node_info.get_id(),
+            created: now(),
+            msg: node_info.encode(),
         })
-    }
+        .await?;
 
-    pub async fn add_timer(&mut self, mut timer: Broker<TimerMessage>) {
-        timer
-            .forward(
-                self.broker.clone(),
-                Box::new(|msg: TimerMessage| {
-                    matches!(msg, TimerMessage::Minute)
-                        .then(|| GossipMessage::Input(GossipIn::Tick))
-                }),
-            )
-            .await;
-    }
-
-    pub fn update(&mut self) {
-        for update in self.storage_rx.try_iter() {
-            self.storage = update;
-        }
+        Ok(gb)
     }
 
     /// Adds a new event to the GossipMessage module.
     /// The new event will automatically be propagated to all connected nodes.
     pub async fn add_event(&mut self, event: Event) -> Result<(), BrokerError> {
-        self.broker
-            .emit_msg(GossipMessage::Input(GossipIn::AddEvent(event)))?;
+        self.broker.emit_msg_in(GossipIn::AddEvent(event))?;
         Ok(())
     }
 
     /// Gets a copy of all chat events stored in the module.
     pub fn chat_events(&self) -> Vec<Event> {
-        self.storage.events(Category::TextMessage)
+        self.storage.borrow().events(Category::TextMessage)
     }
 
     /// Gets all event-ids that are stored in the module.
     pub fn event_ids(&self) -> Vec<U256> {
-        self.storage.event_ids()
+        self.storage.borrow().event_ids()
     }
 
     /// Gets a single event of the module.
     pub fn event(&self, id: &U256) -> Option<Event> {
-        self.storage.event(id)
+        self.storage.borrow().event(id)
     }
 
     /// Returns all events from a given category
     pub fn events(&self, cat: Category) -> Vec<Event> {
-        self.storage.events(cat)
+        self.storage.borrow().events(cat)
     }
 }
 
-struct Translate {
-    storage_tx: Sender<EventsStorage>,
-    module: GossipEvents,
-}
-
-impl Translate {
-    async fn start(
-        random: Broker<RandomMessage>,
-        config: Config,
-        storage_tx: Sender<EventsStorage>,
-    ) -> Result<Broker<GossipMessage>, BrokerError> {
-        let mut gossip = Broker::new();
-        gossip
-            .add_subsystem(Subsystem::Handler(Box::new(Translate {
-                storage_tx,
-                module: GossipEvents::new(config),
-            })))
-            .await?;
-        gossip
-            .link_bi(
-                random,
-                Box::new(Self::link_rnd_gossip),
-                Box::new(Self::link_gossip_rnd),
-            )
-            .await?;
-        Ok(gossip)
-    }
-
-    fn link_rnd_gossip(msg: RandomMessage) -> Option<GossipMessage> {
-        if let RandomMessage::Output(msg_out) = msg {
-            match msg_out {
-                RandomOut::NodeIDsConnected(list) => Some(GossipIn::NodeList(list.into()).into()),
-                RandomOut::NetworkWrapperFromNetwork(id, msg) => msg
-                    .unwrap_yaml(MODULE_NAME)
-                    .map(|msg| GossipIn::FromNetwork(id, msg).into()),
-                _ => None,
-            }
-        } else {
-            None
-        }
-    }
-
-    fn link_gossip_rnd(msg: GossipMessage) -> Option<RandomMessage> {
-        if let GossipMessage::Output(GossipOut::ToNetwork(id, msg_node)) = msg {
-            Some(
-                RandomIn::NetworkMapperToNetwork(
-                    id,
-                    NetworkWrapper::wrap_yaml(MODULE_NAME, &msg_node).unwrap(),
-                )
-                .into(),
-            )
-        } else {
-            None
-        }
-    }
-
-    fn handle_input(&mut self, msg_in: GossipIn) -> Vec<GossipOut> {
-        match self.module.process_message(msg_in) {
-            Ok(ret) => return ret.into_iter().map(|m| m.into()).collect(),
-            Err(e) => log::warn!("While processing message: {e:?}"),
-        }
-        vec![]
-    }
-
-    fn handle_output(&mut self, msg_out: &GossipOut) {
-        if let GossipOut::Storage(s) = msg_out {
-            self.storage_tx
-                .send(s.clone())
-                .err()
-                .map(|e| log::error!("Couldn't send to storage_tx: {e:?}"));
+impl TranslateFrom<RandomOut> for GossipIn {
+    fn translate(msg: RandomOut) -> Option<Self> {
+        match msg {
+            RandomOut::NodeIDsConnected(list) => Some(GossipIn::UpdateNodeList(list.into())),
+            RandomOut::NetworkWrapperFromNetwork(id, msg) => msg
+                .unwrap_yaml(MODULE_NAME)
+                .map(|msg| GossipIn::FromNetwork(id, msg)),
+            _ => None,
         }
     }
 }
 
-#[platform_async_trait()]
-impl SubsystemHandler<GossipMessage> for Translate {
-    async fn messages(&mut self, msgs: Vec<GossipMessage>) -> Vec<GossipMessage> {
-        let mut out = vec![];
-        for msg in msgs {
-            log::trace!("Got msg: {msg:?}");
-            if let GossipMessage::Input(msg_in) = msg {
-                out.extend(self.handle_input(msg_in));
-            }
-        }
-        for msg in out.iter() {
-            log::trace!("Outputting: {msg:?}");
-            self.handle_output(msg);
-        }
-        out.into_iter().map(|o| o.into()).collect()
+impl TranslateInto<RandomIn> for GossipOut {
+    fn translate(self) -> Option<RandomIn> {
+        let GossipOut::ToNetwork(id, msg_node) = self;
+        Some(RandomIn::NetworkWrapperToNetwork(
+            id,
+            NetworkWrapper::wrap_yaml(MODULE_NAME, &msg_node).unwrap(),
+        ))
     }
 }
 
 #[cfg(test)]
 mod tests {
     use std::error::Error;
+    use std::sync::mpsc;
 
     use crate::gossip_events::core::{Category, Event};
     use crate::gossip_events::messages::ModuleMessage;
+    use crate::nodeconfig::NodeConfig;
+    use crate::timer::TimerMessage;
+    use flarch::data_storage::DataStorageTemp;
     use flarch::nodeids::NodeID;
-    use flarch::{start_logging, tasks::now};
+    use flarch::start_logging_filter_level;
+    use flarch::tasks::now;
 
     use super::*;
 
     #[tokio::test]
     async fn test_translation() -> Result<(), Box<dyn Error>> {
-        start_logging();
+        start_logging_filter_level(vec![], log::LevelFilter::Info);
 
-        let id = NodeID::rnd();
+        let node_info = NodeConfig::new().info;
         let mut broker_rnd = Broker::new();
-        let mut gossip = GossipBroker::start(id, broker_rnd.clone()).await?;
+        let mut timer = Timer::simul();
+        let gossip = Gossip::start(
+            Box::new(DataStorageTemp::new()),
+            node_info,
+            broker_rnd.clone(),
+            &mut timer,
+        )
+        .await?;
 
         let id2 = NodeID::rnd();
-        let (tap_rnd, _) = broker_rnd.get_tap_sync().await?;
+        let (tap_rnd, _) = broker_rnd.get_tap_in_sync().await?;
         broker_rnd
-            .settle_msg(RandomMessage::Output(RandomOut::NodeIDsConnected(
-                vec![id2].into(),
-            )))
+            .settle_msg_out(RandomOut::NodeIDsConnected(vec![id2].into()))
             .await?;
         assert_msg_reid(&tap_rnd, &id2)?;
 
@@ -215,7 +152,7 @@ mod tests {
         };
         let msg = ModuleMessage::Events(vec![event.clone()]);
         broker_rnd
-            .settle_msg(
+            .settle_msg_out(
                 RandomOut::NetworkWrapperFromNetwork(
                     id2,
                     NetworkWrapper::wrap_yaml(MODULE_NAME, &msg).unwrap(),
@@ -223,17 +160,16 @@ mod tests {
                 .into(),
             )
             .await?;
-        gossip.update();
-        assert_eq!(1, gossip.storage.events(event.category).len());
+        assert_eq!(1, gossip.storage.borrow().events(event.category).len());
 
-        gossip.broker.settle_msg(GossipIn::Tick.into()).await?;
+        timer.broker.settle_msg_out(TimerMessage::Second).await?;
         assert_msg_reid(&tap_rnd, &id2)?;
         Ok(())
     }
 
-    fn assert_msg_reid(tap: &Receiver<RandomMessage>, id2: &NodeID) -> Result<(), Box<dyn Error>> {
+    fn assert_msg_reid(tap: &mpsc::Receiver<RandomIn>, id2: &NodeID) -> Result<(), Box<dyn Error>> {
         for msg in tap.try_iter() {
-            if let RandomMessage::Input(RandomIn::NetworkMapperToNetwork(id, msg_mod)) = msg {
+            if let RandomIn::NetworkWrapperToNetwork(id, msg_mod) = msg {
                 assert_eq!(id2, &id);
                 assert_eq!(MODULE_NAME.to_string(), msg_mod.module);
                 let msg_yaml = serde_yaml::from_str(&msg_mod.msg)?;
diff --git a/flmodules/src/gossip_events/messages.rs b/flmodules/src/gossip_events/messages.rs
index 345c8ee9..503ad149 100644
--- a/flmodules/src/gossip_events/messages.rs
+++ b/flmodules/src/gossip_events/messages.rs
@@ -1,7 +1,13 @@
-use flarch::nodeids::{NodeID, NodeIDs, U256};
+use flarch::{
+    broker::SubsystemHandler,
+    data_storage::DataStorage,
+    nodeids::{NodeID, NodeIDs, U256},
+    platform_async_trait,
+};
 use serde::{Deserialize, Serialize};
+use tokio::sync::watch;
 
-use super::core::*;
+use super::{broker::MODULE_NAME, core::*};
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum ModuleMessage {
@@ -11,61 +17,81 @@ pub enum ModuleMessage {
     RequestEvents(Vec<U256>),
 }
 
-#[derive(Clone, Debug)]
-pub enum GossipMessage {
-    Input(GossipIn),
-    Output(GossipOut),
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum GossipIn {
     Tick,
     FromNetwork(NodeID, ModuleMessage),
-    SetStorage(EventsStorage),
-    GetStorage,
     AddEvent(Event),
-    NodeList(NodeIDs),
+    UpdateNodeList(NodeIDs),
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum GossipOut {
     ToNetwork(NodeID, ModuleMessage),
-    Storage(EventsStorage),
-    Updated,
-}
-
-#[derive(Debug)]
-pub struct Config {
-    pub our_id: NodeID,
-}
-
-impl Config {
-    pub fn new(our_id: NodeID) -> Self {
-        Self { our_id }
-    }
 }
 
 /// The first module to use the random_connections is a copy of the previous
 /// chat.
 /// Now it holds events of multiple categories and exchanges them between the
 /// nodes.
-#[derive(Debug)]
-pub struct GossipEvents {
-    storage: EventsStorage,
-    cfg: Config,
+pub struct Messages {
+    events: EventsStorage,
+    storage: Box<dyn DataStorage + Send>,
+    tx: Option<watch::Sender<EventsStorage>>,
+    id: NodeID,
     nodes: NodeIDs,
     outstanding: Vec<U256>,
 }
 
-impl GossipEvents {
+impl std::fmt::Debug for Messages {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("GossipEvents")
+            .field("events", &self.events)
+            .field("id", &self.id)
+            .field("nodes", &self.nodes)
+            .field("outstanding", &self.outstanding)
+            .finish()
+    }
+}
+
+impl Messages {
     /// Returns a new chat module.
-    pub fn new(cfg: Config) -> Self {
-        Self {
-            storage: EventsStorage::new(),
-            cfg,
-            nodes: NodeIDs::empty(),
-            outstanding: vec![],
+    pub fn new(
+        id: NodeID,
+        storage: Box<dyn DataStorage + Send>,
+    ) -> (Self, watch::Receiver<EventsStorage>) {
+        let mut events = EventsStorage::new();
+        let gossip_msgs_str = storage.get(MODULE_NAME).unwrap();
+        if !gossip_msgs_str.is_empty() {
+            if let Err(e) = events.set(&gossip_msgs_str) {
+                log::warn!("Couldn't load gossip messages: {}", e);
+            }
         }
+        let (storage_tx, storage_rx) = watch::channel(events.clone());
+        (
+            Self {
+                events,
+                storage,
+                tx: Some(storage_tx),
+                id,
+                nodes: NodeIDs::empty(),
+                outstanding: vec![],
+            },
+            storage_rx,
+        )
+    }
+
+    fn store(&mut self) {
+        self.tx.clone().map(|tx| {
+            tx.send(self.events.clone())
+                .is_err()
+                .then(|| self.tx = None)
+        });
+        self.events
+            .get()
+            .map(|events_str| self.storage.set(MODULE_NAME, &events_str))
+            .err()
+            .map(|e| log::warn!("Couldn't store gossip: {e:?}"));
     }
 
     /// Processes many messages at a time.
@@ -75,26 +101,20 @@ impl GossipEvents {
     ) -> Result<Vec<GossipOut>, serde_yaml::Error> {
         let mut out = vec![];
         for msg in msgs {
-            out.extend(self.process_message(msg)?);
+            out.extend(self.process_message(msg));
         }
         Ok(out)
     }
 
-    /// Processes one generic message and returns either an error
-    /// or a Vec<MessageOut>.
-    pub fn process_message(&mut self, msg: GossipIn) -> Result<Vec<GossipOut>, serde_yaml::Error> {
-        log::trace!("{} got message {:?}", self.cfg.our_id, msg);
-        Ok(match msg {
+    /// Processes one generic message and returns the result.
+    pub fn process_message(&mut self, msg: GossipIn) -> Vec<GossipOut> {
+        // log::trace!("{} got message {:?}", self.id, msg);
+        match msg {
             GossipIn::Tick => self.tick(),
             GossipIn::FromNetwork(src, node_msg) => self.process_node_message(src, node_msg),
             GossipIn::AddEvent(ev) => self.add_event(ev),
-            GossipIn::NodeList(ids) => self.node_list(ids),
-            GossipIn::GetStorage => vec![GossipOut::Storage(self.storage.clone())],
-            GossipIn::SetStorage(data) => {
-                self.storage = data;
-                vec![]
-            }
-        })
+            GossipIn::UpdateNodeList(ids) => self.node_list(ids),
+        }
     }
 
     /// Processes a node to node message and returns zero or more
@@ -111,11 +131,9 @@ impl GossipEvents {
     /// Adds an event if it's not known yet or not too old.
     /// This will send out the event to all other nodes.
     pub fn add_event(&mut self, event: Event) -> Vec<GossipOut> {
-        if self.storage.add_event(event.clone()) {
-            return itertools::concat([
-                self.send_events(self.cfg.our_id, &[event]),
-                vec![GossipOut::Updated, GossipOut::Storage(self.storage.clone())],
-            ]);
+        if self.events.add_event(event.clone()) {
+            self.store();
+            return self.send_events(self.id, &[event]);
         }
         vec![]
     }
@@ -126,7 +144,7 @@ impl GossipEvents {
         events
             .into_iter()
             .inspect(|e| self.outstanding.retain(|os| os != &e.get_id()))
-            .filter(|e| self.storage.add_event(e.clone()))
+            .filter(|e| self.events.add_event(e.clone()))
             .collect()
     }
 
@@ -134,7 +152,7 @@ impl GossipEvents {
         self.nodes
             .0
             .iter()
-            .filter(|&&node_id| node_id != src && node_id != self.cfg.our_id)
+            .filter(|&&node_id| node_id != src && node_id != self.id)
             .map(|node_id| {
                 GossipOut::ToNetwork(
                     *node_id,
@@ -161,7 +179,7 @@ impl GossipEvents {
         let reply = ids
             .0
             .iter()
-            .filter(|&id| !self.nodes.0.contains(id) && id != &self.cfg.our_id)
+            .filter(|&id| !self.nodes.0.contains(id) && id != &self.id)
             .map(|&id| GossipOut::ToNetwork(id, ModuleMessage::RequestEventIDs))
             .collect();
         self.nodes = ids;
@@ -189,12 +207,9 @@ impl GossipEvents {
         // other nodes available yet. So it's not enough to check the 'output' variable
         // to know if the MessageOut::Updated needs to be sent or not.
         let events_out = self.add_events(events);
-        let mut output: Vec<GossipOut> = self.send_events(src, &events_out);
+        let output: Vec<GossipOut> = self.send_events(src, &events_out);
         if !events_out.is_empty() {
-            output.extend(vec![
-                GossipOut::Updated,
-                GossipOut::Storage(self.storage.clone()),
-            ]);
+            self.store();
         }
         output
     }
@@ -202,7 +217,7 @@ impl GossipEvents {
     /// Send the events to the other node. One or more of the requested
     /// events might be missing.
     pub fn node_request_events(&mut self, src: NodeID, ids: Vec<U256>) -> Vec<GossipOut> {
-        let events: Vec<Event> = self.storage.get_events_by_ids(ids);
+        let events: Vec<Event> = self.events.get_events_by_ids(ids);
         if !events.is_empty() {
             vec![GossipOut::ToNetwork(src, ModuleMessage::Events(events))]
         } else {
@@ -214,13 +229,13 @@ impl GossipEvents {
     pub fn node_request_event_list(&mut self, src: NodeID) -> Vec<GossipOut> {
         vec![GossipOut::ToNetwork(
             src,
-            ModuleMessage::KnownEventIDs(self.storage.event_ids()),
+            ModuleMessage::KnownEventIDs(self.events.event_ids()),
         )]
     }
 
     /// Returns all ids that are not in our storage
     pub fn filter_known_events(&self, eventids: Vec<U256>) -> Vec<U256> {
-        let our_ids = self.storage.event_ids();
+        let our_ids = self.events.event_ids();
         eventids
             .into_iter()
             .filter(|id| !our_ids.contains(id) && !self.outstanding.contains(id))
@@ -228,7 +243,7 @@ impl GossipEvents {
     }
 
     pub fn storage(&self) -> EventsStorage {
-        self.storage.clone()
+        self.events.clone()
     }
 
     /// Every tick clear the outstanding vector and request new event IDs.
@@ -242,14 +257,11 @@ impl GossipEvents {
     }
 }
 
-impl From<GossipIn> for GossipMessage {
-    fn from(msg: GossipIn) -> Self {
-        GossipMessage::Input(msg)
-    }
-}
-
-impl From<GossipOut> for GossipMessage {
-    fn from(msg: GossipOut) -> Self {
-        GossipMessage::Output(msg)
+#[platform_async_trait()]
+impl SubsystemHandler<GossipIn, GossipOut> for Messages {
+    async fn messages(&mut self, msgs: Vec<GossipIn>) -> Vec<GossipOut> {
+        msgs.into_iter()
+            .flat_map(|msg| self.process_message(msg))
+            .collect()
     }
 }
diff --git a/flmodules/src/lib.rs b/flmodules/src/lib.rs
index cd36484a..7d87fd39 100644
--- a/flmodules/src/lib.rs
+++ b/flmodules/src/lib.rs
@@ -3,21 +3,28 @@ use serde::{Deserialize, Serialize};
 bitflags! {
     #[derive(Clone, Copy, Serialize, Deserialize, PartialEq, Hash)]
     pub struct Modules: u32 {
-        const ENABLE_STAT = 0x1;
-        const ENABLE_RAND = 0x2;
-        const ENABLE_GOSSIP = 0x4;
-        const ENABLE_PING = 0x8;
-        const ENABLE_WEBPROXY = 0x10;
-        const ENABLE_WEBPROXY_REQUESTS = 0x20;
+        const STAT = 0x1;
+        const RAND = 0x2;
+        const GOSSIP = 0x4;
+        const PING = 0x8;
+        const WEBPROXY = 0x10;
+        const WEBPROXY_REQUESTS = 0x20;
+        const DHT_ROUTER = 0x40;
+        const DHT_STORAGE = 0x80;
     }
 }
 
+pub mod dht_router;
+pub mod dht_storage;
+pub mod flo;
+pub mod gossip_events;
+pub mod network;
 pub mod nodeconfig;
-pub mod template;
+pub mod router;
+pub mod ping;
 pub mod random_connections;
-pub mod gossip_events;
+pub mod template;
 pub mod timer;
-pub mod ping;
 pub mod web_proxy;
-pub mod network;
-pub mod overlay;
+
+pub mod testing;
diff --git a/flmodules/src/network/messages.rs b/flmodules/src/network/broker.rs
similarity index 65%
rename from flmodules/src/network/messages.rs
rename to flmodules/src/network/broker.rs
index f866c5d1..60cce444 100644
--- a/flmodules/src/network/messages.rs
+++ b/flmodules/src/network/broker.rs
@@ -1,9 +1,9 @@
 //! # Network related structures
 //!
-//! The basic structure here is [`NetworkBroker`], which handles all communications
+//! The basic structure here is [`Network`], which handles all communications
 //! with the signalling server and setting up of new WebRTC connections.
-//! As the [`NetworkBroker`] simply returns a [`Broker<NetworkMessage>`], a more
-//! user-friendly wrapper named [`Network`] exists, which is better suited for
+//! As the [`Network`] simply returns a [`Broker<NetworkMessage>`], a more
+//! user-friendly wrapper named [`NetworkWebRTC`] exists, which is better suited for
 //! usage in a non-[`Broker`] world.
 //!
 //! Both of these structures are best created with [`crate::network_start`] and
@@ -13,19 +13,19 @@ use core::panic;
 use itertools::concat;
 use std::{fmt, time::Duration};
 use thiserror::Error;
-use tokio::sync::mpsc::UnboundedReceiver;
+use tokio::sync::{mpsc::UnboundedReceiver, watch};
 use tokio_stream::StreamExt;
 
 use flarch::{
-    broker::{Broker, BrokerError, Subsystem, SubsystemHandler},
+    broker::{Broker, BrokerError, SubsystemHandler, TranslateFrom, TranslateInto},
     nodeids::{NodeID, U256},
     platform_async_trait,
     tasks::Interval,
     web_rtc::{
         messages::{ConnType, PeerInfo, SetupError, SignalingState},
         node_connection::{Direction, NCError, NCInput, NCOutput},
-        websocket::{WSClientInput, WSClientMessage, WSClientOutput},
-        WebRTCConnMessage,
+        websocket::{BrokerWSClient, WSClientIn, WSClientOut},
+        BrokerWebRTCConn, WebRTCConnInput, WebRTCConnOutput,
     },
 };
 
@@ -36,22 +36,7 @@ use crate::{
     nodeconfig::{NodeConfig, NodeInfo},
 };
 
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Debug, Clone, PartialEq)]
-/// A Message to/from the [`NetworkBroker`].
-/// The [`NetworkMessage::Call`] and [`NetworkMessage::Output`] messages are directly related to the [`NetworkBroker`], while
-/// the [`NetworkMessage::WebSocket`] and [`NetworkMessage::WebRTC`] messages are used to link to those modules.
-pub enum NetworkMessage {
-    /// A message to the [`NetworkBroker`]
-    Input(NetworkIn),
-    /// A return message from the [`NetworkBroker`]
-    Output(NetworkOut),
-    /// Messages to/from the WebSocket.
-    WebSocket(WSClientMessage),
-    /// Messages to/from the WebRTC subsystem.
-    WebRTC(WebRTCConnMessage),
-}
+pub type BrokerNetwork = Broker<NetworkIn, NetworkOut>;
 
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, PartialEq)]
@@ -59,7 +44,7 @@ pub enum NetworkMessage {
 /// Sending these messages will call the linked actions.
 pub enum NetworkIn {
     /// Sends a new text message to the node.
-    /// The [`NetworkBroker`] will try to set up a connection with the remote node,
+    /// The [`Network`] will try to set up a connection with the remote node,
     /// if no such connection exists yet.
     /// If the node is not connected to the signalling handler, nothing happens.
     MessageToNode(NodeID, String),
@@ -77,11 +62,13 @@ pub enum NetworkIn {
     Disconnect(NodeID),
     /// This message should be sent once a second to allow calculations of timeouts.
     Tick,
+    WebSocket(WSClientOut),
+    WebRTC(WebRTCConnOutput),
 }
 
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, PartialEq)]
-/// Messages sent from the [`NetworkBroker`] to the user.
+/// Messages sent from the [`Network`] to the user.
 pub enum NetworkOut {
     /// A new message has been received from the given node.
     MessageFromNode(NodeID, String),
@@ -94,73 +81,13 @@ pub enum NetworkOut {
     Connected(NodeID),
     /// A node has been disconnected.
     Disconnected(NodeID),
-}
-
-/// This is a user-friendly version of [`NetworkBroker`].
-/// Upon starting, it waits for the connection to the signalling server.
-/// It has a simple API to send and receive messages to other nodes.
-pub struct Network {
-    broker_net: Broker<NetworkMessage>,
-    tap: UnboundedReceiver<NetworkMessage>,
-}
-
-impl Network {
-    /// Takes a [`NetworkBroker`] and returns the wrapped [`Network`].
-    /// It waits for the [`NetworkBroker`] to be completely set up.
-    /// For this reason the [`NetworkBroker`] must not have been used before.
-    pub async fn start(mut broker_net: Broker<NetworkMessage>) -> Result<Self, NetworkError> {
-        let (mut tap, _) = broker_net.get_tap().await?;
-        let mut timeout = Interval::new_interval(Duration::from_secs(10));
-        timeout.next().await;
-        loop {
-            tokio::select! {
-                _ = timeout.next() => {
-                    return Err(NetworkError::SignallingServer);
-                }
-                msg = tap.recv() => {
-                    if matches!(msg, Some(NetworkMessage::Output(NetworkOut::NodeListFromWS(_)))){
-                        break;
-                    }
-                }
-            }
-        }
-        Ok(Self { broker_net, tap })
-    }
-
-    /// Wait for a message to be received from the network.
-    /// This method waits for a [`NetworkOut`] message to be received, which
-    /// are the only messages interesting for a user.
-    pub async fn recv(&mut self) -> NetworkOut {
-        loop {
-            let msg = self.tap.recv().await;
-            if let Some(NetworkMessage::Output(msg_reply)) = msg {
-                return msg_reply;
-            }
-        }
-    }
-
-    /// Send a message to the [`NetworkBroker`] asynchronously.
-    /// The message is of type [`NetworkIn`], as this is what the user can
-    /// send to the [`NetworkBroker`].
-    pub fn send(&mut self, msg: NetworkIn) -> Result<(), BrokerError> {
-        self.broker_net.emit_msg(NetworkMessage::Input(msg))
-    }
-
-    /// Tries to send a text-message to a remote node.
-    /// The [`NetworkBroker`] will start a connection with the node if there is none available.
-    /// If the remote node is not available, no error is returned.
-    pub fn send_msg(&mut self, dst: NodeID, msg: String) -> Result<(), BrokerError> {
-        self.send(NetworkIn::MessageToNode(dst, msg))
-    }
-
-    /// Requests an updated list of all connected nodes to the signalling server.
-    pub fn send_list_request(&mut self) -> Result<(), BrokerError> {
-        self.send(NetworkIn::WSUpdateListRequest)
-    }
+    /// This is used in the From and Into methods
+    WebSocket(WSClientIn),
+    WebRTC(WebRTCConnInput),
 }
 
 #[derive(Error, Debug)]
-/// Possible errors from the [`NetworkBroker`].
+/// Possible errors from the [`Network`].
 pub enum NetworkError {
     #[error("Connection not found")]
     ConnectionMissing,
@@ -178,58 +105,71 @@ pub enum NetworkError {
     Setup(#[from] SetupError),
 }
 
-/// The [`NetworkBroker`] handles setting up webRTC connections for all connected nodes.
+/// The [`Network`] handles setting up webRTC connections for all connected nodes.
 /// It can handle incoming and outgoing connections.
 ///
 /// In this version, all connection setup (signalling) is going through a websocket.
 /// In a next version, it should also be possible to setup new connections (signalling) through existing WebRTC
 /// connections: If A and B are connected, and B and C are connected, C can connect to A by using
 /// B as a signalling server.
-pub struct NetworkBroker {
-    node_config: NodeConfig,
-    get_update: usize,
-    connections: Vec<NodeID>,
+pub struct Network {
+    pub broker: BrokerNetwork,
+    pub connections: watch::Receiver<Vec<NodeID>>,
 }
 
 const UPDATE_INTERVAL: usize = 10;
 
-impl NetworkBroker {
-    /// Starts a new [`NetworkBroker`] and returns a [`Broker<NetworkMessage>`] which can be linked
+impl Network {
+    /// Starts a new [`Network`] and returns a [`BrokerNetwork`] which can be linked
     /// to other brokers.
-    /// If you just need a simple send/receive interface, use the [`Network`].
+    /// If you just need a simple send/receive interface, use the [`NetworkWebRTC`].
     pub async fn start(
         node_config: NodeConfig,
-        ws: Broker<WSClientMessage>,
-        web_rtc: Broker<WebRTCConnMessage>,
-    ) -> Result<Broker<NetworkMessage>, NetworkError> {
+        ws: BrokerWSClient,
+        web_rtc: BrokerWebRTCConn,
+    ) -> Result<Self, NetworkError> {
         let mut broker = Broker::new();
-        broker
-            .add_subsystem(Subsystem::Handler(Box::new(Self {
+        let (messages, connections) = Messages::start(node_config);
+        broker.add_handler(Box::new(messages)).await?;
+
+        broker.link_bi(ws).await?;
+        broker.link_bi(web_rtc).await?;
+
+        Ok(Self {
+            broker,
+            connections,
+        })
+    }
+}
+
+struct Messages {
+    node_config: NodeConfig,
+    get_update: usize,
+    connections: Vec<NodeID>,
+    tx: Option<watch::Sender<Vec<NodeID>>>,
+}
+
+impl Messages {
+    pub fn start(node_config: NodeConfig) -> (Self, watch::Receiver<Vec<NodeID>>) {
+        let (tx, rx) = watch::channel(vec![]);
+        (
+            Self {
                 node_config,
                 get_update: UPDATE_INTERVAL,
                 connections: vec![],
-            })))
-            .await?;
-        broker
-            .link_bi(ws, Box::new(Self::from_ws), Box::new(Self::to_ws))
-            .await?;
-        broker
-            .link_bi(
-                web_rtc,
-                Box::new(Self::from_web_rtc),
-                Box::new(Self::to_web_rtc),
-            )
-            .await?;
-        Ok(broker)
+                tx: Some(tx),
+            },
+            rx,
+        )
     }
 
     /// Processes incoming messages from the signalling server.
     /// This can be either messages requested by this node, or connection
     /// setup requests from another node.
-    async fn msg_ws(&mut self, msg: WSClientOutput) -> Vec<NetworkMessage> {
+    async fn msg_ws(&mut self, msg: WSClientOut) -> Vec<NetworkOut> {
         let msg_node_str = match msg {
-            WSClientOutput::Message(msg) => msg,
-            WSClientOutput::Error(e) => {
+            WSClientOut::Message(msg) => msg,
+            WSClientOut::Error(e) => {
                 log::warn!("Websocket client error: {e}");
                 return vec![];
             }
@@ -260,7 +200,7 @@ impl NetworkBroker {
                 ]
             }
             WSSignalMessageToNode::ListIDsReply(list) => {
-                vec![NetworkOut::NodeListFromWS(list).into()]
+                vec![NetworkOut::NodeListFromWS(list)]
             }
             WSSignalMessageToNode::PeerSetup(pi) => {
                 let own_id = self.node_config.info.get_id();
@@ -277,16 +217,16 @@ impl NetworkBroker {
                     } else {
                         vec![]
                     },
-                    vec![NetworkMessage::from_nc(
-                        NCInput::Setup(pi.get_direction(&own_id), pi.message),
+                    vec![NetworkOut::WebRTC(WebRTCConnInput::Message(
                         remote_node,
-                    )],
+                        NCInput::Setup(pi.get_direction(&own_id), pi.message),
+                    ))],
                 ])
             }
         }
     }
 
-    async fn msg_call(&mut self, msg: NetworkIn) -> Result<Vec<NetworkMessage>, NetworkError> {
+    async fn msg_call(&mut self, msg: NetworkIn) -> Result<Vec<NetworkOut>, NetworkError> {
         match msg {
             NetworkIn::MessageToNode(id, msg_str) => {
                 log::trace!(
@@ -303,11 +243,14 @@ impl NetworkBroker {
                     } else {
                         vec![]
                     },
-                    vec![NetworkMessage::from_nc(NCInput::Text(msg_str), id)],
+                    vec![NetworkOut::WebRTC(WebRTCConnInput::Message(
+                        id,
+                        NCInput::Text(msg_str),
+                    ))],
                 ]))
             }
-            NetworkIn::StatsToWS(ss) => Ok(WSSignalMessageFromNode::NodeStats(ss.clone()).into()),
-            NetworkIn::WSUpdateListRequest => Ok(WSSignalMessageFromNode::ListIDsRequest.into()),
+            NetworkIn::StatsToWS(ss) => WSSignalMessageFromNode::NodeStats(ss.clone()).into(),
+            NetworkIn::WSUpdateListRequest => WSSignalMessageFromNode::ListIDsRequest.into(),
             NetworkIn::Connect(id) => Ok(self.connect(&id)),
             NetworkIn::Disconnect(id) => Ok(self.disconnect(&id).await),
             NetworkIn::Tick => {
@@ -319,14 +262,15 @@ impl NetworkBroker {
                     })
                     .unwrap_or(vec![]))
             }
+            _ => Ok(vec![]),
         }
     }
 
-    async fn msg_node(&mut self, id: U256, msg_nc: NCOutput) -> Vec<NetworkMessage> {
+    async fn msg_node(&mut self, id: U256, msg_nc: NCOutput) -> Vec<NetworkOut> {
         match msg_nc {
-            NCOutput::Connected(_) => vec![NetworkOut::Connected(id).into()],
-            NCOutput::Disconnected(_) => vec![NetworkOut::Disconnected(id).into()],
-            NCOutput::Text(msg) => vec![NetworkOut::MessageFromNode(id, msg).into()],
+            NCOutput::Connected(_) => vec![NetworkOut::Connected(id)],
+            NCOutput::Disconnected(_) => vec![NetworkOut::Disconnected(id)],
+            NCOutput::Text(msg) => vec![NetworkOut::MessageFromNode(id, msg)],
             NCOutput::State(dir, state) => {
                 vec![NetworkOut::ConnectionState(NetworkConnectionState {
                     id,
@@ -339,8 +283,7 @@ impl NetworkBroker {
                         tx_bytes: state.tx_bytes,
                         delay_ms: state.delay_ms,
                     },
-                })
-                .into()]
+                })]
             }
             NCOutput::Setup(dir, pm) => {
                 let mut id_init = self.node_config.info.get_id();
@@ -355,102 +298,170 @@ impl NetworkBroker {
                 })
                 .into()]
             }
+            _ => vec![],
         }
     }
 
     /// Connect to the given node.
-    fn connect(&mut self, dst: &U256) -> Vec<NetworkMessage> {
-        let mut out = vec![NetworkOut::Connected(*dst).into()];
+    fn connect(&mut self, dst: &U256) -> Vec<NetworkOut> {
+        let mut out = vec![NetworkOut::Connected(*dst)];
         if self.connections.contains(dst) {
             log::warn!("Already connected to {}", dst);
         } else {
             self.connections.push(dst.clone());
-            out.push(NetworkMessage::WebRTC(WebRTCConnMessage::Connect(*dst)));
+            self.send_connections();
+            out.push(NetworkOut::WebRTC(WebRTCConnInput::Connect(*dst)));
         }
         out
     }
 
     /// Disconnects from a given node.
-    async fn disconnect(&mut self, dst: &U256) -> Vec<NetworkMessage> {
-        let mut out = vec![NetworkOut::Disconnected(*dst).into()];
+    async fn disconnect(&mut self, dst: &U256) -> Vec<NetworkOut> {
+        let mut out = vec![NetworkOut::Disconnected(*dst)];
         if !self.connections.contains(dst) {
             log::warn!("Already disconnected from {}", dst);
         } else {
             self.connections.retain(|id| id != dst);
-            out.push(NetworkMessage::from_nc(NCInput::Disconnect, *dst));
+            self.send_connections();
+            out.push(NetworkOut::WebRTC(WebRTCConnInput::Message(
+                *dst,
+                NCInput::Disconnect,
+            )));
         }
         out
     }
 
-    // Translator functions
-
-    fn to_ws(msg: NetworkMessage) -> Option<WSClientMessage> {
-        match msg {
-            NetworkMessage::WebSocket(msg) => matches!(msg, WSClientMessage::Input(_)).then(|| msg),
-            _ => None,
-        }
-    }
-
-    fn from_ws(msg: WSClientMessage) -> Option<NetworkMessage> {
-        matches!(msg, WSClientMessage::Output(_)).then(|| NetworkMessage::WebSocket(msg))
-    }
-
-    fn to_web_rtc(msg: NetworkMessage) -> Option<WebRTCConnMessage> {
-        if let NetworkMessage::WebRTC(msg_webrtc) = msg {
-            match msg_webrtc {
-                WebRTCConnMessage::OutputNC(_, _) => None,
-                _ => Some(msg_webrtc),
-            }
-        } else {
-            None
-        }
-    }
-
-    fn from_web_rtc(msg: WebRTCConnMessage) -> Option<NetworkMessage> {
-        matches!(msg, WebRTCConnMessage::OutputNC(_, _)).then(|| NetworkMessage::WebRTC(msg))
+    fn send_connections(&mut self) {
+        self.tx.clone().map(|tx| {
+            tx.send(self.connections.clone())
+                .is_err()
+                .then(|| self.tx = None)
+        });
     }
 }
 
 #[platform_async_trait()]
-impl SubsystemHandler<NetworkMessage> for NetworkBroker {
-    async fn messages(&mut self, bms: Vec<NetworkMessage>) -> Vec<NetworkMessage> {
+impl SubsystemHandler<NetworkIn, NetworkOut> for Messages {
+    async fn messages(&mut self, msgs: Vec<NetworkIn>) -> Vec<NetworkOut> {
         let mut out = vec![];
-        for msg in bms {
+        for msg in msgs {
             log::trace!(
                 "{}: Processing message {msg}",
                 self.node_config.info.get_id()
             );
             match msg {
-                NetworkMessage::Input(c) => out.extend(self.msg_call(c).await.unwrap()),
-                NetworkMessage::WebSocket(WSClientMessage::Output(ws)) => {
-                    out.extend(self.msg_ws(ws).await)
-                }
-                NetworkMessage::WebRTC(WebRTCConnMessage::OutputNC(id, msg)) => {
+                NetworkIn::WebSocket(ws) => out.extend(self.msg_ws(ws).await),
+                NetworkIn::WebRTC(WebRTCConnOutput::Message(id, msg)) => {
                     out.extend(self.msg_node(id, msg).await)
                 }
-                _ => {}
+                _ => out.extend(self.msg_call(msg).await.unwrap()),
             }
         }
         out
     }
 }
 
+/// This is a user-friendly version of [`Network`].
+/// Upon starting, it waits for the connection to the signalling server.
+/// It has a simple API to send and receive messages to other nodes.
+pub struct NetworkWebRTC {
+    broker_net: BrokerNetwork,
+    tap: UnboundedReceiver<NetworkOut>,
+}
 
-impl fmt::Display for NetworkMessage {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+impl NetworkWebRTC {
+    /// Takes a [`Network`] and returns the wrapped [`Network`].
+    /// It waits for the [`Network`] to be completely set up.
+    /// For this reason the [`Network`] must not have been used before.
+    pub async fn start(mut broker_net: BrokerNetwork) -> Result<Self, NetworkError> {
+        let (mut tap, _) = broker_net.get_tap_out().await?;
+        let mut timeout = Interval::new_interval(Duration::from_secs(10));
+        timeout.next().await;
+        loop {
+            tokio::select! {
+                _ = timeout.next() => {
+                    return Err(NetworkError::SignallingServer);
+                }
+                msg = tap.recv() => {
+                    if matches!(msg, Some(NetworkOut::NodeListFromWS(_))){
+                        break;
+                    }
+                }
+            }
+        }
+        Ok(Self { broker_net, tap })
+    }
+
+    /// Wait for a message to be received from the network.
+    /// This method waits for a [`NetworkOut`] message to be received, which
+    /// are the only messages interesting for a user.
+    pub async fn recv(&mut self) -> NetworkOut {
+        loop {
+            let msg = self.tap.recv().await;
+            if let Some(msg_reply) = msg {
+                return msg_reply;
+            }
+        }
+    }
+
+    /// Send a message to the [`Network`] asynchronously.
+    /// The message is of type [`NetworkIn`], as this is what the user can
+    /// send to the [`Network`].
+    pub fn send(&mut self, msg: NetworkIn) -> Result<(), BrokerError> {
+        self.broker_net.emit_msg_in(msg)
+    }
+
+    /// Tries to send a text-message to a remote node.
+    /// The [`Network`] will start a connection with the node if there is none available.
+    /// If the remote node is not available, no error is returned.
+    pub fn send_msg(&mut self, dst: NodeID, msg: String) -> Result<(), BrokerError> {
+        self.send(NetworkIn::MessageToNode(dst, msg))
+    }
+
+    /// Requests an updated list of all connected nodes to the signalling server.
+    pub fn send_list_request(&mut self) -> Result<(), BrokerError> {
+        self.send(NetworkIn::WSUpdateListRequest)
+    }
+}
+
+impl From<WSSignalMessageFromNode> for NetworkOut {
+    fn from(msg: WSSignalMessageFromNode) -> Self {
+        NetworkOut::WebSocket(WSClientIn::Message(serde_json::to_string(&msg).unwrap()))
+    }
+}
+
+impl<T> From<WSSignalMessageFromNode> for Result<Vec<NetworkOut>, T> {
+    fn from(msg: WSSignalMessageFromNode) -> Self {
+        Ok(vec![msg.into()])
+    }
+}
+
+impl TranslateFrom<WSClientOut> for NetworkIn {
+    fn translate(msg: WSClientOut) -> Option<Self> {
+        Some(NetworkIn::WebSocket(msg))
+    }
+}
+impl TranslateInto<WSClientIn> for NetworkOut {
+    fn translate(self) -> Option<WSClientIn> {
         match self {
-            NetworkMessage::Input(c) => write!(f, "Call({})", c),
-            NetworkMessage::Output(r) => write!(f, "Reply({})", r),
-            NetworkMessage::WebSocket(_) => write!(f, "WebSocket()"),
-            NetworkMessage::WebRTC(_) => write!(f, "WebRTC()"),
+            NetworkOut::WebSocket(msg) => Some(msg),
+            _ => None,
         }
     }
 }
 
-impl NetworkMessage {
-    /// Convert a [`NCInput`] to Self
-    pub fn from_nc(input: NCInput, dst: NodeID) -> Self {
-        Self::WebRTC(WebRTCConnMessage::InputNC(dst, input))
+impl TranslateFrom<WebRTCConnOutput> for NetworkIn {
+    fn translate(msg: WebRTCConnOutput) -> Option<Self> {
+        Some(NetworkIn::WebRTC(msg))
+    }
+}
+
+impl TranslateInto<WebRTCConnInput> for NetworkOut {
+    fn translate(self) -> Option<WebRTCConnInput> {
+        match self {
+            NetworkOut::WebRTC(msg_webrtc) => Some(msg_webrtc),
+            _ => None,
+        }
     }
 }
 
@@ -463,24 +474,12 @@ impl fmt::Display for NetworkIn {
             NetworkIn::Connect(_) => write!(f, "Connect()"),
             NetworkIn::Disconnect(_) => write!(f, "Disconnect()"),
             NetworkIn::Tick => write!(f, "Tick"),
+            NetworkIn::WebSocket(_) => write!(f, "WebSocket"),
+            NetworkIn::WebRTC(_) => write!(f, "WebRTC"),
         }
     }
 }
 
-impl From<NetworkIn> for NetworkMessage {
-    fn from(msg: NetworkIn) -> Self {
-        Self::Input(msg)
-    }
-}
-
-impl From<WSSignalMessageFromNode> for Vec<NetworkMessage> {
-    fn from(msg: WSSignalMessageFromNode) -> Self {
-        vec![NetworkMessage::WebSocket(
-            WSClientInput::Message(serde_json::to_string(&msg).unwrap()).into(),
-        )]
-    }
-}
-
 impl fmt::Display for NetworkOut {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
@@ -489,16 +488,12 @@ impl fmt::Display for NetworkOut {
             NetworkOut::ConnectionState(_) => write!(f, "ConnectionState()"),
             NetworkOut::Connected(_) => write!(f, "Connected()"),
             NetworkOut::Disconnected(_) => write!(f, "Disconnected()"),
+            NetworkOut::WebSocket(_) => write!(f, "WebSocket"),
+            NetworkOut::WebRTC(_) => write!(f, "WebRTC"),
         }
     }
 }
 
-impl From<NetworkOut> for NetworkMessage {
-    fn from(msg: NetworkOut) -> Self {
-        Self::Output(msg)
-    }
-}
-
 #[derive(Debug, Clone, PartialEq)]
 /// The connection state of a remote node.
 pub struct NetworkConnectionState {
@@ -510,25 +505,6 @@ pub struct NetworkConnectionState {
     pub s: ConnStats,
 }
 
-impl From<NetworkConnectionState> for NetworkMessage {
-    fn from(msg: NetworkConnectionState) -> Self {
-        NetworkOut::ConnectionState(msg).into()
-    }
-}
-
-impl From<WSSignalMessageFromNode> for NetworkMessage {
-    fn from(msg: WSSignalMessageFromNode) -> Self {
-        Into::<WSClientMessage>::into(WSClientInput::Message(serde_json::to_string(&msg).unwrap()))
-            .into()
-    }
-}
-
-impl From<WSClientMessage> for NetworkMessage {
-    fn from(msg: WSClientMessage) -> Self {
-        NetworkMessage::WebSocket(msg)
-    }
-}
-
 #[derive(Debug, Clone, PartialEq)]
 /// Some statistics on the connection.
 /// Not all fields are usable in all implementations.
diff --git a/flmodules/src/network/mod.rs b/flmodules/src/network/mod.rs
index 11928d12..de8eebb4 100644
--- a/flmodules/src/network/mod.rs
+++ b/flmodules/src/network/mod.rs
@@ -162,13 +162,13 @@
 //! platform.
 //! It can be used for the browser or for node.
 
+use broker::Network;
 use thiserror::Error;
 
-pub mod messages;
+pub mod broker;
 pub mod signal;
 
 use flarch::{
-    broker::Broker,
     broker::BrokerError,
     web_rtc::{
         connection::ConnectionConfig, web_rtc_setup::web_rtc_spawner,
@@ -176,7 +176,6 @@ use flarch::{
     },
 };
 
-use crate::network::messages::NetworkMessage;
 use crate::nodeconfig::NodeConfig;
 
 #[derive(Error, Debug)]
@@ -190,19 +189,16 @@ pub enum NetworkSetupError {
     WebSocketClient(#[from] WSClientError),
     /// Generic network error
     #[error(transparent)]
-    Network(#[from] messages::NetworkError),
+    Network(#[from] broker::NetworkError),
     #[cfg(target_family = "unix")]
     /// Problem in the websocket server
     #[error(transparent)]
     WebSocketServer(#[from] flarch::web_rtc::websocket::WSSError),
 }
 
-#[cfg(feature = "testing")]
-pub mod testing;
-
-/// Starts a new [`broker::Broker<NetworkMessage>`] with a given `node`- and `connection`-configuration.
+/// Starts a new [`BrokerNetwork`] with a given `node`- and `connection`-configuration.
 /// This returns a raw broker which is mostly suited to connect to other brokers.
-/// If you need an easier access to the WebRTC network, use [`network_start`], which returns
+/// If you need an easier access to the WebRTC network, use [`network_webrtc_start`], which returns
 /// a structure with a more user-friendly API.
 ///
 /// # Example
@@ -212,15 +208,15 @@ pub mod testing;
 ///   let net = network_broker_start();
 /// }
 /// ```
-pub async fn network_broker_start(
+pub async fn network_start(
     node: NodeConfig,
     connection: ConnectionConfig,
-) -> Result<Broker<NetworkMessage>, NetworkSetupError> {
-    use crate::network::messages::NetworkBroker;
+) -> Result<Network, NetworkSetupError> {
+    use crate::network::broker::Network;
 
     let ws = WebSocketClient::connect(&connection.signal()).await?;
     let webrtc = WebRTCConn::new(web_rtc_spawner(connection)).await?;
-    Ok(NetworkBroker::start(node.clone(), ws, webrtc).await?)
+    Ok(Network::start(node.clone(), ws, webrtc).await?)
 }
 
 /// Starts a new connection to the signalling server using the `node`-
@@ -228,11 +224,11 @@ pub async fn network_broker_start(
 /// It returns a user-friendly API that can be used to send and
 /// receive messages.
 /// If you want to connect the network with other brokers, then use
-/// the [`network_broker_start`] method.
-pub async fn network_start(
+/// the [`network_start`] method.
+pub async fn network_webrtc_start(
     node: NodeConfig,
     connection: ConnectionConfig,
-) -> Result<messages::Network, NetworkSetupError> {
-    let net_broker = network_broker_start(node, connection).await?;
-    Ok(messages::Network::start(net_broker).await?)
+) -> Result<broker::NetworkWebRTC, NetworkSetupError> {
+    let net = network_start(node, connection).await?;
+    Ok(broker::NetworkWebRTC::start(net.broker).await?)
 }
diff --git a/flmodules/src/network/signal.rs b/flmodules/src/network/signal.rs
index a91fc639..8f2145df 100644
--- a/flmodules/src/network/signal.rs
+++ b/flmodules/src/network/signal.rs
@@ -49,49 +49,43 @@
 
 use bimap::BiMap;
 use serde::{Deserialize, Serialize};
-use serde_with::{base64::Base64, serde_as};
+use serde_with::{hex::Hex, serde_as};
 use std::{
     collections::HashMap,
     fmt::{Error, Formatter},
 };
 
+use crate::{nodeconfig::NodeInfo, timer::Timer};
 use flarch::{
-    broker::{Broker, BrokerError, Subsystem, SubsystemHandler}, nodeids::{NodeID, U256}, platform_async_trait, web_rtc::{
+    broker::{Broker, BrokerError, SubsystemHandler, TranslateFrom, TranslateInto},
+    nodeids::{NodeID, U256},
+    platform_async_trait,
+    web_rtc::{
         messages::PeerInfo,
-        websocket::{WSServerInput, WSServerMessage, WSServerOutput},
-    }
-};
-use crate::{
-    nodeconfig::NodeInfo,
-    timer::{TimerBroker, TimerMessage},
+        websocket::{BrokerWSServer, WSServerIn, WSServerOut},
+    },
 };
 
-#[derive(Clone, Debug)]
-/// The possible messages for the signalling server broker, including the
-/// connected websocket messages.
-pub enum SignalMessage {
-    /// Messages being sent to the signalling server
-    Input(SignalInput),
-    /// Messages coming from the signalling server
-    Output(SignalOutput),
-    /// Messages exchanged with the WebSocketServer
-    WSServer(WSServerMessage),
-}
+pub type BrokerSignal = Broker<SignalIn, SignalOut>;
 
 #[derive(Clone)]
 /// Messages for the signalling server
-pub enum SignalInput {
+pub enum SignalIn {
     /// One minute timer clock for removing stale connections
     Timer,
+    /// Message coming from the WebSocket server.
+    WSServer(WSServerOut),
 }
 
 #[derive(Clone, Debug)]
 /// Messages sent by the signalling server to an evenutal listener
-pub enum SignalOutput {
+pub enum SignalOut {
     /// Statistics about the connected nodes
     NodeStats(Vec<NodeStat>),
     /// Whenever a new node has joined the signalling server
     NewNode(NodeID),
+    /// Messages going to the WebSocketServer
+    WSServer(WSServerIn),
     /// If the server has been stopped
     Stopped,
 }
@@ -118,62 +112,41 @@ impl SignalServer {
     /// `ttl_minutes` is the minimum time an idle node will be
     /// kept in the list.
     pub async fn new(
-        ws_server: Broker<WSServerMessage>,
+        ws_server: BrokerWSServer,
         ttl_minutes: u64,
-    ) -> Result<Broker<SignalMessage>, BrokerError> {
+    ) -> Result<BrokerSignal, BrokerError> {
         let mut broker = Broker::new();
         broker
-            .add_subsystem(Subsystem::Handler(Box::new(SignalServer {
+            .add_handler(Box::new(SignalServer {
                 connection_ids: BiMap::new(),
                 info: HashMap::new(),
                 ttl: HashMap::new(),
                 // Add 2 to the ttl_minutes to make sure that nodes are kept at least
                 // 1 minute in the list.
                 ttl_minutes: ttl_minutes + 2,
-            })))
-            .await?;
-        broker
-            .link_bi(
-                ws_server,
-                Box::new(Self::link_wss_ss),
-                Box::new(Self::link_ss_wss),
-            )
+            }))
             .await?;
-        TimerBroker::start()
+        broker.link_bi(ws_server).await?;
+        Timer::start()
             .await?
-            .forward(
-                broker.clone(),
-                Box::new(|msg| {
-                    matches!(msg, TimerMessage::Minute)
-                        .then(|| SignalMessage::Input(SignalInput::Timer))
-                }),
-            )
-            .await;
+            .tick_minute(broker.clone(), SignalIn::Timer)
+            .await?;
         Ok(broker)
     }
 
-    fn link_wss_ss(msg: WSServerMessage) -> Option<SignalMessage> {
-        matches!(msg, WSServerMessage::Output(_)).then(|| SignalMessage::WSServer(msg))
-    }
-
-    fn link_ss_wss(msg: SignalMessage) -> Option<WSServerMessage> {
-        if let SignalMessage::WSServer(msg_wss) = msg {
-            matches!(msg_wss, WSServerMessage::Input(_)).then(|| msg_wss)
-        } else {
-            None
-        }
-    }
-
-    fn msg_in(&mut self, msg_in: SignalInput) -> Vec<SignalMessage> {
+    fn msg_in(&mut self, msg_in: SignalIn) -> Vec<SignalOut> {
         match msg_in {
-            SignalInput::Timer => self.msg_in_timer(),
+            SignalIn::Timer => {
+                self.msg_in_timer();
+                vec![]
+            }
+            SignalIn::WSServer(msg_wss) => self.msg_wss(msg_wss),
         }
-        vec![]
     }
 
-    fn msg_wss(&mut self, msg: WSServerOutput) -> Vec<SignalMessage> {
+    fn msg_wss(&mut self, msg: WSServerOut) -> Vec<SignalOut> {
         match msg {
-            WSServerOutput::Message(index, msg_s) => {
+            WSServerOut::Message(index, msg_s) => {
                 self.ttl
                     .entry(index.clone())
                     .and_modify(|ttl| *ttl = self.ttl_minutes);
@@ -181,9 +154,9 @@ impl SignalServer {
                     return self.msg_ws_process(index, msg_ws);
                 }
             }
-            WSServerOutput::NewConnection(index) => return self.msg_ws_connect(index),
-            WSServerOutput::Disconnection(id) => self.remove_node(id),
-            WSServerOutput::Stopped => return vec![SignalMessage::Output(SignalOutput::Stopped)],
+            WSServerOut::NewConnection(index) => return self.msg_ws_connect(index),
+            WSServerOut::Disconnection(id) => self.remove_node(id),
+            WSServerOut::Stopped => return vec![SignalOut::Stopped],
         }
         vec![]
     }
@@ -204,7 +177,7 @@ impl SignalServer {
 
     // The id is the challange until the announcement succeeds. Then ws_announce calls
     // set_cb_message again to create a new callback using the node-id as id.
-    fn msg_ws_process(&mut self, index: usize, msg: WSSignalMessageFromNode) -> Vec<SignalMessage> {
+    fn msg_ws_process(&mut self, index: usize, msg: WSSignalMessageFromNode) -> Vec<SignalOut> {
         match msg {
             WSSignalMessageFromNode::Announce(ann) => self.ws_announce(index, ann),
             WSSignalMessageFromNode::ListIDsRequest => self.ws_list_ids(index),
@@ -213,7 +186,7 @@ impl SignalServer {
         }
     }
 
-    fn msg_ws_connect(&mut self, index: usize) -> Vec<SignalMessage> {
+    fn msg_ws_connect(&mut self, index: usize) -> Vec<SignalOut> {
         log::debug!("Sending challenge to new connection");
         let challenge = U256::rnd();
         self.connection_ids.insert(challenge, index);
@@ -221,10 +194,13 @@ impl SignalServer {
         let challenge_msg =
             serde_json::to_string(&WSSignalMessageToNode::Challenge(SIGNAL_VERSION, challenge))
                 .unwrap();
-        vec![WSServerInput::Message(index, challenge_msg).into()]
+        vec![SignalOut::WSServer(WSServerIn::Message(
+            index,
+            challenge_msg,
+        ))]
     }
 
-    fn ws_announce(&mut self, index: usize, msg: MessageAnnounce) -> Vec<SignalMessage> {
+    fn ws_announce(&mut self, index: usize, msg: MessageAnnounce) -> Vec<SignalOut> {
         let challenge = match self.connection_ids.get_by_right(&index) {
             Some(id) => id,
             None => {
@@ -241,10 +217,10 @@ impl SignalServer {
 
         log::info!("Registration of node-id {}: {}", id, msg.node_info.name);
         self.info.insert(id, msg.node_info);
-        vec![SignalOutput::NewNode(id).into()]
+        vec![SignalOut::NewNode(id)]
     }
 
-    fn ws_list_ids(&mut self, id: usize) -> Vec<SignalMessage> {
+    fn ws_list_ids(&mut self, id: usize) -> Vec<SignalOut> {
         log::info!("Current list is: {:?}", self.info.values());
         self.send_msg_node(
             id,
@@ -252,7 +228,7 @@ impl SignalServer {
         )
     }
 
-    fn ws_peer_setup(&mut self, index: usize, pi: PeerInfo) -> Vec<SignalMessage> {
+    fn ws_peer_setup(&mut self, index: usize, pi: PeerInfo) -> Vec<SignalOut> {
         let id = match self.connection_ids.get_by_right(&index) {
             Some(id) => id,
             None => {
@@ -269,12 +245,15 @@ impl SignalServer {
         vec![]
     }
 
-    fn ws_node_stats(&mut self, ns: Vec<NodeStat>) -> Vec<SignalMessage> {
-        vec![SignalOutput::NodeStats(ns).into()]
+    fn ws_node_stats(&mut self, ns: Vec<NodeStat>) -> Vec<SignalOut> {
+        vec![SignalOut::NodeStats(ns)]
     }
 
-    fn send_msg_node(&self, index: usize, msg: WSSignalMessageToNode) -> Vec<SignalMessage> {
-        vec![WSServerInput::Message(index, serde_json::to_string(&msg).unwrap()).into()]
+    fn send_msg_node(&self, index: usize, msg: WSSignalMessageToNode) -> Vec<SignalOut> {
+        vec![SignalOut::WSServer(WSServerIn::Message(
+            index,
+            serde_json::to_string(&msg).unwrap(),
+        ))]
     }
 
     fn remove_node(&mut self, index: usize) {
@@ -286,19 +265,24 @@ impl SignalServer {
 }
 
 #[platform_async_trait()]
-impl SubsystemHandler<SignalMessage> for SignalServer {
-    async fn messages(&mut self, from_broker: Vec<SignalMessage>) -> Vec<SignalMessage> {
-        let mut out = vec![];
-        for msg in from_broker {
-            match msg {
-                SignalMessage::Input(msg_in) => out.extend(self.msg_in(msg_in)),
-                SignalMessage::WSServer(WSServerMessage::Output(msg_wss)) => {
-                    out.extend(self.msg_wss(msg_wss))
-                }
-                _ => {}
-            }
+impl SubsystemHandler<SignalIn, SignalOut> for SignalServer {
+    async fn messages(&mut self, msgs: Vec<SignalIn>) -> Vec<SignalOut> {
+        msgs.into_iter().flat_map(|msg| self.msg_in(msg)).collect()
+    }
+}
+
+impl TranslateFrom<WSServerOut> for SignalIn {
+    fn translate(msg: WSServerOut) -> Option<Self> {
+        Some(SignalIn::WSServer(msg))
+    }
+}
+impl TranslateInto<WSServerIn> for SignalOut {
+    fn translate(self) -> Option<WSServerIn> {
+        if let SignalOut::WSServer(msg_wss) = self {
+            Some(msg_wss)
+        } else {
+            None
         }
-        out
     }
 }
 
@@ -372,7 +356,7 @@ pub struct MessageAnnounce {
     /// Information about the remote node.
     /// The [`NodeInfo.get_id()`] will be used as the ID of this node.
     pub node_info: NodeInfo,
-    #[serde_as(as = "Base64")]
+    #[serde_as(as = "Hex")]
     /// The signature of the challenge with the private key of the node.
     pub signature: Vec<u8>,
 }
@@ -390,41 +374,11 @@ pub struct NodeStat {
     pub ping_rx: u32,
 }
 
-impl std::fmt::Debug for SignalInput {
+impl std::fmt::Debug for SignalIn {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
         match self {
-            // SignalInput::WebSocket(_) => write!(f, "WebSocket"),
-            SignalInput::Timer => write!(f, "Timer"),
+            SignalIn::WSServer(_) => write!(f, "WebSocket"),
+            SignalIn::Timer => write!(f, "Timer"),
         }
     }
 }
-
-impl From<WSServerMessage> for SignalMessage {
-    fn from(msg: WSServerMessage) -> Self {
-        SignalMessage::WSServer(msg)
-    }
-}
-
-impl From<WSServerInput> for SignalMessage {
-    fn from(msg: WSServerInput) -> Self {
-        SignalMessage::WSServer(msg.into())
-    }
-}
-
-impl From<WSServerOutput> for SignalMessage {
-    fn from(msg: WSServerOutput) -> Self {
-        SignalMessage::WSServer(msg.into())
-    }
-}
-
-impl From<SignalInput> for SignalMessage {
-    fn from(msg: SignalInput) -> Self {
-        SignalMessage::Input(msg)
-    }
-}
-
-impl From<SignalOutput> for SignalMessage {
-    fn from(msg: SignalOutput) -> Self {
-        SignalMessage::Output(msg)
-    }
-}
diff --git a/flmodules/src/network/testing.rs b/flmodules/src/network/testing.rs
deleted file mode 100644
index 0f6c9186..00000000
--- a/flmodules/src/network/testing.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use flarch::{
-    broker::{Broker, BrokerError, Subsystem, SubsystemHandler, Translate},
-    nodeids::U256,
-    platform_async_trait,
-};
-
-use super::messages::{NetworkIn, NetworkOut, NetworkMessage};
-use crate::nodeconfig::{NodeConfig, NodeInfo};
-
-pub struct NetworkBrokerSimul {
-    nsh_broker: Broker<NSHubMessage>,
-}
-
-impl NetworkBrokerSimul {
-    pub async fn new() -> Result<Self, BrokerError> {
-        let nsh_broker = NSHub::new().await?;
-        Ok(Self { nsh_broker })
-    }
-
-    pub async fn new_node(&mut self) -> Result<(NodeConfig, Broker<NetworkMessage>), BrokerError> {
-        let nc = NodeConfig::new();
-        let nc_id = nc.info.get_id();
-        let mut nm_broker = Broker::new();
-
-        nm_broker
-            .link_bi(
-                self.nsh_broker.clone(),
-                Self::nsh_net(nc_id.clone()),
-                Self::net_nsh(nc_id),
-            )
-            .await?;
-        self.nsh_broker
-            .emit_msg(NSHubMessage::NewClient(nc.info.clone()))?;
-
-        Ok((nc, nm_broker))
-    }
-
-    fn nsh_net(our_id: U256) -> Translate<NSHubMessage, NetworkMessage> {
-        Box::new(move |msg| {
-            if let NSHubMessage::ToClient(dst, net_msg) = msg {
-                if dst == our_id {
-                    return Some(net_msg);
-                }
-            }
-            None
-        })
-    }
-
-    fn net_nsh(our_id: U256) -> Translate<NetworkMessage, NSHubMessage> {
-        Box::new(move |msg| Some(NSHubMessage::FromClient(our_id, msg)))
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-enum NSHubMessage {
-    FromClient(U256, NetworkMessage),
-    ToClient(U256, NetworkMessage),
-    NewClient(NodeInfo),
-}
-
-struct NSHub {
-    nodes: Vec<NodeInfo>,
-}
-
-impl NSHub {
-    async fn new() -> Result<Broker<NSHubMessage>, BrokerError> {
-        let mut b = Broker::new();
-        b.add_subsystem(Subsystem::Handler(Box::new(Self { nodes: vec![] })))
-            .await?;
-        Ok(b)
-    }
-
-    fn net_msg(&self, id: U256, net_msg: NetworkMessage) -> Vec<NSHubMessage> {
-        if let NetworkMessage::Input(msg) = net_msg {
-            match msg {
-                NetworkIn::MessageToNode(id_dst, msg_node) => {
-                    vec![NSHubMessage::ToClient(
-                        id_dst,
-                        NetworkMessage::Output(NetworkOut::MessageFromNode(id, msg_node)),
-                    )]
-                }
-                NetworkIn::WSUpdateListRequest => {
-                    vec![NSHubMessage::ToClient(
-                        id,
-                        NetworkMessage::Output(NetworkOut::NodeListFromWS(self.nodes.clone())),
-                    )]
-                }
-                _ => {
-                    vec![]
-                }
-            }
-        } else {
-            vec![]
-        }
-    }
-}
-
-#[platform_async_trait()]
-impl SubsystemHandler<NSHubMessage> for NSHub {
-    async fn messages(&mut self, msgs: Vec<NSHubMessage>) -> Vec<NSHubMessage> {
-        let mut out = vec![];
-
-        for msg in msgs {
-            match msg {
-                NSHubMessage::FromClient(id, net_msg) => {
-                    out.append(&mut self.net_msg(id, net_msg));
-                }
-                NSHubMessage::NewClient(info) => {
-                    self.nodes.push(info);
-                }
-                _ => {}
-            }
-        }
-
-        out.into_iter()
-            .inspect(|msg| log::trace!("Sending message {:?}", msg))
-            .map(|msg| msg)
-            .collect()
-    }
-}
diff --git a/flmodules/src/nodeconfig.rs b/flmodules/src/nodeconfig.rs
index dd2ffea6..a6108bff 100644
--- a/flmodules/src/nodeconfig.rs
+++ b/flmodules/src/nodeconfig.rs
@@ -5,9 +5,9 @@
 //! based serializations when using text-based serializations like `yaml` or `json`.
 
 use ed25519_compact::{KeyPair, Noise, PublicKey, Seed, Signature};
-use flarch::nodeids::U256;
+use flarch::nodeids::{NodeID, U256};
 use serde_derive::{Deserialize, Serialize};
-use serde_with::{base64::Base64, serde_as};
+use serde_with::{hex::Hex, serde_as};
 use std::{
     convert::TryFrom,
     fmt::{Debug, Error, Formatter},
@@ -42,11 +42,13 @@ pub struct NodeInfo {
     /// What client this node runs on - "Node" or the navigator id
     pub client: String,
     /// the public key of the node
-    #[serde_as(as = "Base64")]
+    #[serde_as(as = "Hex")]
     pub pubkey: Vec<u8>,
     // capabilities of this node
     #[serde(default = "Modules::all")]
     pub modules: Modules,
+    #[serde(skip)]
+    id: Option<NodeID>,
 }
 
 #[derive(Deserialize, Serialize, Clone)]
@@ -70,11 +72,30 @@ impl NodeInfo {
             client: "libc".to_string(),
             pubkey: pubkey.as_ref().to_vec(),
             modules: Modules::all(),
+            id: None,
+        }
+    }
+
+    pub fn new_from_id(id: NodeID) -> NodeInfo {
+        let keypair = KeyPair::from_seed(Seed::default());
+        Self::new_from_id_kp(id, keypair.pk)
+    }
+
+    pub fn new_from_id_kp(id: NodeID, pubkey: PublicKey) -> NodeInfo {
+        NodeInfo {
+            name: names::Generator::default().next().unwrap(),
+            client: "libc".to_string(),
+            pubkey: pubkey.as_ref().to_vec(),
+            modules: Modules::all(),
+            id: Some(id),
         }
     }
 
     /// Returns the unique id, based on the public key.
     pub fn get_id(&self) -> U256 {
+        if let Some(id) = self.id {
+            return id;
+        }
         let a: [u8; PublicKey::BYTES] = self.pubkey.clone().try_into().unwrap();
         U256::from(a)
     }
@@ -135,6 +156,7 @@ impl From<NodeInfoV1> for NodeInfo {
             client: ni.client,
             pubkey: ni.pubkey,
             modules: Modules::empty(),
+            id: None,
         }
     }
 }
@@ -147,6 +169,7 @@ impl TryFrom<NodeInfoToml> for NodeInfo {
             client: nit.client,
             pubkey: nit.pubkey.ok_or(ConfigError::PublicKeyMissing)?,
             modules: Modules::empty(),
+            id: None,
         })
     }
 }
@@ -178,7 +201,7 @@ pub struct NodeConfig {
     /// info about this node
     pub info: NodeInfo,
     /// the cryptographic keypair as a vector of bytes
-    #[serde_as(as = "Base64")]
+    #[serde_as(as = "Hex")]
     pub keypair: Vec<u8>,
 }
 
@@ -198,6 +221,15 @@ impl NodeConfig {
         }
     }
 
+    /// Returns a new NodeConfig with an overwriting id
+    pub fn new_id(id: NodeID) -> Self {
+        let keypair = KeyPair::from_seed(Seed::default());
+        NodeConfig {
+            info: NodeInfo::new_from_id_kp(id, keypair.pk),
+            keypair: keypair.as_ref().to_vec(),
+        }
+    }
+
     /// Returns a yaml representation of the config.
     pub fn encode(&self) -> String {
         serde_yaml::to_string(&NodeConfigSave::NodeConfigV1(self.clone())).unwrap()
diff --git a/flmodules/src/overlay/README.md b/flmodules/src/overlay/README.md
deleted file mode 100644
index 0264491a..00000000
--- a/flmodules/src/overlay/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Overlay
-
-Gives an abstraction to allow for different network overlays, e.g., random_connections, dht_network, loopix, and
-others. It defines a basic set of messages and a broker, which can then be extended to work with the different
-network connection modules.
-
-Two examples are implemented:
-- `OverlayRandom` uses the `RandomConnection` broker to handle the network and forwards messages as appropriate
-- `OverlayDirect` uses the `Network` broker to handle the network. One problem with this is that the `Connected`
-and `Disconnected` messages from the `Network` broker need to be handled here.
-
-To implement a new example who has the `Available`, `Connected`, `Disconnected` messages, the simplest way is to
-copy `OverlayRandom` into a new broker.
\ No newline at end of file
diff --git a/flmodules/src/overlay/broker.rs b/flmodules/src/overlay/broker.rs
deleted file mode 100644
index 719eeafd..00000000
--- a/flmodules/src/overlay/broker.rs
+++ /dev/null
@@ -1,288 +0,0 @@
-use flarch::{
-    broker::{Broker, BrokerError, Subsystem, SubsystemHandler},
-    nodeids::U256,
-    platform_async_trait,
-};
-
-use super::messages::{OverlayIn, OverlayInternal, OverlayMessage, OverlayOut};
-use crate::{
-    network::messages::{NetworkIn, NetworkMessage, NetworkOut},
-    nodeconfig::NodeInfo,
-    random_connections::messages::{RandomIn, RandomMessage, RandomOut},
-};
-
-pub struct OverlayRandom {}
-
-impl OverlayRandom {
-    pub async fn start(
-        random: Broker<RandomMessage>,
-    ) -> Result<Broker<OverlayMessage>, BrokerError> {
-        let mut b = Broker::new();
-        // Translate RandomOut to OverlayOut, and OverlayIn to RandomIn.
-        // A module connected to the Broker<OverlayMessage> will get translations of the
-        // RandomOut messages, and can send messages to RandomIn using the Overlay.
-        b.link_bi(
-            random,
-            Box::new(|msg| {
-                if let RandomMessage::Output(out) = msg {
-                    let ret = match out {
-                        RandomOut::NodeIDsConnected(node_ids) => {
-                            OverlayOut::NodeIDsConnected(node_ids)
-                        }
-                        RandomOut::NodeInfosConnected(infos) => {
-                            OverlayOut::NodeInfosConnected(infos)
-                        }
-                        RandomOut::NetworkWrapperFromNetwork(id, module_message) => {
-                            OverlayOut::NetworkWrapperFromNetwork(id, module_message)
-                        }
-                        _ => return None,
-                    };
-                    return Some(ret.into());
-                }
-                None
-            }),
-            Box::new(|msg| {
-                if let OverlayMessage::Input(input) = msg {
-                    let ret = match input {
-                        OverlayIn::NetworkWrapperToNetwork(id, module_message) => {
-                            RandomIn::NetworkMapperToNetwork(id, module_message)
-                        }
-                    };
-                    return Some(RandomMessage::Input(ret));
-                }
-                None
-            }),
-        )
-        .await?;
-        Ok(b)
-    }
-}
-
-/**
- * Connects directly to the Network broker.
- * Because the Network broker only delivers 'Connected' and 'Disconnected'
- * messages, this implementation has to do some bookkeeping to send out
- * the correct messages.
- */
-pub struct OverlayDirect {
-    nodes_available: Vec<NodeInfo>,
-    nodes_connected: Vec<U256>,
-}
-
-impl OverlayDirect {
-    pub async fn start(
-        direct: Broker<NetworkMessage>,
-    ) -> Result<Broker<OverlayMessage>, BrokerError> {
-        let mut b = Broker::new();
-        // Subsystem for handling Connected and Disconnected messages from the Network broker.
-        b.add_subsystem(Subsystem::Handler(Box::new(OverlayDirect {
-            nodes_available: vec![],
-            nodes_connected: vec![],
-        })))
-        .await?;
-
-        // Translate NetworkOut to OverlayOut, and OverlayIn to NetworkIn.
-        // A module connected to the Broker<OverlayMessage> will get translations of the
-        // NetworkOut messages, and can send messages to NetworkIn using the Overlay.
-        b.link_bi(
-            direct,
-            Box::new(|msg| {
-                if let NetworkMessage::Output(out) = msg {
-                    return match out {
-                        NetworkOut::MessageFromNode(id, msg_str) => {
-                            serde_yaml::from_str(&msg_str).ok().map(|module_message| {
-                                OverlayOut::NetworkWrapperFromNetwork(id, module_message).into()
-                            })
-                        }
-                        NetworkOut::NodeListFromWS(vec) => {
-                            Some(OverlayInternal::Available(vec).into())
-                        }
-                        NetworkOut::Connected(id) => Some(OverlayInternal::Connected(id).into()),
-                        NetworkOut::Disconnected(id) => {
-                            Some(OverlayInternal::Disconnected(id).into())
-                        }
-                        _ => None,
-                    };
-                }
-                None
-            }),
-            Box::new(|msg| {
-                if let OverlayMessage::Input(input) = msg {
-                    let ret = match input {
-                        OverlayIn::NetworkWrapperToNetwork(id, module_message) => {
-                            if let Ok(msg_str) = serde_yaml::to_string(&module_message) {
-                                NetworkIn::MessageToNode(id, msg_str)
-                            } else {
-                                return None;
-                            }
-                        }
-                    };
-                    return Some(NetworkMessage::Input(ret));
-                }
-                None
-            }),
-        )
-        .await?;
-        Ok(b)
-    }
-
-    fn available_connected(&self, id: U256) -> (bool, bool) {
-        (
-            self.nodes_available
-                .iter()
-                .find(|info| info.get_id() == id)
-                .is_some(),
-            self.nodes_connected.contains(&id),
-        )
-    }
-}
-
-#[platform_async_trait()]
-impl SubsystemHandler<OverlayMessage> for OverlayDirect {
-    async fn messages(&mut self, msgs: Vec<OverlayMessage>) -> Vec<OverlayMessage> {
-        let mut ret = false;
-        // Keep track of available and connected / disconnected nodes.
-        for msg in msgs {
-            if let OverlayMessage::Internal(internal) = msg {
-                match internal {
-                    OverlayInternal::Connected(id) => {
-                        if self.available_connected(id) == (true, false) {
-                            self.nodes_connected.push(id);
-                            ret = true;
-                        }
-                    }
-                    OverlayInternal::Disconnected(id) => {
-                        if self.available_connected(id).1 == true {
-                            self.nodes_connected.retain(|&other| other != id);
-                            ret = true;
-                        }
-                    }
-                    OverlayInternal::Available(vec) => {
-                        self.nodes_available = vec;
-                        ret = true;
-                    }
-                }
-            }
-        }
-
-        // If something changed, output all relevant messages.
-        if ret {
-            vec![
-                OverlayOut::NodeInfoAvailable(self.nodes_available.clone()),
-                OverlayOut::NodeIDsConnected(self.nodes_connected.clone().into()),
-                OverlayOut::NodeInfosConnected(
-                    self.nodes_available
-                        .iter()
-                        .filter(|node| self.nodes_connected.contains(&node.get_id()))
-                        .cloned()
-                        .collect(),
-                ),
-            ]
-            .into_iter()
-            .map(|msg| msg.into())
-            .collect()
-        } else {
-            vec![]
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use flarch::nodeids::NodeID;
-
-    use crate::nodeconfig::NodeConfig;
-
-    use super::*;
-
-    fn check_msgs(msgs: Vec<OverlayMessage>, available: &[NodeInfo], connected: &[NodeInfo]) {
-        assert_eq!(3, msgs.len());
-        assert_eq!(
-            OverlayMessage::Output(OverlayOut::NodeInfoAvailable(available.to_vec())),
-            msgs[0]
-        );
-        assert_eq!(
-            OverlayMessage::Output(OverlayOut::NodeIDsConnected(
-                connected
-                    .iter()
-                    .map(|info| info.get_id())
-                    .collect::<Vec<NodeID>>()
-                    .into()
-            )),
-            msgs[1]
-        );
-        assert_eq!(
-            OverlayMessage::Output(OverlayOut::NodeInfosConnected(connected.to_vec())),
-            msgs[2]
-        );
-    }
-
-    #[tokio::test]
-    async fn test_direct_dis_connect() -> Result<(), BrokerError> {
-        let mut od = OverlayDirect {
-            nodes_available: vec![],
-            nodes_connected: vec![],
-        };
-        let nodes = [NodeConfig::new().info, NodeConfig::new().info];
-        let node_unknown = NodeConfig::new().info.get_id();
-
-        // Start with two new nodes, but not yet connected.
-        let msgs = od
-            .messages(vec![OverlayInternal::Available(vec![
-                nodes[0].clone(),
-                nodes[1].clone(),
-            ])
-            .into()])
-            .await;
-        check_msgs(msgs, &nodes, &[]);
-
-        // Connect first node 0, then node 1
-        let msgs = od
-            .messages(vec![OverlayInternal::Connected(nodes[0].get_id()).into()])
-            .await;
-        check_msgs(msgs, &nodes, &[nodes[0].clone()]);
-
-        let msgs = od
-            .messages(vec![OverlayInternal::Connected(nodes[1].get_id()).into()])
-            .await;
-        check_msgs(msgs, &nodes, &nodes);
-
-        // Re-connect node 1, should do nothing
-        let msgs = od
-            .messages(vec![OverlayInternal::Connected(nodes[1].get_id()).into()])
-            .await;
-        assert_eq!(0, msgs.len());
-
-        // Connect an unknown node - this should be ignored
-        let msgs = od
-            .messages(vec![OverlayInternal::Connected(node_unknown).into()])
-            .await;
-        assert_eq!(0, msgs.len());
-
-        // Disconnect an unknown node - twice, in case it keeps it and would fail to remove it when
-        // it isn't here anymore.
-        let msgs = od
-            .messages(vec![OverlayInternal::Disconnected(node_unknown).into()])
-            .await;
-        assert_eq!(0, msgs.len());
-
-        let msgs = od
-            .messages(vec![OverlayInternal::Disconnected(node_unknown).into()])
-            .await;
-        assert_eq!(0, msgs.len());
-
-        // Disconnect a node
-        let msgs = od
-            .messages(vec![OverlayInternal::Disconnected(nodes[0].get_id()).into()])
-            .await;
-        check_msgs(msgs, &nodes, &[nodes[1].clone()]);
-
-        // Disconnect an unconnected node
-        let msgs = od
-            .messages(vec![OverlayInternal::Disconnected(nodes[0].get_id()).into()])
-            .await;
-        assert_eq!(0, msgs.len());
-
-        Ok(())
-    }
-}
diff --git a/flmodules/src/overlay/mod.rs b/flmodules/src/overlay/mod.rs
deleted file mode 100644
index 1ce4ede3..00000000
--- a/flmodules/src/overlay/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod broker;
-pub mod messages;
\ No newline at end of file
diff --git a/flmodules/src/ping/broker.rs b/flmodules/src/ping/broker.rs
index 9d68a9d6..3a7871aa 100644
--- a/flmodules/src/ping/broker.rs
+++ b/flmodules/src/ping/broker.rs
@@ -1,149 +1,67 @@
-use std::sync::mpsc::{channel, Receiver, Sender};
-
-use flarch::{
-    broker::{Broker, BrokerError, Subsystem, SubsystemHandler},
-    platform_async_trait,
-};
+use flarch::broker::{Broker, BrokerError, TranslateFrom, TranslateInto};
+use tokio::sync::watch;
 
 use crate::{
-    overlay::messages::NetworkWrapper,
-    random_connections::messages::{RandomIn, RandomMessage, RandomOut},
-    timer::TimerMessage,
+    random_connections::broker::{BrokerRandom, RandomIn, RandomOut},
+    router::messages::NetworkWrapper,
+    timer::Timer,
 };
 
 use super::{
     core::PingStorage,
-    messages::{Ping, PingConfig, PingIn, PingMessage, PingOut},
+    messages::{Messages, PingConfig, PingIn, PingOut},
 };
 
 const MODULE_NAME: &str = "Ping";
 
+pub type BrokerPing = Broker<PingIn, PingOut>;
+
 /// This links the Ping module with a RandomConnections module, so that
 /// all messages are correctly translated from one to the other.
-pub struct PingBroker {
-    /// This is always updated with the latest view of the Ping module.
-    pub storage: PingStorage,
+pub struct Ping {
     /// Represents the underlying broker.
-    pub broker: Broker<PingMessage>,
+    pub broker: BrokerPing,
     /// Is used to pass the PingStorage structure from the Transalate to the PingBroker.
-    storage_rx: Receiver<PingStorage>,
-}
-
-impl PingBroker {
-    pub async fn start(config: PingConfig, rc: Broker<RandomMessage>) -> Result<Self, BrokerError> {
-        let (storage_tx, storage_rx) = channel();
-        let broker = Translate::start(rc, config.clone(), storage_tx).await?;
-        Ok(PingBroker {
-            storage: PingStorage::new(config),
-            storage_rx,
-            broker,
-        })
-    }
-
-    pub async fn add_timer(&mut self, mut timer: Broker<TimerMessage>) {
-        timer
-            .forward(
-                self.broker.clone(),
-                Box::new(|msg: TimerMessage| {
-                    matches!(msg, TimerMessage::Second).then(|| PingIn::Tick.into())
-                }),
-            )
-            .await;
-    }
-
-    pub fn update(&mut self) {
-        for update in self.storage_rx.try_iter() {
-            self.storage = update;
-        }
-    }
+    pub storage: watch::Receiver<PingStorage>,
 }
 
-struct Translate {
-    storage_tx: Sender<PingStorage>,
-    module: Ping,
-}
-
-impl Translate {
-    async fn start(
-        random: Broker<RandomMessage>,
+impl Ping {
+    pub async fn start(
         config: PingConfig,
-        storage_tx: Sender<PingStorage>,
-    ) -> Result<Broker<PingMessage>, BrokerError> {
-        let mut gossip = Broker::new();
-        gossip
-            .add_subsystem(Subsystem::Handler(Box::new(Translate {
-                storage_tx,
-                module: Ping::new(config),
-            })))
-            .await?;
-        gossip
-            .link_bi(
-                random,
-                Box::new(Self::link_rnd_ping),
-                Box::new(Self::link_ping_rnd),
-            )
-            .await?;
-        Ok(gossip)
-    }
-
-    fn link_rnd_ping(msg: RandomMessage) -> Option<PingMessage> {
-        if let RandomMessage::Output(msg_out) = msg {
-            match msg_out {
-                RandomOut::DisconnectNode(id) => Some(PingIn::DisconnectNode(id).into()),
-                RandomOut::NodeIDsConnected(list) => Some(PingIn::NodeList(list.into()).into()),
-                RandomOut::NetworkWrapperFromNetwork(id, msg) => msg
-                    .unwrap_yaml(MODULE_NAME)
-                    .map(|msg| PingIn::FromNetwork(id, msg).into()),
-                _ => None,
-            }
-        } else {
-            None
-        }
-    }
+        rc: BrokerRandom,
+        timer: &mut Timer,
+    ) -> Result<Self, BrokerError> {
+        let (messages, storage) = Messages::new(config);
+        let mut broker = Broker::new();
+        broker.add_handler(Box::new(messages)).await?;
+        broker.link_bi(rc).await?;
+        timer.tick_second(broker.clone(), PingIn::Tick).await?;
 
-    fn link_ping_rnd(msg: PingMessage) -> Option<RandomMessage> {
-        if let PingMessage::Output(msg_out) = msg {
-            match msg_out {
-                PingOut::ToNetwork(id, msg_node) => Some(
-                    RandomIn::NetworkMapperToNetwork(
-                        id,
-                        NetworkWrapper::wrap_yaml(MODULE_NAME, &msg_node).unwrap(),
-                    )
-                    .into(),
-                ),
-                PingOut::Failed(id) => Some(RandomIn::NodeFailure(id).into()),
-                _ => None,
-            }
-        } else {
-            None
-        }
+        Ok(Ping { storage, broker })
     }
+}
 
-    fn handle_output(&mut self, msg_out: &PingOut) {
-        if let PingOut::Storage(s) = msg_out {
-            self.storage_tx
-                .send(s.clone())
-                .err()
-                .map(|e| log::error!("Couldn't send to storage_tx: {e:?}"));
+impl TranslateFrom<RandomOut> for PingIn {
+    fn translate(msg: RandomOut) -> Option<Self> {
+        match msg {
+            RandomOut::DisconnectNode(id) => Some(PingIn::DisconnectNode(id)),
+            RandomOut::NodeIDsConnected(list) => Some(PingIn::UpdateNodeList(list.into())),
+            RandomOut::NetworkWrapperFromNetwork(id, msg) => msg
+                .unwrap_yaml(MODULE_NAME)
+                .map(|msg| PingIn::FromNetwork(id, msg)),
+            _ => None,
         }
     }
 }
 
-#[platform_async_trait()]
-impl SubsystemHandler<PingMessage> for Translate {
-    async fn messages(&mut self, msgs: Vec<PingMessage>) -> Vec<PingMessage> {
-        let mut out = vec![];
-        for msg in msgs {
-            log::trace!("Got msg: {msg:?}");
-            if let PingMessage::Input(msg_in) = msg {
-                out.extend(self.module.process_msg(msg_in));
-            }
-        }
-        for msg in out.iter() {
-            log::trace!("Outputting msg: {msg:?}");
-            self.handle_output(msg);
-        }
-
-        out.into_iter().map(|o| o.into()).collect()
+impl TranslateInto<RandomIn> for PingOut {
+    fn translate(self) -> Option<RandomIn> {
+        Some(match self {
+            PingOut::ToNetwork(id, msg_node) => RandomIn::NetworkWrapperToNetwork(
+                id,
+                NetworkWrapper::wrap_yaml(MODULE_NAME, &msg_node).unwrap(),
+            ),
+            PingOut::Failed(id) => RandomIn::NodeFailure(id).into(),
+        })
     }
 }
diff --git a/flmodules/src/ping/core.rs b/flmodules/src/ping/core.rs
index 7c5132e4..5d155b65 100644
--- a/flmodules/src/ping/core.rs
+++ b/flmodules/src/ping/core.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use flarch::nodeids::NodeID;
+use flarch::nodeids::{NodeID, NodeIDs};
 use serde::{Deserialize, Serialize};
 
 use super::messages::PingConfig;
@@ -30,7 +30,29 @@ impl PingStorage {
         }
     }
 
-    pub fn new_node(&mut self, id: NodeID) {
+    pub fn set_nodes(&mut self, ids: NodeIDs) {
+        let failed = self
+            .stats
+            .keys()
+            .filter(|id| !ids.0.contains(id))
+            .cloned()
+            .collect::<Vec<_>>();
+        for id in &failed {
+            self.remove_node(id);
+        }
+
+        let new_nodes = ids
+            .0
+            .iter()
+            .filter(|id| !self.stats.contains_key(id))
+            .cloned()
+            .collect::<Vec<_>>();
+        for id in new_nodes {
+            self.add_node(id);
+        }
+    }
+
+    pub fn add_node(&mut self, id: NodeID) {
         if self.stats.contains_key(&id) {
             return;
         }
@@ -51,7 +73,7 @@ impl PingStorage {
             stat.rx += 1;
             self.stats.insert(id, stat);
         } else {
-            self.new_node(id);
+            self.add_node(id);
         }
     }
 
@@ -96,7 +118,7 @@ mod tests {
         let n1 = NodeID::rnd();
         let n2 = NodeID::rnd();
 
-        s.new_node(n1);
+        s.add_node(n1);
         assert_eq!(1, s.stats.len());
         assert_eq!(0, s.stats.get(&n1).unwrap().lastping);
         assert_eq!(vec![n1], s.ping);
@@ -108,14 +130,14 @@ mod tests {
         assert_eq!(0, s.stats.len());
         assert_eq!(1, s.failed.len());
 
-        s.new_node(n1);
+        s.add_node(n1);
         s.pong(n1);
         assert_eq!(1, s.stats.len());
         assert_eq!(0, s.stats.get(&n1).unwrap().lastping);
         s.tick();
         s.tick();
 
-        s.new_node(n2);
+        s.add_node(n2);
         assert_eq!(2, s.stats.len());
         s.tick();
         assert_eq!(1, s.stats.len());
diff --git a/flmodules/src/ping/messages.rs b/flmodules/src/ping/messages.rs
index 1e38f355..2ad56c53 100644
--- a/flmodules/src/ping/messages.rs
+++ b/flmodules/src/ping/messages.rs
@@ -1,5 +1,10 @@
-use flarch::nodeids::{NodeID, NodeIDs};
+use flarch::{
+    broker::SubsystemHandler,
+    nodeids::{NodeID, NodeIDs},
+    platform_async_trait,
+};
 use serde::{Deserialize, Serialize};
+use tokio::sync::watch;
 
 use super::core::PingStorage;
 
@@ -19,14 +24,13 @@ pub enum PingMessage {
 pub enum PingIn {
     Tick,
     FromNetwork(NodeID, ModuleMessage),
-    NodeList(NodeIDs),
+    UpdateNodeList(NodeIDs),
     DisconnectNode(NodeID),
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum PingOut {
     ToNetwork(NodeID, ModuleMessage),
-    Storage(PingStorage),
     Failed(NodeID),
 }
 
@@ -38,22 +42,29 @@ pub struct PingConfig {
     pub timeout: u32,
 }
 
-pub struct Ping {
-    pub storage: PingStorage,
+pub struct Messages {
+    storage: PingStorage,
+    tx: Option<watch::Sender<PingStorage>>,
 }
 
-impl Ping {
-    pub fn new(config: PingConfig) -> Self {
-        Self {
-            storage: PingStorage::new(config),
-        }
+impl Messages {
+    pub fn new(config: PingConfig) -> (Self, watch::Receiver<PingStorage>) {
+        let storage = PingStorage::new(config);
+        let (storage_tx, rx) = watch::channel(storage.clone());
+        (
+            Self {
+                storage,
+                tx: Some(storage_tx),
+            },
+            rx,
+        )
     }
 
-    pub fn process_msg(&mut self, msg: PingIn) -> Vec<PingOut> {
+    fn process_msg(&mut self, msg: PingIn) -> Vec<PingOut> {
         match msg {
             PingIn::Tick => self.tick(),
             PingIn::FromNetwork(id, msg_node) => self.message(id, msg_node),
-            PingIn::NodeList(ids) => self.new_nodes(ids),
+            PingIn::UpdateNodeList(ids) => self.set_nodes(ids),
             PingIn::DisconnectNode(id) => {
                 self.storage.remove_node(&id);
                 vec![]
@@ -61,46 +72,59 @@ impl Ping {
         }
     }
 
-    pub fn tick(&mut self) -> Vec<PingOut> {
+    fn tick(&mut self) -> Vec<PingOut> {
         self.storage.tick();
-        itertools::concat([
-            self.create_messages(),
-            vec![PingOut::Storage(self.storage.clone())],
-        ])
+        self.tx.clone().map(|tx| {
+            tx.send(self.storage.clone())
+                .is_err()
+                .then(|| self.tx = None)
+        });
+        self.create_messages()
     }
 
-    pub fn message(&mut self, id: NodeID, msg: ModuleMessage) -> Vec<PingOut> {
+    fn message(&mut self, id: NodeID, msg: ModuleMessage) -> Vec<PingOut> {
         match msg {
             ModuleMessage::Ping => {
-                vec![PingOut::ToNetwork(id, ModuleMessage::Pong)]
+                if self.storage.stats.contains_key(&id) {
+                    vec![PingOut::ToNetwork(id, ModuleMessage::Pong)]
+                } else {
+                    vec![]
+                }
             }
             ModuleMessage::Pong => {
                 self.storage.pong(id);
-                self.create_messages()
+                vec![]
             }
         }
     }
 
-    pub fn new_nodes(&mut self, ids: NodeIDs) -> Vec<PingOut> {
-        for id in ids.0 {
-            self.storage.new_node(id);
-        }
-        self.create_messages()
+    fn set_nodes(&mut self, ids: NodeIDs) -> Vec<PingOut> {
+        self.storage.set_nodes(ids);
+        vec![]
     }
 
     fn create_messages(&mut self) -> Vec<PingOut> {
         let mut out = vec![];
         for id in self.storage.ping.drain(..) {
-            out.push(PingOut::ToNetwork(id, ModuleMessage::Ping).into());
+            out.push(PingOut::ToNetwork(id, ModuleMessage::Ping));
         }
         for id in self.storage.failed.drain(..) {
-            out.push(PingOut::Failed(id).into());
+            out.push(PingOut::Failed(id));
         }
 
         out
     }
 }
 
+#[platform_async_trait()]
+impl SubsystemHandler<PingIn, PingOut> for Messages {
+    async fn messages(&mut self, msgs: Vec<PingIn>) -> Vec<PingOut> {
+        msgs.into_iter()
+            .flat_map(|msg| self.process_msg(msg))
+            .collect()
+    }
+}
+
 impl From<PingIn> for PingMessage {
     fn from(msg: PingIn) -> Self {
         PingMessage::Input(msg)
diff --git a/flmodules/src/random_connections/broker.rs b/flmodules/src/random_connections/broker.rs
index f3b1533a..4cf8bc41 100644
--- a/flmodules/src/random_connections/broker.rs
+++ b/flmodules/src/random_connections/broker.rs
@@ -1,154 +1,97 @@
-use std::sync::mpsc::{channel, Receiver, Sender};
-
 use flarch::{
-    broker::{self, Broker, BrokerError, Subsystem, SubsystemHandler},
-    nodeids::U256,
-    platform_async_trait,
+    broker::{Broker, BrokerError, Translate},
+    nodeids::{NodeID, NodeIDs, U256},
 };
+use serde::{Deserialize, Serialize};
+use tokio::sync::watch;
 
 use crate::{
-    network::messages::{NetworkIn, NetworkOut, NetworkMessage},
+    network::broker::{BrokerNetwork, NetworkIn, NetworkOut},
+    nodeconfig::NodeInfo,
     random_connections::{
-        messages::{Config, ModuleMessage, RandomConnections, RandomIn, RandomMessage, RandomOut},
         core::RandomStorage,
+        messages::{ModuleMessage, Messages},
     },
-    timer::TimerMessage,
+    router::messages::NetworkWrapper,
+    timer::Timer,
 };
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum RandomIn {
+    NodeList(Vec<NodeInfo>),
+    NodeFailure(NodeID),
+    NodeConnected(NodeID),
+    NodeDisconnected(NodeID),
+    NodeCommFromNetwork(NodeID, ModuleMessage),
+    NetworkWrapperToNetwork(NodeID, NetworkWrapper),
+    Tick,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum RandomOut {
+    ConnectNode(NodeID),
+    DisconnectNode(NodeID),
+    NodeIDsConnected(NodeIDs),
+    NodeInfosConnected(Vec<NodeInfo>),
+    NodeCommToNetwork(NodeID, ModuleMessage),
+    NetworkWrapperFromNetwork(NodeID, NetworkWrapper),
+}
+
+pub type BrokerRandom = Broker<RandomIn, RandomOut>;
 
 pub struct RandomBroker {
-    pub storage: RandomStorage,
-    pub broker: Broker<RandomMessage>,
-    storage_rx: Receiver<RandomStorage>,
+    pub broker: BrokerRandom,
+    pub storage: watch::Receiver<RandomStorage>,
 }
 
 impl RandomBroker {
-    pub async fn start(id: U256, broker_net: Broker<NetworkMessage>) -> Result<Self, BrokerError> {
-        let (storage_tx, storage_rx) = channel();
-        let broker = Translate::start(broker_net, storage_tx, id).await?;
-        Ok(Self {
-            storage: RandomStorage::default(),
-            storage_rx,
-            broker,
-        })
-    }
+    pub async fn start(
+        id: U256,
+        broker_net: BrokerNetwork,
+        timer: &mut Timer,
+    ) -> Result<Self, BrokerError> {
+        let (messages, storage) = Messages::new(id);
+        let mut broker = Broker::new();
+        broker.add_handler(Box::new(messages)).await?;
 
-    pub async fn add_timer(&mut self, mut broker: Broker<TimerMessage>) {
+        timer.tick_second(broker.clone(), RandomIn::Tick).await?;
         broker
-            .forward(
-                self.broker.clone(),
-                Box::new(|msg: TimerMessage| {
-                    matches!(msg, TimerMessage::Second).then(|| RandomIn::Tick.into())
-                }),
+            .add_translator_link(
+                broker_net,
+                Box::new(Self::link_rnd_net),
+                Self::link_net_rnd(id),
             )
-            .await;
-    }
+            .await?;
 
-    pub fn update(&mut self) {
-        for update in self.storage_rx.try_iter() {
-            self.storage = update;
-        }
+        Ok(Self { storage, broker })
     }
-}
 
-pub struct Translate {
-    storage_tx: Sender<RandomStorage>,
-    module: RandomConnections,
-    id: U256,
-}
-
-impl Translate {
-    pub async fn start(
-        broker_net: Broker<NetworkMessage>,
-        storage_tx: Sender<RandomStorage>,
-        id: U256,
-    ) -> Result<Broker<RandomMessage>, BrokerError> {
-        let mut rc = Broker::new();
-        rc.add_subsystem(Subsystem::Handler(Box::new(Translate {
-            storage_tx,
-            module: RandomConnections::new(Config::default()),
-            id,
-        })))
-        .await?;
-        rc.link_bi(
-            broker_net,
-            Self::link_net_rnd(id),
-            Box::new(Self::link_rnd_net),
-        )
-        .await?;
-        Ok(rc)
-    }
-
-    fn link_net_rnd(our_id: U256) -> broker::Translate<NetworkMessage, RandomMessage> {
-        Box::new(move |msg: NetworkMessage| {
-            if let NetworkMessage::Output(msg_net) = msg {
-                match msg_net {
-                    NetworkOut::MessageFromNode(id, msg_str) => {
-                        if let Ok(msg_rnd) = serde_yaml::from_str::<ModuleMessage>(&msg_str) {
-                            return Some(RandomIn::NodeCommFromNetwork(id, msg_rnd).into());
-                        }
-                    }
-                    NetworkOut::NodeListFromWS(list) => {
-                        return Some(
-                            RandomIn::NodeList(
-                                list.into_iter()
-                                    .filter(|ni| ni.get_id() != our_id)
-                                    .collect(),
-                            )
-                            .into(),
-                        )
-                    }
-                    NetworkOut::Connected(id) => return Some(RandomIn::NodeConnected(id).into()),
-                    NetworkOut::Disconnected(id) => {
-                        return Some(RandomIn::NodeDisconnected(id).into())
-                    }
-                    _ => {}
-                }
+    fn link_net_rnd(our_id: U256) -> Translate<NetworkOut, RandomIn> {
+        Box::new(move |msg: NetworkOut| match msg {
+            NetworkOut::MessageFromNode(id, msg_str) => {
+                serde_yaml::from_str::<ModuleMessage>(&msg_str)
+                    .ok()
+                    .map(|msg_rnd| RandomIn::NodeCommFromNetwork(id, msg_rnd))
             }
-            None
+            NetworkOut::NodeListFromWS(list) => Some(RandomIn::NodeList(
+                list.into_iter()
+                    .filter(|ni| ni.get_id() != our_id)
+                    .collect(),
+            )),
+            NetworkOut::Connected(id) => return Some(RandomIn::NodeConnected(id)),
+            NetworkOut::Disconnected(id) => return Some(RandomIn::NodeDisconnected(id)),
+            _ => None,
         })
     }
 
-    fn link_rnd_net(msg: RandomMessage) -> Option<NetworkMessage> {
-        if let RandomMessage::Output(msg_out) = msg {
-            match msg_out {
-                RandomOut::ConnectNode(id) => return Some(NetworkIn::Connect(id).into()),
-                RandomOut::DisconnectNode(id) => return Some(NetworkIn::Disconnect(id).into()),
-                RandomOut::NodeCommToNetwork(id, msg) => {
-                    let msg_str = serde_yaml::to_string(&msg).unwrap();
-                    return Some(NetworkIn::MessageToNode(id, msg_str).into());
-                }
-                _ => {}
-            }
-        }
-        None
-    }
-
-    fn handle_output(&mut self, msg: &RandomOut) {
-        if let RandomOut::Storage(s) = msg {
-            self.storage_tx
-                .send(s.clone())
-                .err()
-                .map(|e| log::error!("While sending update to random storage: {e:?}"));
-        }
-    }
-}
-
-#[platform_async_trait()]
-impl SubsystemHandler<RandomMessage> for Translate {
-    async fn messages(&mut self, msgs: Vec<RandomMessage>) -> Vec<RandomMessage> {
-        let mut out = vec![];
-        for msg in msgs {
-            log::trace!("{} processing {msg:?}", self.id);
-            if let RandomMessage::Input(msg_in) = msg {
-                out.extend(self.module.process_message(msg_in));
+    fn link_rnd_net(msg: RandomOut) -> Option<NetworkIn> {
+        match msg {
+            RandomOut::ConnectNode(id) => return Some(NetworkIn::Connect(id)),
+            RandomOut::DisconnectNode(id) => return Some(NetworkIn::Disconnect(id)),
+            RandomOut::NodeCommToNetwork(id, msg) => {
+                let msg_str = serde_yaml::to_string(&msg).unwrap();
+                return Some(NetworkIn::MessageToNode(id, msg_str));
             }
+            _ => None,
         }
-
-        for msg in out.iter() {
-            log::trace!("{} outputted {msg:?}", self.id);
-            self.handle_output(msg);
-        }
-
-        out.into_iter().map(|m| m.into()).collect()
     }
 }
diff --git a/flmodules/src/random_connections/messages.rs b/flmodules/src/random_connections/messages.rs
index 78554d0f..2bcd5e5e 100644
--- a/flmodules/src/random_connections/messages.rs
+++ b/flmodules/src/random_connections/messages.rs
@@ -1,11 +1,19 @@
 use itertools::concat;
 use serde::{Deserialize, Serialize};
 
-use flarch::nodeids::{NodeID, NodeIDs, U256};
+use flarch::{
+    broker::SubsystemHandler,
+    nodeids::{NodeIDs, U256},
+    platform_async_trait,
+};
+use tokio::sync::watch;
 
-use crate::{nodeconfig::NodeInfo, overlay::messages::NetworkWrapper};
+use crate::router::messages::NetworkWrapper;
 
-use super::core::RandomStorage;
+use super::{
+    broker::{RandomIn, RandomOut},
+    core::RandomStorage,
+};
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum ModuleMessage {
@@ -13,50 +21,31 @@ pub enum ModuleMessage {
     DropConnection,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub enum RandomMessage {
-    Input(RandomIn),
-    Output(RandomOut),
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub enum RandomIn {
-    NodeList(Vec<NodeInfo>),
-    NodeFailure(NodeID),
-    NodeConnected(NodeID),
-    NodeDisconnected(NodeID),
-    NodeCommFromNetwork(NodeID, ModuleMessage),
-    NetworkMapperToNetwork(NodeID, NetworkWrapper),
-    Tick,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub enum RandomOut {
-    ConnectNode(NodeID),
-    DisconnectNode(NodeID),
-    NodeIDsConnected(NodeIDs),
-    NodeInfosConnected(Vec<NodeInfo>),
-    NodeCommToNetwork(NodeID, ModuleMessage),
-    NetworkWrapperFromNetwork(NodeID, NetworkWrapper),
-    Storage(RandomStorage),
-}
-
 /// RandomConnections listens for new available nodes and then chooses
 /// to randomly connect to a set number of nodes.
 #[derive(Debug)]
-pub struct RandomConnections {
+pub struct Messages {
+    id: U256,
     cfg: Config,
-    pub storage: RandomStorage,
+    storage: RandomStorage,
+    tx: Option<watch::Sender<RandomStorage>>,
     fill: u32,
 }
 
-impl RandomConnections {
-    pub fn new(cfg: Config) -> Self {
-        RandomConnections {
-            cfg,
-            storage: RandomStorage::default(),
-            fill: 0,
-        }
+impl Messages {
+    pub fn new(id: U256) -> (Self, watch::Receiver<RandomStorage>) {
+        let storage = RandomStorage::default();
+        let (tx, rx) = watch::channel(storage.clone());
+        (
+            Self {
+                id,
+                cfg: Config::default(),
+                storage,
+                tx: Some(tx),
+                fill: 0,
+            },
+            rx,
+        )
     }
 
     /// Processes one message and returns messages that need to be treated by the
@@ -95,7 +84,7 @@ impl RandomConnections {
                 ])
             }
             RandomIn::NodeCommFromNetwork(id, node_msg) => self.network_msg(id, node_msg),
-            RandomIn::NetworkMapperToNetwork(dst, msg) => {
+            RandomIn::NetworkWrapperToNetwork(dst, msg) => {
                 if self.storage.connected.contains(&dst) {
                     vec![RandomOut::NodeCommToNetwork(
                         dst,
@@ -103,11 +92,12 @@ impl RandomConnections {
                     )]
                 } else {
                     log::warn!(
-                        "{self:p} Dropping message to unconnected node {dst} - making sure we're disconnected"
+                        "{self:p} Dropping message {msg:?} to unconnected node {dst} - making sure we're disconnected"
                     );
                     vec![
                         RandomOut::DisconnectNode(dst),
                         RandomOut::NodeIDsConnected(self.storage.connected.get_nodes()),
+                        RandomOut::NodeInfosConnected(self.storage.get_connected_info()),
                     ]
                 }
             }
@@ -118,7 +108,9 @@ impl RandomConnections {
     /// Processes one message from the network.
     pub fn network_msg(&mut self, id: U256, msg: ModuleMessage) -> Vec<RandomOut> {
         match msg {
-            ModuleMessage::Module(msg_mod) => vec![RandomOut::NetworkWrapperFromNetwork(id, msg_mod)],
+            ModuleMessage::Module(msg_mod) => {
+                vec![RandomOut::NetworkWrapperFromNetwork(id, msg_mod)]
+            }
             ModuleMessage::DropConnection => {
                 self.storage.disconnect((&vec![id]).into());
                 concat([vec![RandomOut::DisconnectNode(id)], self.new_connection()])
@@ -192,15 +184,32 @@ impl RandomConnections {
         vec![]
     }
 
-    fn update(&self) -> Vec<RandomOut> {
+    fn update(&mut self) -> Vec<RandomOut> {
+        self.tx.clone().map(|tx| {
+            tx.send(self.storage.clone())
+                .is_err()
+                .then(|| self.tx = None)
+        });
         vec![
             RandomOut::NodeIDsConnected(self.storage.connected.get_nodes()),
             RandomOut::NodeInfosConnected(self.storage.get_connected_info()),
-            RandomOut::Storage(self.storage.clone()),
         ]
     }
 }
 
+#[platform_async_trait()]
+impl SubsystemHandler<RandomIn, RandomOut> for Messages {
+    async fn messages(&mut self, msgs: Vec<RandomIn>) -> Vec<RandomOut> {
+        let mut out = vec![];
+        for msg in msgs {
+            log::trace!("{} processing {msg:?}", self.id);
+            out.extend(self.process_message(msg));
+        }
+
+        out
+    }
+}
+
 /// All intervals are indicated in ticks.
 #[derive(Debug)]
 pub struct Config {
@@ -228,18 +237,6 @@ impl Config {
     }
 }
 
-impl From<RandomIn> for RandomMessage {
-    fn from(msg: RandomIn) -> RandomMessage {
-        RandomMessage::Input(msg)
-    }
-}
-
-impl From<RandomOut> for RandomMessage {
-    fn from(msg: RandomOut) -> RandomMessage {
-        RandomMessage::Output(msg)
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use flarch::start_logging;
@@ -264,7 +261,7 @@ mod tests {
         start_logging();
 
         let nodes = vec![NodeConfig::new().info];
-        let mut rc = RandomConnections::new(Config::default());
+        let mut rc = Messages::new(nodes[0].get_id()).0;
         let reply = rc.process_message(RandomIn::NodeList(nodes));
         log::debug!("{reply:?}");
 
diff --git a/flmodules/src/router/README.md b/flmodules/src/router/README.md
new file mode 100644
index 00000000..be77a193
--- /dev/null
+++ b/flmodules/src/router/README.md
@@ -0,0 +1,19 @@
+# Router
+
+Gives an abstraction to allow for different network router algorithms, e.g., random_connections, dht_network, loopix, and
+others. It defines a basic set of messages and a broker, which can then be extended to work with the different
+network connection modules.
+
+Two examples are implemented:
+- `RouterRandom` uses the `RandomConnection` broker to handle the network and forwards messages as appropriate
+- `RouterDirect` uses the `Network` broker to handle the network. One problem with this is that the `Connected`
+and `Disconnected` messages from the `Network` broker need to be handled here.
+
+To implement a new example who has the `Available`, `Connected`, `Disconnected` messages, the simplest way is to
+copy `RouterRandom` into a new broker.
+
+# Timeline with Network
+
+The `network`-module will sooner or later be replaced with another WebRTC implementation, perhaps
+with https://crates.io/crates/matchbox_socket, https://crates.io/crates/litep2p, or
+https://crates.io/crates/just-webrtc.
\ No newline at end of file
diff --git a/flmodules/src/router/broker.rs b/flmodules/src/router/broker.rs
new file mode 100644
index 00000000..dbb8dc8d
--- /dev/null
+++ b/flmodules/src/router/broker.rs
@@ -0,0 +1,292 @@
+use flarch::{
+    broker::{Broker, BrokerError, SubsystemHandler},
+    nodeids::U256,
+    platform_async_trait,
+};
+
+use super::messages::{RouterIn, RouterInternal, RouterOut};
+use crate::{
+    network::broker::{BrokerNetwork, NetworkIn, NetworkOut},
+    nodeconfig::NodeInfo,
+    random_connections::broker::{BrokerRandom, RandomIn, RandomOut},
+};
+
+pub type BrokerRouter = Broker<RouterIn, RouterOut>;
+
+pub struct RouterRandom {}
+
+impl RouterRandom {
+    pub async fn start(mut random: BrokerRandom) -> Result<BrokerRouter, BrokerError> {
+        let b = Broker::new();
+        // Translate RandomOut to FromRouter, and ToRouter to RandomIn.
+        // A module connected to the Broker<RouterMessage> will get translations of the
+        // RandomOut messages, and can send messages to RandomIn using the Router.
+        random
+            .add_translator_direct(
+                b.clone(),
+                Box::new(Self::translate_rtr_rnd),
+                Box::new(Self::translate_rnd_rtr),
+            )
+            .await?;
+        Ok(b)
+    }
+
+    fn translate_rnd_rtr(msg: RandomOut) -> Option<RouterOut> {
+        Some(match msg {
+            RandomOut::NodeIDsConnected(node_ids) => RouterOut::NodeIDsConnected(node_ids),
+            RandomOut::NodeInfosConnected(infos) => RouterOut::NodeInfosConnected(infos),
+            RandomOut::NetworkWrapperFromNetwork(id, module_message) => {
+                RouterOut::NetworkWrapperFromNetwork(id, module_message)
+            }
+            _ => return None,
+        })
+    }
+
+    fn translate_rtr_rnd(msg: RouterIn) -> Option<RandomIn> {
+        match msg {
+            RouterIn::NetworkWrapperToNetwork(id, module_message) => {
+                Some(RandomIn::NetworkWrapperToNetwork(id, module_message))
+            }
+            _ => None,
+        }
+    }
+}
+
+/**
+ * Connects directly to the Network broker.
+ * Because the Network broker only delivers 'Connected' and 'Disconnected'
+ * messages, this implementation has to do some bookkeeping to send out
+ * the correct messages.
+ */
+pub struct RouterNetwork {
+    nodes_available: Vec<NodeInfo>,
+    nodes_connected: Vec<U256>,
+}
+
+impl RouterNetwork {
+    pub async fn start(mut network: BrokerNetwork) -> Result<BrokerRouter, BrokerError> {
+        let mut b = Broker::new();
+        // Subsystem for handling Connected and Disconnected messages from the Network broker.
+        b.add_handler(Box::new(RouterNetwork {
+            nodes_available: vec![],
+            nodes_connected: vec![],
+        }))
+        .await?;
+
+        // Translate NetworkOut to FromRouter, and ToRouter to NetworkIn.
+        // A module connected to the Broker<RouterMessage> will get translations of the
+        // NetworkOut messages, and can send messages to NetworkIn using the Router.
+        network
+            .add_translator_o_ti(
+                b.clone(),
+                Box::new(|msg| match msg {
+                    NetworkOut::MessageFromNode(id, msg_str) => {
+                        Some(RouterInternal::MessageFromNode(id, msg_str).into())
+                    }
+                    NetworkOut::NodeListFromWS(vec) => Some(RouterInternal::Available(vec).into()),
+                    NetworkOut::Connected(id) => Some(RouterInternal::Connected(id).into()),
+                    NetworkOut::Disconnected(id) => Some(RouterInternal::Disconnected(id).into()),
+                    _ => None,
+                }),
+            )
+            .await?;
+        b.add_translator_i_ti(
+            network,
+            Box::new(|msg| match msg {
+                RouterIn::NetworkWrapperToNetwork(id, module_message) => {
+                    if let Ok(msg_str) = serde_yaml::to_string(&module_message) {
+                        Some(NetworkIn::MessageToNode(id, msg_str))
+                    } else {
+                        None
+                    }
+                }
+                _ => None,
+            }),
+        )
+        .await?;
+        Ok(b)
+    }
+
+    fn available_connected(&self, id: U256) -> (bool, bool) {
+        (
+            self.nodes_available
+                .iter()
+                .find(|info| info.get_id() == id)
+                .is_some(),
+            self.nodes_connected.contains(&id),
+        )
+    }
+}
+
+#[platform_async_trait()]
+impl SubsystemHandler<RouterIn, RouterOut> for RouterNetwork {
+    async fn messages(&mut self, msgs: Vec<RouterIn>) -> Vec<RouterOut> {
+        let mut ret = false;
+        let mut out = vec![];
+        // Keep track of available and connected / disconnected nodes.
+        for msg in msgs {
+            if let RouterIn::Internal(internal) = msg {
+                match internal {
+                    RouterInternal::Connected(id) => {
+                        if self.available_connected(id) == (true, false) {
+                            self.nodes_connected.push(id);
+                            ret = true;
+                        }
+                    }
+                    RouterInternal::Disconnected(id) => {
+                        if self.available_connected(id).1 == true {
+                            self.nodes_connected.retain(|&other| other != id);
+                            ret = true;
+                        }
+                    }
+                    RouterInternal::Available(vec) => {
+                        self.nodes_available = vec;
+                        ret = true;
+                    }
+                    RouterInternal::MessageFromNode(id, msg_str) => {
+                        serde_yaml::from_str(&msg_str).ok().map(|module_message| {
+                            out.push(RouterOut::NetworkWrapperFromNetwork(id, module_message))
+                        });
+                    }
+                }
+            }
+        }
+
+        // If something changed, output all relevant messages.
+        out.extend(if ret {
+            vec![
+                RouterOut::NodeInfoAvailable(self.nodes_available.clone()),
+                RouterOut::NodeIDsConnected(self.nodes_connected.clone().into()),
+                RouterOut::NodeInfosConnected(
+                    self.nodes_available
+                        .iter()
+                        .filter(|node| self.nodes_connected.contains(&node.get_id()))
+                        .cloned()
+                        .collect(),
+                ),
+            ]
+        } else {
+            vec![]
+        });
+
+        out
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::error::Error;
+
+    use flarch::{nodeids::NodeID, start_logging_filter_level};
+
+    use crate::nodeconfig::NodeConfig;
+
+    use super::*;
+
+    fn check_msgs(msgs: Vec<RouterOut>, available: &[NodeInfo], connected: &[NodeInfo]) {
+        assert_eq!(3, msgs.len());
+        assert_eq!(RouterOut::NodeInfoAvailable(available.to_vec()), msgs[0]);
+        assert_eq!(
+            RouterOut::NodeIDsConnected(
+                connected
+                    .iter()
+                    .map(|info| info.get_id())
+                    .collect::<Vec<NodeID>>()
+                    .into()
+            ),
+            msgs[1]
+        );
+        assert_eq!(RouterOut::NodeInfosConnected(connected.to_vec()), msgs[2]);
+    }
+
+    #[tokio::test]
+    async fn test_direct_dis_connect() -> Result<(), BrokerError> {
+        let mut od = RouterNetwork {
+            nodes_available: vec![],
+            nodes_connected: vec![],
+        };
+        let nodes = [NodeConfig::new().info, NodeConfig::new().info];
+        let node_unknown = NodeConfig::new().info.get_id();
+
+        // Start with two new nodes, but not yet connected.
+        let msgs = od
+            .messages(vec![RouterInternal::Available(vec![
+                nodes[0].clone(),
+                nodes[1].clone(),
+            ])
+            .into()])
+            .await;
+        check_msgs(msgs, &nodes, &[]);
+
+        // Connect first node 0, then node 1
+        let msgs = od
+            .messages(vec![RouterInternal::Connected(nodes[0].get_id()).into()])
+            .await;
+        check_msgs(msgs, &nodes, &[nodes[0].clone()]);
+
+        let msgs = od
+            .messages(vec![RouterInternal::Connected(nodes[1].get_id()).into()])
+            .await;
+        check_msgs(msgs, &nodes, &nodes);
+
+        // Re-connect node 1, should do nothing
+        let msgs = od
+            .messages(vec![RouterInternal::Connected(nodes[1].get_id()).into()])
+            .await;
+        assert_eq!(0, msgs.len());
+
+        // Connect an unknown node - this should be ignored
+        let msgs = od
+            .messages(vec![RouterInternal::Connected(node_unknown).into()])
+            .await;
+        assert_eq!(0, msgs.len());
+
+        // Disconnect an unknown node - twice, in case it keeps it and would fail to remove it when
+        // it isn't here anymore.
+        let msgs = od
+            .messages(vec![RouterInternal::Disconnected(node_unknown).into()])
+            .await;
+        assert_eq!(0, msgs.len());
+
+        let msgs = od
+            .messages(vec![RouterInternal::Disconnected(node_unknown).into()])
+            .await;
+        assert_eq!(0, msgs.len());
+
+        // Disconnect a node
+        let msgs = od
+            .messages(vec![RouterInternal::Disconnected(nodes[0].get_id()).into()])
+            .await;
+        check_msgs(msgs, &nodes, &[nodes[1].clone()]);
+
+        // Disconnect an unconnected node
+        let msgs = od
+            .messages(vec![RouterInternal::Disconnected(nodes[0].get_id()).into()])
+            .await;
+        assert_eq!(0, msgs.len());
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn test_io() -> Result<(), Box<dyn Error>> {
+        start_logging_filter_level(vec![], log::LevelFilter::Info);
+
+        let mut net = Broker::new();
+        let mut rd = RouterNetwork::start(net.clone()).await?;
+        net.settle(vec![]).await?;
+        let mut tap_out = rd.get_tap_out().await?.0;
+
+        log::info!("Sending nodelist");
+        let nis = vec![NodeConfig::new().info];
+        net.emit_msg_out(NetworkOut::NodeListFromWS(nis))?;
+        net.settle(vec![]).await?;
+        log::warn!("{}", tap_out.len());
+        assert!(tap_out.len() > 0);
+        assert!(matches!(
+            tap_out.try_recv().unwrap(),
+            RouterOut::NodeInfoAvailable(_)
+        ));
+        Ok(())
+    }
+}
diff --git a/flmodules/src/overlay/messages.rs b/flmodules/src/router/messages.rs
similarity index 67%
rename from flmodules/src/overlay/messages.rs
rename to flmodules/src/router/messages.rs
index a7deaf48..10bd0c9b 100644
--- a/flmodules/src/overlay/messages.rs
+++ b/flmodules/src/router/messages.rs
@@ -9,20 +9,14 @@ pub struct NetworkWrapper {
     pub msg: String,
 }
 
-#[derive(Clone, Debug, PartialEq)]
-pub enum OverlayMessage {
-    Input(OverlayIn),
-    Output(OverlayOut),
-    Internal(OverlayInternal),
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub enum OverlayIn {
+pub enum RouterIn {
     NetworkWrapperToNetwork(NodeID, NetworkWrapper),
+    Internal(RouterInternal),
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub enum OverlayOut {
+pub enum RouterOut {
     NodeInfoAvailable(Vec<NodeInfo>),
     NodeIDsConnected(NodeIDs),
     NodeInfosConnected(Vec<NodeInfo>),
@@ -30,28 +24,11 @@ pub enum OverlayOut {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub enum OverlayInternal {
+pub enum RouterInternal {
     Connected(U256),
     Disconnected(U256),
     Available(Vec<NodeInfo>),
-}
-
-impl From<OverlayOut> for OverlayMessage {
-    fn from(value: OverlayOut) -> Self {
-        OverlayMessage::Output(value)
-    }
-}
-
-impl From<OverlayIn> for OverlayMessage {
-    fn from(value: OverlayIn) -> Self {
-        OverlayMessage::Input(value)
-    }
-}
-
-impl From<OverlayInternal> for OverlayMessage {
-    fn from(value: OverlayInternal) -> Self {
-        OverlayMessage::Internal(value)
-    }
+    MessageFromNode(U256, String),
 }
 
 impl NetworkWrapper {
@@ -71,3 +48,9 @@ impl NetworkWrapper {
         None
     }
 }
+
+impl From<RouterInternal> for RouterIn{
+    fn from(value: RouterInternal) -> Self {
+        RouterIn::Internal(value)
+    }
+}
diff --git a/flmodules/src/router/mod.rs b/flmodules/src/router/mod.rs
new file mode 100644
index 00000000..81328637
--- /dev/null
+++ b/flmodules/src/router/mod.rs
@@ -0,0 +1,34 @@
+use broker::{BrokerRouter, RouterNetwork};
+use flarch::web_rtc::{
+    connection::ConnectionConfig, web_rtc_setup::web_rtc_spawner,
+    web_socket_client::WebSocketClient, WebRTCConn,
+};
+
+use crate::{network::NetworkSetupError, nodeconfig::NodeConfig};
+
+pub mod broker;
+pub mod messages;
+
+/// Starts a new [`broker::Broker<NetworkMessage>`] with a given `node`- and `connection`-configuration.
+/// This returns a raw broker which is mostly suited to connect to other brokers.
+/// If you need an easier access to the WebRTC network, use [`network_start`], which returns
+/// a structure with a more user-friendly API.
+///
+/// # Example
+///
+/// ```bash
+/// async fn start_network() -> Result<(), NetworkSetupError>{
+///   let net = network_broker_start();
+/// }
+/// ```
+pub async fn router_broker_start(
+    node: NodeConfig,
+    connection: ConnectionConfig,
+) -> Result<BrokerRouter, NetworkSetupError> {
+    use crate::network::broker::Network;
+
+    let ws = WebSocketClient::connect(&connection.signal()).await?;
+    let webrtc = WebRTCConn::new(web_rtc_spawner(connection)).await?;
+    let net = Network::start(node.clone(), ws, webrtc).await?;
+    Ok(RouterNetwork::start(net.broker).await?)
+}
diff --git a/flmodules/src/template/broker.rs b/flmodules/src/template/broker.rs
index 1e384435..5a69f3ce 100644
--- a/flmodules/src/template/broker.rs
+++ b/flmodules/src/template/broker.rs
@@ -1,21 +1,23 @@
-use flarch::{data_storage::DataStorage, platform_async_trait, tasks::spawn_local};
+use flarch::data_storage::DataStorage;
 use std::error::Error;
 use tokio::sync::watch;
 
 use crate::{
-    overlay::messages::NetworkWrapper,
-    random_connections::messages::{RandomIn, RandomMessage, RandomOut},
+    random_connections::broker::{BrokerRandom, RandomIn, RandomOut},
+    router::messages::NetworkWrapper,
 };
 use flarch::{
-    broker::{Broker, BrokerError, Subsystem, SubsystemHandler},
+    broker::{Broker, BrokerError},
     nodeids::NodeID,
 };
 
 use super::{
-    core::{TemplateConfig, TemplateStorage, TemplateStorageSave},
-    messages::{ModuleMessage, TemplateIn, TemplateMessage, TemplateMessages, TemplateOut},
+    core::{TemplateConfig, TemplateStorage},
+    messages::{Messages, ModuleMessage, TemplateIn, TemplateOut},
 };
 
+pub type BrokerEndpoint = Broker<TemplateIn, TemplateOut>;
+
 const MODULE_NAME: &str = "Template";
 
 /// This links the Template module with other modules, so that
@@ -25,39 +27,33 @@ const MODULE_NAME: &str = "Template";
 ///
 /// The [Template] holds the [Translate] and offers convenience methods
 /// to interact with [Translate] and [TemplateMessage].
+#[derive(Clone)]
 pub struct Template {
     /// Represents the underlying broker.
-    pub broker: Broker<TemplateMessage>,
+    pub broker: Broker<TemplateIn, TemplateOut>,
     our_id: NodeID,
     storage: watch::Receiver<TemplateStorage>,
 }
 
 impl Template {
     pub async fn start(
-        mut ds: Box<dyn DataStorage + Send>,
+        ds: Box<dyn DataStorage + Send>,
         our_id: NodeID,
-        rc: Broker<RandomMessage>,
+        rc: BrokerRandom,
         config: TemplateConfig,
     ) -> Result<Self, Box<dyn Error>> {
-        let str = ds.get(MODULE_NAME).unwrap_or("".into());
-        let storage = TemplateStorageSave::from_str(&str).unwrap_or_default();
-        let messages = TemplateMessages::new(storage.clone(), config, our_id)?;
-        let mut broker = Translate::start(rc, messages).await?;
-
-        let (tx, storage) = watch::channel(storage);
-        let (mut tap, _) = broker.get_tap().await?;
-        spawn_local(async move {
-            loop {
-                if let Some(TemplateMessage::Output(TemplateOut::UpdateStorage(sto))) =
-                    tap.recv().await
-                {
-                    tx.send(sto.clone()).expect("updated storage");
-                    if let Ok(val) = sto.to_yaml() {
-                        ds.set(MODULE_NAME, &val).expect("updating storage");
-                    }
-                }
-            }
-        });
+        let (messages, storage) = Messages::new(ds, config, our_id);
+        let mut broker = Broker::new();
+        broker.add_handler(Box::new(messages)).await?;
+
+        broker
+            .add_translator_link(
+                rc,
+                Box::new(Self::link_template_rnd),
+                Box::new(Self::link_rnd_template),
+            )
+            .await?;
+
         Ok(Template {
             broker,
             our_id,
@@ -66,86 +62,32 @@ impl Template {
     }
 
     pub fn increase_self(&mut self, counter: u32) -> Result<(), BrokerError> {
-        self.broker
-            .emit_msg(TemplateIn::FromNetwork(self.our_id, ModuleMessage::Increase(counter)).into())
+        self.broker.emit_msg_in(TemplateIn::FromNetwork(
+            self.our_id,
+            ModuleMessage::Increase(counter),
+        ))
     }
 
     pub fn get_counter(&self) -> u32 {
         self.storage.borrow().counter
     }
-}
-
-/// Translates the messages to/from the RandomMessage and calls `TemplateMessages.processMessages`.
-struct Translate {
-    messages: TemplateMessages,
-}
-
-impl Translate {
-    async fn start(
-        random: Broker<RandomMessage>,
-        messages: TemplateMessages,
-    ) -> Result<Broker<TemplateMessage>, Box<dyn Error>> {
-        let mut template = Broker::new();
-
-        template
-            .add_subsystem(Subsystem::Handler(Box::new(Translate { messages })))
-            .await?;
-        template
-            .link_bi(
-                random,
-                Box::new(Self::link_rnd_template),
-                Box::new(Self::link_template_rnd),
-            )
-            .await?;
-        Ok(template)
-    }
 
-    fn link_rnd_template(msg: RandomMessage) -> Option<TemplateMessage> {
-        if let RandomMessage::Output(msg_out) = msg {
-            match msg_out {
-                RandomOut::NodeIDsConnected(list) => {
-                    Some(TemplateIn::UpdateNodeList(list.into()).into())
-                }
-                RandomOut::NetworkWrapperFromNetwork(id, msg) => msg
-                    .unwrap_yaml(MODULE_NAME)
-                    .map(|msg| TemplateIn::FromNetwork(id, msg).into()),
-                _ => None,
-            }
-        } else {
-            None
+    fn link_rnd_template(msg: RandomOut) -> Option<TemplateIn> {
+        match msg {
+            RandomOut::NodeIDsConnected(list) => Some(TemplateIn::UpdateNodeList(list.into())),
+            RandomOut::NetworkWrapperFromNetwork(id, msg) => msg
+                .unwrap_yaml(MODULE_NAME)
+                .map(|msg| TemplateIn::FromNetwork(id, msg)),
+            _ => None,
         }
     }
 
-    fn link_template_rnd(msg: TemplateMessage) -> Option<RandomMessage> {
-        if let TemplateMessage::Output(TemplateOut::ToNetwork(id, msg_node)) = msg {
-            Some(
-                RandomIn::NetworkMapperToNetwork(
-                    id,
-                    NetworkWrapper::wrap_yaml(MODULE_NAME, &msg_node).unwrap(),
-                )
-                .into(),
-            )
-        } else {
-            None
-        }
-    }
-}
-
-#[platform_async_trait()]
-impl SubsystemHandler<TemplateMessage> for Translate {
-    async fn messages(&mut self, msgs: Vec<TemplateMessage>) -> Vec<TemplateMessage> {
-        let msgs_in = msgs
-            .into_iter()
-            .filter_map(|msg| match msg {
-                TemplateMessage::Input(msg_in) => Some(msg_in),
-                TemplateMessage::Output(_) => None,
-            })
-            .collect();
-        self.messages
-            .process_messages(msgs_in)
-            .into_iter()
-            .map(|o| o.into())
-            .collect()
+    fn link_template_rnd(msg: TemplateOut) -> Option<RandomIn> {
+        let TemplateOut::ToNetwork(id, msg_node) = msg;
+        Some(RandomIn::NetworkWrapperToNetwork(
+            id,
+            NetworkWrapper::wrap_yaml(MODULE_NAME, &msg_node).unwrap(),
+        ))
     }
 }
 
@@ -164,18 +106,12 @@ mod tests {
         let id1 = NodeID::rnd();
         let mut rnd = Broker::new();
         let mut tr = Template::start(ds, id0, rnd.clone(), TemplateConfig::default()).await?;
-        let mut tap = rnd.get_tap().await?;
         assert_eq!(0, tr.get_counter());
 
-        rnd.settle_msg(RandomMessage::Output(RandomOut::NodeIDsConnected(
-            vec![id1].into(),
-        )))
-        .await?;
+        rnd.settle_msg_out(RandomOut::NodeIDsConnected(vec![id1].into()))
+            .await?;
         tr.increase_self(1)?;
-        assert!(matches!(
-            tap.0.recv().await.unwrap(),
-            RandomMessage::Input(_)
-        ));
+        tr.broker.settle(vec![]).await?;
         assert_eq!(1, tr.get_counter());
         Ok(())
     }
diff --git a/flmodules/src/template/messages.rs b/flmodules/src/template/messages.rs
index 1898d9ed..c77d5d49 100644
--- a/flmodules/src/template/messages.rs
+++ b/flmodules/src/template/messages.rs
@@ -1,7 +1,13 @@
-use std::error::Error;
-
-use flarch::nodeids::{NodeID, NodeIDs};
+use flarch::{
+    broker::SubsystemHandler,
+    data_storage::DataStorage,
+    nodeids::{NodeID, NodeIDs},
+    platform_async_trait,
+};
 use serde::{Deserialize, Serialize};
+use tokio::sync::watch;
+
+use crate::gossip_events::broker::MODULE_NAME;
 
 use super::core::*;
 
@@ -13,14 +19,6 @@ pub enum ModuleMessage {
     Counter(u32),
 }
 
-/// First wrap all messages coming into this module and all messages going out in
-/// a single message time.
-#[derive(Clone, Debug)]
-pub enum TemplateMessage {
-    Input(TemplateIn),
-    Output(TemplateOut),
-}
-
 /// The messages here represent all possible interactions with this module.
 #[derive(Debug, Clone)]
 pub enum TemplateIn {
@@ -31,29 +29,38 @@ pub enum TemplateIn {
 #[derive(Debug, Clone)]
 pub enum TemplateOut {
     ToNetwork(NodeID, ModuleMessage),
-    UpdateStorage(TemplateStorage),
 }
 
 /// The message handling part, but only for template messages.
 #[derive(Debug)]
-pub struct TemplateMessages {
-    pub core: TemplateCore,
+pub struct Messages {
+    core: TemplateCore,
+    storage: Box<dyn DataStorage + Send>,
     nodes: NodeIDs,
     our_id: NodeID,
+    ts_tx: Option<watch::Sender<TemplateStorage>>,
 }
 
-impl TemplateMessages {
+impl Messages {
     /// Returns a new chat module.
     pub fn new(
-        storage: TemplateStorage,
+        storage: Box<dyn DataStorage + Send>,
         cfg: TemplateConfig,
         our_id: NodeID,
-    ) -> Result<Self, Box<dyn Error>> {
-        Ok(Self {
-            core: TemplateCore::new(storage, cfg),
-            nodes: NodeIDs::empty(),
-            our_id,
-        })
+    ) -> (Self, watch::Receiver<TemplateStorage>) {
+        let str = storage.get(MODULE_NAME).unwrap_or("".into());
+        let ts = TemplateStorageSave::from_str(&str).unwrap_or_default();
+        let (ts_tx, ts_rx) = watch::channel(ts.clone());
+        (
+            Self {
+                storage,
+                core: TemplateCore::new(ts, cfg),
+                nodes: NodeIDs::empty(),
+                our_id,
+                ts_tx: Some(ts_tx),
+            },
+            ts_rx,
+        )
     }
 
     /// Processes one generic message and returns either an error
@@ -78,6 +85,7 @@ impl TemplateMessages {
                 // When increasing the counter, send 'self' counter to all other nodes.
                 // Also send a StorageUpdate message.
                 self.core.increase(c);
+                self.store();
                 return self
                     .nodes
                     .0
@@ -88,7 +96,6 @@ impl TemplateMessages {
                             ModuleMessage::Counter(self.core.storage.counter),
                         )
                     })
-                    .chain(vec![TemplateOut::UpdateStorage(self.core.storage.clone())])
                     .collect();
             }
             ModuleMessage::Counter(c) => log::info!("Got counter from {}: {}", _src, c),
@@ -101,45 +108,55 @@ impl TemplateMessages {
         self.nodes = ids.remove_missing(&vec![self.our_id].into());
         vec![]
     }
-}
 
-/// Convenience method to reduce long lines.
-impl From<TemplateIn> for TemplateMessage {
-    fn from(msg: TemplateIn) -> Self {
-        TemplateMessage::Input(msg)
+    fn store(&mut self) {
+        self.ts_tx.clone().map(|tx| {
+            tx.send(self.core.storage.clone())
+                .is_err()
+                .then(|| self.ts_tx = None)
+        });
+        if let Ok(val) = self.core.storage.to_yaml() {
+            self.storage
+                .set(MODULE_NAME, &val)
+                .err()
+                .map(|e| log::warn!("Error while updating storage: {e:?}"));
+        }
     }
 }
 
-/// Convenience method to reduce long lines.
-impl From<TemplateOut> for TemplateMessage {
-    fn from(msg: TemplateOut) -> Self {
-        TemplateMessage::Output(msg)
+#[platform_async_trait()]
+impl SubsystemHandler<TemplateIn, TemplateOut> for Messages {
+    async fn messages(&mut self, msgs: Vec<TemplateIn>) -> Vec<TemplateOut> {
+        self.process_messages(msgs)
     }
 }
 
 #[cfg(test)]
 mod tests {
+    use std::error::Error;
+
+    use flarch::data_storage::DataStorageTemp;
+
     use super::*;
 
     #[test]
-    fn test_something() -> Result<(), Box<dyn Error>> {
+    fn test_messages() -> Result<(), Box<dyn Error>> {
         let ids = NodeIDs::new(2);
         let id0 = *ids.0.get(0).unwrap();
         let id1 = *ids.0.get(1).unwrap();
-        let storage = TemplateStorage::default();
-        let mut msg = TemplateMessages::new(storage, TemplateConfig::default(), id0)?;
-        msg.process_messages(vec![TemplateIn::UpdateNodeList(ids).into()]);
-        let ret =
-            msg.process_messages(vec![TemplateIn::FromNetwork(id1, ModuleMessage::Increase(2)).into()]);
-        assert_eq!(2, ret.len());
+        let (mut msg, rx) =
+            Messages::new(DataStorageTemp::new_box(), TemplateConfig::default(), id0);
+        msg.process_messages(vec![TemplateIn::UpdateNodeList(ids)]);
+        let ret = msg.process_messages(vec![TemplateIn::FromNetwork(
+            id1,
+            ModuleMessage::Increase(2),
+        )]);
+        assert_eq!(1, ret.len());
         assert!(matches!(
             ret[0],
             TemplateOut::ToNetwork(_, ModuleMessage::Counter(2))
         ));
-        assert!(matches!(
-            ret[1],
-            TemplateOut::UpdateStorage(TemplateStorage { counter: 2 })
-        ));
+        assert_eq!(2, rx.borrow().counter);
         Ok(())
     }
 }
diff --git a/flmodules/src/testing/README.md b/flmodules/src/testing/README.md
new file mode 100644
index 00000000..1bc3b7f5
--- /dev/null
+++ b/flmodules/src/testing/README.md
@@ -0,0 +1,15 @@
+# Testing Simulators
+
+The different simulators here allow to choose different trade-offs between
+simulation precision and speed:
+
+- [network_simul](./network_simul.rs) abstracts away the signalling server, but is a bit faster
+- [router_simul](./router_simul.rs) only offers a router to connect to, even faster
+
+The following two simulations might come in handy, but currently they haven't been written yet:
+- `signal_simul` is the most precise, but slowest, as it needs to simulat all layers
+- `dht_router_simul` useful for modules which only use the dht_router module
+
+Choose wisely your level of abstraction!
+And, of course, once your simulation works, but the real test fails, you can always do a better simulation
+for the failing tests.
diff --git a/flmodules/src/testing/flo.rs b/flmodules/src/testing/flo.rs
new file mode 100644
index 00000000..03eec482
--- /dev/null
+++ b/flmodules/src/testing/flo.rs
@@ -0,0 +1,234 @@
+use std::collections::HashMap;
+
+use flarch::{broker::BrokerError, broker::Broker};
+use flcrypto::{
+    access::{Condition, Version},
+    signer::{Signer, Verifier},
+    signer_ed25519::SignerEd25519,
+};
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+use crate::dht_storage::{
+    broker::{DHTStorageIn, DHTStorageOut},
+    core::{Cuckoo, RealmConfig},
+};
+
+use crate::flo::{
+    crypto::{ACEDelegation, BadgeCond, FloACE, FloBadge, FloVerifier, Rules, ACE},
+    flo::{FloError, FloWrapper},
+    realm::{FloRealm, RealmID},
+};
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct Testing {
+    data: String,
+}
+
+pub type FloTesting = FloWrapper<Testing>;
+
+#[derive(Error, Debug)]
+pub enum WalletError {
+    #[error("BrokerError({0})")]
+    BrokerError(#[from] BrokerError),
+    #[error("FloError({0})")]
+    FloError(#[from] FloError),
+}
+
+#[derive(Default)]
+pub struct Wallet {
+    realm_id: RealmID,
+    pub signer: Option<Box<dyn Signer>>,
+    pub verifier: Option<Box<dyn Verifier>>,
+    pub verifier_flo: Option<FloVerifier>,
+    pub badge_condition: Option<Condition>,
+    pub badge_rules: Option<Rules>,
+    pub badge: Option<BadgeCond>,
+    pub badge_flo: Option<FloBadge>,
+    pub ace_update: Option<Condition>,
+    pub ace_update_rules: Option<Rules>,
+    pub ace_rules: HashMap<String, Condition>,
+    pub ace_delegation: Vec<ACEDelegation>,
+    pub ace: Option<ACE>,
+    pub ace_flo: Option<FloACE>,
+    pub realm: Option<FloRealm>,
+}
+
+impl Wallet {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn get_signer(&mut self) -> Box<dyn Signer> {
+        self.signer.get_or_insert(SignerEd25519::new_box()).clone()
+    }
+
+    pub fn get_verifier(&mut self) -> Box<dyn Verifier> {
+        let signer = self.get_signer();
+        self.verifier.get_or_insert(signer.verifier()).clone()
+    }
+
+    pub fn get_verifier_flo(&mut self) -> FloVerifier {
+        let verifier = self.get_verifier();
+        self.verifier_flo
+            .get_or_insert(
+                FloVerifier::from_type(self.realm_id.clone(), Rules::None, verifier).unwrap(),
+            )
+            .clone()
+    }
+
+    pub fn get_badge_condition(&mut self) -> Condition {
+        let verifier_id = self.get_verifier().get_id();
+        self.badge_condition
+            .get_or_insert(Condition::Verifier(verifier_id))
+            .clone()
+    }
+
+    pub fn get_badge_rules(&mut self) -> Rules {
+        let condition = self.get_badge_condition();
+        self.badge_rules
+            .get_or_insert(Rules::Update(condition))
+            .clone()
+    }
+
+    pub fn get_badge(&mut self) -> BadgeCond {
+        let condition = self.get_badge_condition();
+        self.badge.get_or_insert(BadgeCond::new(condition)).clone()
+    }
+
+    pub fn get_badge_flo(&mut self) -> FloBadge {
+        let badge = self.get_badge();
+        let badge_rules = self.get_badge_rules();
+        self.badge_flo
+            .get_or_insert(FloBadge::from_type(self.realm_id.clone(), badge_rules, badge).unwrap())
+            .clone()
+    }
+
+    pub fn get_ace_update_rules(&mut self) -> Rules {
+        let condition = self.get_badge_condition();
+        self.ace_update_rules
+            .get_or_insert(Rules::Update(condition))
+            .clone()
+    }
+
+    pub fn get_ace_update(&mut self) -> Condition {
+        let condition = self.get_badge_condition();
+        self.ace_update.get_or_insert(condition).clone()
+    }
+
+    pub fn get_ace(&mut self) -> ACE {
+        let update = self.get_ace_update();
+        self.ace
+            .get_or_insert(ACE::new(
+                Some(update),
+                self.ace_rules.clone(),
+                self.ace_delegation.clone(),
+            ))
+            .clone()
+    }
+
+    pub fn get_ace_flo(&mut self) -> FloACE {
+        let ace = self.get_ace();
+        let update_rules = self.get_ace_update_rules();
+        self.ace_flo
+            .get_or_insert(FloACE::from_type(self.realm_id.clone(), update_rules, ace).unwrap())
+            .clone()
+    }
+
+    pub fn get_rules(&mut self) -> Rules {
+        let flo_ace = self.get_ace_flo();
+        Rules::ACE(Version::Minimal(
+            (*flo_ace.flo_id()).into(),
+            flo_ace.version(),
+        ))
+    }
+
+    pub fn get_realm(&mut self) -> FloRealm {
+        let rules = self.get_badge_rules();
+        self.realm
+            .get_or_insert(
+                FloRealm::new(
+                    "root",
+                    rules,
+                    RealmConfig {
+                        max_space: 1e6 as u64,
+                        max_flo_size: 1e4 as u32,
+                    },
+                )
+                .unwrap(),
+            )
+            .clone()
+    }
+
+    pub fn set_realm_id(&mut self, realm_id: RealmID) {
+        self.verifier_flo = None;
+        self.badge_flo = None;
+        self.ace_flo = None;
+        self.realm_id = realm_id;
+        self.get_verifier_flo();
+        self.get_badge_flo();
+        self.get_ace_flo();
+    }
+
+    pub fn store(
+        &mut self,
+        dht_storage: &mut Broker<DHTStorageIn, DHTStorageOut>,
+    ) -> Result<(), WalletError> {
+        for flo in [
+            self.get_verifier_flo().flo(),
+            self.get_badge_flo().flo(),
+            self.get_ace_flo().flo(),
+        ] {
+            dht_storage.emit_msg_in(DHTStorageIn::StoreFlo(flo.clone()))?;
+        }
+
+        Ok(())
+    }
+}
+
+impl Clone for Wallet {
+    fn clone(&self) -> Self {
+        Self {
+            realm_id: self.realm_id.clone(),
+            signer: self.signer.as_deref().map(|s| s.clone()),
+            verifier: self.verifier.clone(),
+            verifier_flo: self.verifier_flo.clone(),
+            badge_condition: self.badge_condition.clone(),
+            badge_rules: self.badge_rules.clone(),
+            badge: self.badge.clone(),
+            badge_flo: self.badge_flo.clone(),
+            ace_update: self.ace_update.clone(),
+            ace_update_rules: self.ace_update_rules.clone(),
+            ace_rules: self.ace_rules.clone(),
+            ace_delegation: self.ace_delegation.clone(),
+            ace: self.ace.clone(),
+            ace_flo: self.ace_flo.clone(),
+            realm: self.realm.clone(),
+        }
+    }
+}
+
+impl FloTesting {
+    pub fn new(rid: RealmID, data: &str) -> Self {
+        FloWrapper::from_type(
+            rid,
+            Rules::Update(Condition::Pass),
+            Testing {
+                data: data.to_string(),
+            },
+        )
+        .unwrap()
+    }
+
+    pub fn new_cuckoo(rid: RealmID, data: &str, cuckoo: Cuckoo) -> Self {
+        FloWrapper::from_type_cuckoo(
+            rid,
+            Rules::Update(Condition::Pass),
+            cuckoo,
+            Testing {
+                data: data.to_string(),
+            },
+        )
+        .unwrap()
+    }
+}
diff --git a/flmodules/src/testing/mod.rs b/flmodules/src/testing/mod.rs
new file mode 100644
index 00000000..2bab014b
--- /dev/null
+++ b/flmodules/src/testing/mod.rs
@@ -0,0 +1,3 @@
+pub mod flo;
+pub mod network_simul;
+pub mod router_simul;
diff --git a/flmodules/src/testing/network_simul.rs b/flmodules/src/testing/network_simul.rs
new file mode 100644
index 00000000..5dcd01f8
--- /dev/null
+++ b/flmodules/src/testing/network_simul.rs
@@ -0,0 +1,155 @@
+use flarch::{
+    broker::{Broker, BrokerError, SubsystemHandler},
+    nodeids::{NodeID, U256},
+    platform_async_trait,
+};
+
+use crate::{
+    network::broker::{BrokerNetwork, NetworkIn, NetworkOut},
+    nodeconfig::{NodeConfig, NodeInfo},
+    router::broker::{BrokerRouter, RouterNetwork},
+};
+
+#[derive(Clone)]
+pub struct RouterNode {
+    pub config: NodeConfig,
+    pub net: BrokerNetwork,
+    pub router: BrokerRouter,
+}
+
+pub struct NetworkSimul {
+    pub nodes: Vec<RouterNode>,
+    nsh_broker: Broker<NSHubIn, NSHubOut>,
+}
+
+impl NetworkSimul {
+    pub async fn new() -> Result<Self, BrokerError> {
+        let nsh_broker = NSHub::new().await?;
+        Ok(Self {
+            nsh_broker,
+            nodes: vec![],
+        })
+    }
+
+    pub async fn new_node_broker(&mut self) -> Result<(NodeConfig, BrokerNetwork), BrokerError> {
+        let nc = NodeConfig::new();
+        let nc_id = nc.info.get_id();
+        let nm_broker = Broker::new();
+
+        self.nsh_broker
+            .add_translator_direct(
+                nm_broker.clone(),
+                Box::new(move |msg| Some(NSHubIn::FromClient(nc_id, msg))),
+                Box::new(move |msg| {
+                    let NSHubOut::ToClient(dst, net_msg) = msg;
+                    (dst == nc_id).then_some(net_msg)
+                }),
+            )
+            .await?;
+        self.nsh_broker
+            .emit_msg_in(NSHubIn::NewClient(nc.info.clone()))?;
+
+        Ok((nc, nm_broker))
+    }
+
+    pub async fn new_node(&mut self) -> Result<RouterNode, BrokerError> {
+        let (config, net) = self.new_node_broker().await?;
+        let node = RouterNode {
+            config,
+            net: net.clone(),
+            router: RouterNetwork::start(net).await?,
+        };
+        self.nodes.push(node.clone());
+        self.settle().await?;
+        Ok(node)
+    }
+
+    pub async fn settle(&mut self) -> Result<(), BrokerError> {
+        self.nsh_broker.settle(vec![]).await
+    }
+
+    pub fn node_ids(&self) -> Vec<NodeID> {
+        self.nodes.iter().map(|n| n.config.info.get_id()).collect()
+    }
+
+    pub async fn send_node_info(&mut self) -> Result<(), BrokerError> {
+        let infos: Vec<NodeInfo> = self.nodes.iter().map(|n| n.config.info.clone()).collect();
+        for node in &mut self.nodes {
+            let our_id = node.config.info.get_id();
+            let our_infos: Vec<NodeInfo> = infos
+                .iter()
+                .filter(|&info| info.get_id() != our_id)
+                .cloned()
+                .collect();
+            self.nsh_broker.emit_msg_out(NSHubOut::ToClient(
+                our_id,
+                NetworkOut::NodeListFromWS(our_infos),
+            ))?;
+            self.nsh_broker.settle(vec![]).await?;
+        }
+        self.settle().await
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+enum NSHubIn {
+    FromClient(U256, NetworkIn),
+    NewClient(NodeInfo),
+}
+
+#[derive(Clone, Debug, PartialEq)]
+enum NSHubOut {
+    ToClient(U256, NetworkOut),
+}
+
+struct NSHub {
+    nodes: Vec<NodeInfo>,
+}
+
+impl NSHub {
+    async fn new() -> Result<Broker<NSHubIn, NSHubOut>, BrokerError> {
+        let mut b = Broker::new();
+        b.add_handler(Box::new(Self { nodes: vec![] })).await?;
+        Ok(b)
+    }
+
+    fn net_msg(&self, id: U256, msg: NetworkIn) -> Vec<NSHubOut> {
+        match msg {
+            NetworkIn::MessageToNode(id_dst, msg_node) => {
+                vec![NSHubOut::ToClient(
+                    id_dst,
+                    NetworkOut::MessageFromNode(id, msg_node),
+                )]
+            }
+            NetworkIn::WSUpdateListRequest => {
+                vec![NSHubOut::ToClient(
+                    id,
+                    NetworkOut::NodeListFromWS(self.nodes.clone()),
+                )]
+            }
+            _ => {
+                vec![]
+            }
+        }
+    }
+}
+
+#[platform_async_trait()]
+impl SubsystemHandler<NSHubIn, NSHubOut> for NSHub {
+    async fn messages(&mut self, msgs: Vec<NSHubIn>) -> Vec<NSHubOut> {
+        let mut out = vec![];
+
+        for msg in msgs {
+            match msg {
+                NSHubIn::FromClient(id, net_msg) => {
+                    out.append(&mut self.net_msg(id, net_msg));
+                }
+                NSHubIn::NewClient(info) => {
+                    self.nodes.push(info);
+                }
+            }
+        }
+
+        out.into_iter().map(|msg| msg).collect()
+    }
+}
diff --git a/flmodules/src/testing/router_simul.rs b/flmodules/src/testing/router_simul.rs
new file mode 100644
index 00000000..1f8d11d7
--- /dev/null
+++ b/flmodules/src/testing/router_simul.rs
@@ -0,0 +1,116 @@
+use flarch::{
+    broker::{BrokerError, Broker, SubsystemHandler, Translate},
+    nodeids::{NodeID, U256},
+    platform_async_trait,
+};
+
+use crate::{
+    nodeconfig::{NodeConfig, NodeInfo},
+    router::{broker::BrokerRouter, messages::{RouterIn, RouterOut}},
+};
+
+pub struct RouterSimul {
+    nsh_broker: Broker<NSHubMessageIn, NSHubMessageOut>,
+}
+
+impl RouterSimul {
+    pub async fn new() -> Result<Self, BrokerError> {
+        let mut nsh_broker = Broker::new();
+        nsh_broker
+            .add_handler(Box::new(NSHub { nodes: vec![] }))
+            .await?;
+        Ok(Self { nsh_broker })
+    }
+
+    pub async fn new_node(
+        &mut self,
+    ) -> Result<(NodeConfig, BrokerRouter), BrokerError> {
+        self.new_node_id(None).await
+    }
+
+    pub async fn new_node_id(
+        &mut self,
+        id_opt: Option<NodeID>,
+    ) -> Result<(NodeConfig, BrokerRouter), BrokerError> {
+        let (id, nc) = if let Some(id) = id_opt {
+            (id, NodeConfig::new_id(id))
+        } else {
+            let nc = NodeConfig::new();
+            (nc.info.get_id(), nc)
+        };
+        let nm_broker = Broker::new();
+
+        self.nsh_broker
+            .add_translator_direct(
+                nm_broker.clone(),
+                Self::net_nsh(id),
+                Self::nsh_net(id.clone()),
+            )
+            .await?;
+        self.nsh_broker
+            .emit_msg_in(NSHubMessageIn::NewClient(nc.info.clone()))?;
+
+        Ok((nc, nm_broker))
+    }
+
+    fn nsh_net(our_id: U256) -> Translate<NSHubMessageOut, RouterOut> {
+        Box::new(move |msg| {
+            let NSHubMessageOut::ToClient(dst, net_msg) = msg;
+            return (dst == our_id).then_some(net_msg);
+        })
+    }
+
+    fn net_nsh(our_id: U256) -> Translate<RouterIn, NSHubMessageIn> {
+        Box::new(move |msg| Some(NSHubMessageIn::FromClient(our_id, msg)))
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+enum NSHubMessageIn {
+    FromClient(U256, RouterIn),
+    NewClient(NodeInfo),
+}
+
+#[derive(Clone, Debug, PartialEq)]
+enum NSHubMessageOut {
+    ToClient(U256, RouterOut),
+}
+
+struct NSHub {
+    nodes: Vec<NodeInfo>,
+}
+
+impl NSHub {
+    fn net_msg(&self, id: U256, msg: RouterIn) -> Vec<NSHubMessageOut> {
+        match msg {
+            RouterIn::NetworkWrapperToNetwork(id_dst, msg_node) => {
+                log::debug!("{id} -> {id_dst}: {:?}", msg_node);
+                vec![NSHubMessageOut::ToClient(
+                    id_dst,
+                    RouterOut::NetworkWrapperFromNetwork(id, msg_node),
+                )]
+            }
+            _ => vec![],
+        }
+    }
+}
+
+#[platform_async_trait()]
+impl SubsystemHandler<NSHubMessageIn, NSHubMessageOut> for NSHub {
+    async fn messages(&mut self, msgs: Vec<NSHubMessageIn>) -> Vec<NSHubMessageOut> {
+        let mut out = vec![];
+
+        for msg in msgs {
+            match msg {
+                NSHubMessageIn::FromClient(id, net_msg) => {
+                    out.append(&mut self.net_msg(id, net_msg));
+                }
+                NSHubMessageIn::NewClient(info) => {
+                    self.nodes.push(info);
+                }
+            }
+        }
+
+        out
+    }
+}
diff --git a/flmodules/src/timer.rs b/flmodules/src/timer.rs
index 280912a9..475a1005 100644
--- a/flmodules/src/timer.rs
+++ b/flmodules/src/timer.rs
@@ -1,8 +1,7 @@
-use flarch::platform_async_trait;
 use std::time::Duration;
 use tokio_stream::StreamExt;
 
-use flarch::broker::{Broker, BrokerError, Subsystem, SubsystemHandler};
+use flarch::broker::{Broker, BrokerError, Message};
 use flarch::tasks::{spawn_local, Interval};
 
 #[derive(Debug, Clone, PartialEq)]
@@ -11,42 +10,76 @@ pub enum TimerMessage {
     Minute,
 }
 
+pub type BrokerTimer = Broker<(), TimerMessage>;
+
 /// The Timer structure sends out periodic signals to the system so that
 /// services can subscribe to them.
-pub struct TimerBroker {
-    seconds: u32,
+#[derive(Clone, Debug)]
+pub struct Timer {
+    pub broker: BrokerTimer,
 }
 
-impl TimerBroker {
-    pub async fn start() -> Result<Broker<TimerMessage>, BrokerError> {
-        let mut broker = Broker::new();
-        let timer_struct = TimerBroker { seconds: 0 };
-        broker
-            .add_subsystem(Subsystem::Handler(Box::new(timer_struct)))
-            .await?;
+impl Timer {
+    pub async fn start() -> Result<Timer, BrokerError> {
+        let broker = Broker::new();
         let mut broker_cl = broker.clone();
         spawn_local(async move {
-            let mut interval = Interval::new_interval(Duration::from_millis(1000));
+            let mut seconds = 0;
+            let mut interval = Interval::new_interval(Duration::from_secs(1));
             loop {
                 interval.next().await;
-                if let Err(e) = broker_cl.emit_msg(TimerMessage::Second) {
-                    log::error!("While emitting timer: {e:?}");
+                seconds += 1;
+                broker_cl
+                    .emit_msg_out(TimerMessage::Second)
+                    .err()
+                    .map(|e| log::error!("While emitting timer: {e:?}"));
+                if seconds == 60 {
+                    broker_cl
+                        .emit_msg_out(TimerMessage::Minute)
+                        .err()
+                        .map(|e| log::error!("While emitting timer: {e:?}"));
+                    seconds = 0;
                 }
             }
         });
-        Ok(broker)
+        Ok(Timer { broker })
     }
-}
 
-#[platform_async_trait()]
-impl SubsystemHandler<TimerMessage> for TimerBroker {
-    async fn messages(&mut self, _: Vec<TimerMessage>) -> Vec<TimerMessage> {
-        if self.seconds == 0 {
-            self.seconds = 59;
-            vec![TimerMessage::Minute]
-        } else {
-            self.seconds -= 1;
-            vec![]
+    pub fn simul() -> Timer {
+        Timer {
+            broker: Broker::new(),
         }
     }
+
+    pub async fn tick<I: Message + 'static, O: Message + 'static>(
+        &mut self,
+        broker: Broker<I, O>,
+        msg: I,
+        tick: TimerMessage,
+    ) -> Result<(), BrokerError> {
+        self.broker
+            .add_translator_o_ti(
+                broker,
+                Box::new(move |tm| (tm == tick).then_some(msg.clone())),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    pub async fn tick_second<I: Message + 'static, O: Message + 'static>(
+        &mut self,
+        broker: Broker<I, O>,
+        msg: I,
+    ) -> Result<(), BrokerError> {
+        self.tick(broker, msg, TimerMessage::Second).await
+    }
+
+    pub async fn tick_minute<I: Message + 'static, O: Message + 'static>(
+        &mut self,
+        broker: Broker<I, O>,
+        msg: I,
+    ) -> Result<(), BrokerError> {
+        self.tick(broker, msg, TimerMessage::Minute).await
+    }
 }
diff --git a/flmodules/src/web_proxy/broker.rs b/flmodules/src/web_proxy/broker.rs
index d713a94d..dd2eba9f 100644
--- a/flmodules/src/web_proxy/broker.rs
+++ b/flmodules/src/web_proxy/broker.rs
@@ -1,22 +1,20 @@
 use core::str;
 use flarch::{
     data_storage::DataStorage,
-    platform_async_trait,
-    tasks::spawn_local,
     tasks::time::{timeout, Duration},
 };
 use thiserror::Error;
 use tokio::sync::{mpsc::channel, watch};
 
-use crate::overlay::messages::{NetworkWrapper, OverlayIn, OverlayMessage, OverlayOut};
+use crate::router::{broker::BrokerRouter, messages::{NetworkWrapper, RouterIn, RouterOut}};
 use flarch::{
-    broker::{Broker, BrokerError, Subsystem, SubsystemHandler},
+    broker::{Broker, BrokerError},
     nodeids::{NodeID, U256},
 };
 
 use super::{
-    core::{Counters, WebProxyConfig, WebProxyStorage, WebProxyStorageSave},
-    messages::{WebProxyIn, WebProxyMessage, WebProxyMessages, WebProxyOut},
+    core::{Counters, WebProxyConfig, WebProxyStorage},
+    messages::{Messages, WebProxyIn, WebProxyOut},
     response::Response,
 };
 
@@ -37,38 +35,28 @@ pub enum WebProxyError {
 #[derive(Clone)]
 pub struct WebProxy {
     /// Represents the underlying broker.
-    pub web_proxy: Broker<WebProxyMessage>,
+    pub web_proxy: Broker<WebProxyIn, WebProxyOut>,
     storage: watch::Receiver<WebProxyStorage>,
 }
 
 impl WebProxy {
     pub async fn start(
-        mut ds: Box<dyn DataStorage + Send>,
+        ds: Box<dyn DataStorage + Send>,
         our_id: NodeID,
-        overlay: Broker<OverlayMessage>,
+        router: BrokerRouter,
         config: WebProxyConfig,
     ) -> Result<Self, WebProxyError> {
-        let str = ds.get(MODULE_NAME).unwrap_or("".into());
-        let storage = WebProxyStorageSave::from_str(&str).unwrap_or_default();
         let mut web_proxy = Broker::new();
-        let messages = WebProxyMessages::new(storage.clone(), config, our_id, web_proxy.clone())?;
+        let (messages, storage) = Messages::new(ds, config, our_id, web_proxy.clone());
 
-        Translate::start(web_proxy.clone(), overlay, messages).await?;
-
-        let (tx, storage) = watch::channel(storage);
-        let (mut tap, _) = web_proxy.get_tap().await?;
-        spawn_local(async move {
-            loop {
-                if let Some(WebProxyMessage::Output(WebProxyOut::UpdateStorage(sto))) =
-                    tap.recv().await
-                {
-                    tx.send(sto.clone()).expect("updated storage");
-                    if let Ok(val) = sto.to_yaml() {
-                        ds.set(MODULE_NAME, &val).expect("updating storage");
-                    }
-                }
-            }
-        });
+        web_proxy.add_handler(Box::new(messages)).await?;
+        web_proxy
+            .add_translator_link(
+                router,
+                Box::new(Self::link_proxy_router),
+                Box::new(Self::link_router_proxy),
+            )
+            .await?;
 
         Ok(Self { web_proxy, storage })
     }
@@ -82,17 +70,18 @@ impl WebProxy {
         let our_rnd = U256::rnd();
         let (tx, rx) = channel(128);
         self.web_proxy
-            .emit_msg(WebProxyIn::RequestGet(our_rnd, url.to_string(), tx).into())?;
-        let (mut tap, id) = self.web_proxy.get_tap().await?;
+            .emit_msg_in(WebProxyIn::RequestGet(our_rnd, url.to_string(), tx))?;
+        let (mut tap, id) = self.web_proxy.get_tap_out().await?;
         timeout(Duration::from_secs(5), async move {
             while let Some(msg) = tap.recv().await {
-                if let WebProxyMessage::Output(WebProxyOut::ResponseGet(proxy, rnd, header)) = msg {
+                if let WebProxyOut::ResponseGet(proxy, rnd, header) = msg {
                     if rnd == our_rnd {
                         self.web_proxy.remove_subsystem(id).await?;
                         return Ok(Response::new(proxy, header, rx));
                     }
                 }
             }
+            // TODO: is this really called sometime?
             self.web_proxy.remove_subsystem(id).await?;
             return Err(WebProxyError::ResponseTimeout);
         })
@@ -103,83 +92,32 @@ impl WebProxy {
     pub fn get_counters(&mut self) -> Counters {
         self.storage.borrow().counters.clone()
     }
-}
 
-struct Translate {
-    messages: WebProxyMessages,
-}
-
-impl Translate {
-    async fn start(
-        mut web_proxy: Broker<WebProxyMessage>,
-        overlay: Broker<OverlayMessage>,
-        messages: WebProxyMessages,
-    ) -> Result<(), WebProxyError> {
-        web_proxy
-            .add_subsystem(Subsystem::Handler(Box::new(Translate { messages })))
-            .await?;
-        web_proxy
-            .link_bi(
-                overlay,
-                Box::new(Self::link_overlay_proxy),
-                Box::new(Self::link_proxy_overlay),
-            )
-            .await?;
-        Ok(())
-    }
-
-    fn link_overlay_proxy(msg: OverlayMessage) -> Option<WebProxyMessage> {
-        if let OverlayMessage::Output(msg_out) = msg {
-            match msg_out {
-                OverlayOut::NodeInfosConnected(list) => {
-                    Some(WebProxyIn::NodeInfoConnected(list).into())
-                }
-                OverlayOut::NetworkWrapperFromNetwork(id, msg) => msg
-                    .unwrap_yaml(MODULE_NAME)
-                    .map(|msg| WebProxyIn::FromNetwork(id, msg).into()),
-                _ => None,
-            }
-        } else {
-            None
+    fn link_router_proxy(msg: RouterOut) -> Option<WebProxyIn> {
+        match msg {
+            RouterOut::NodeInfosConnected(list) => Some(WebProxyIn::NodeInfoConnected(list)),
+            RouterOut::NetworkWrapperFromNetwork(id, msg) => msg
+                .unwrap_yaml(MODULE_NAME)
+                .map(|msg| WebProxyIn::FromNetwork(id, msg)),
+            _ => None,
         }
     }
 
-    fn link_proxy_overlay(msg: WebProxyMessage) -> Option<OverlayMessage> {
-        if let WebProxyMessage::Output(WebProxyOut::ToNetwork(id, msg_node)) = msg {
-            Some(
-                OverlayIn::NetworkWrapperToNetwork(
-                    id,
-                    NetworkWrapper::wrap_yaml(MODULE_NAME, &msg_node).unwrap(),
-                )
-                .into(),
-            )
+    fn link_proxy_router(msg: WebProxyOut) -> Option<RouterIn> {
+        if let WebProxyOut::ToNetwork(id, msg_node) = msg {
+            Some(RouterIn::NetworkWrapperToNetwork(
+                id,
+                NetworkWrapper::wrap_yaml(MODULE_NAME, &msg_node).unwrap(),
+            ))
         } else {
             None
         }
     }
 }
 
-#[platform_async_trait()]
-impl SubsystemHandler<WebProxyMessage> for Translate {
-    async fn messages(&mut self, msgs: Vec<WebProxyMessage>) -> Vec<WebProxyMessage> {
-        let msgs_in = msgs
-            .into_iter()
-            .filter_map(|msg| match msg {
-                WebProxyMessage::Input(msg_in) => Some(msg_in),
-                _ => None,
-            })
-            .collect();
-        self.messages
-            .process_messages(msgs_in)
-            .into_iter()
-            .map(|o| o.into())
-            .collect()
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use flarch::{data_storage::DataStorageTemp, start_logging_filter_level, tasks::wait_ms};
+    use flarch::{data_storage::DataStorageTemp, start_logging_filter_level, tasks::{spawn_local, wait_ms}};
 
     use crate::nodeconfig::NodeConfig;
 
@@ -187,7 +125,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_get() -> Result<(), WebProxyError> {
-        start_logging_filter_level(vec![], log::LevelFilter::Debug);
+        start_logging_filter_level(vec![], log::LevelFilter::Info);
         let cl_ds = Box::new(DataStorageTemp::new());
         let cl_in = NodeConfig::new().info;
         let cl_id = cl_in.get_id();
@@ -200,15 +138,13 @@ mod tests {
 
         let mut cl =
             WebProxy::start(cl_ds, cl_id, cl_rnd.clone(), WebProxyConfig::default()).await?;
-        let (mut cl_tap, _) = cl_rnd.get_tap().await?;
+        let (mut cl_tap, _) = cl_rnd.get_tap_in().await?;
         let _wp = WebProxy::start(wp_ds, wp_id, wp_rnd.clone(), WebProxyConfig::default()).await?;
-        let (mut wp_tap, _) = wp_rnd.get_tap().await?;
+        let (mut wp_tap, _) = wp_rnd.get_tap_in().await?;
 
         let list = vec![cl_in, wp_in];
-        cl_rnd.emit_msg(OverlayMessage::Output(OverlayOut::NodeInfosConnected(
-            list.clone(),
-        )))?;
-        wp_rnd.emit_msg(OverlayMessage::Output(OverlayOut::NodeInfosConnected(list)))?;
+        cl_rnd.emit_msg_out(RouterOut::NodeInfosConnected(list.clone()))?;
+        wp_rnd.emit_msg_out(RouterOut::NodeInfosConnected(list))?;
 
         let (tx, mut rx) = channel(1);
         spawn_local(async move {
@@ -225,25 +161,17 @@ mod tests {
                 return Ok(());
             }
 
-            if let Ok(OverlayMessage::Input(OverlayIn::NetworkWrapperToNetwork(dst, msg))) =
-                cl_tap.try_recv()
-            {
+            if let Ok(RouterIn::NetworkWrapperToNetwork(dst, msg)) = cl_tap.try_recv() {
                 log::debug!("Sending to WP: {msg:?}");
                 wp_rnd
-                    .emit_msg(OverlayMessage::Output(OverlayOut::NetworkWrapperFromNetwork(
-                        dst, msg,
-                    )))
+                    .emit_msg_out(RouterOut::NetworkWrapperFromNetwork(dst, msg))
                     .expect("sending to wp");
             }
 
-            if let Ok(OverlayMessage::Input(OverlayIn::NetworkWrapperToNetwork(dst, msg))) =
-                wp_tap.try_recv()
-            {
+            if let Ok(RouterIn::NetworkWrapperToNetwork(dst, msg)) = wp_tap.try_recv() {
                 log::debug!("Sending to CL: {msg:?}");
                 cl_rnd
-                    .emit_msg(OverlayMessage::Output(OverlayOut::NetworkWrapperFromNetwork(
-                        dst, msg,
-                    )))
+                    .emit_msg_out(RouterOut::NetworkWrapperFromNetwork(dst, msg))
                     .expect("sending to wp");
             }
 
diff --git a/flmodules/src/web_proxy/core.rs b/flmodules/src/web_proxy/core.rs
index 9769322d..2c271aa0 100644
--- a/flmodules/src/web_proxy/core.rs
+++ b/flmodules/src/web_proxy/core.rs
@@ -152,15 +152,3 @@ impl Default for WebProxyStorage {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use std::error::Error;
-
-    // use super::*;
-
-    #[test]
-    fn test_increase() -> Result<(), Box<dyn Error>> {
-        Ok(())
-    }
-}
diff --git a/flmodules/src/web_proxy/messages.rs b/flmodules/src/web_proxy/messages.rs
index 3b0fff7a..71fd7133 100644
--- a/flmodules/src/web_proxy/messages.rs
+++ b/flmodules/src/web_proxy/messages.rs
@@ -1,18 +1,19 @@
 use bytes::Bytes;
+use flarch::broker::{Broker, SubsystemHandler};
+use flarch::data_storage::DataStorage;
+use flarch::nodeids::{NodeID, U256};
+use flarch::platform_async_trait;
 use flarch::tasks::spawn_local;
-use flarch::{
-    broker::Broker,
-    nodeids::{NodeID, U256},
-};
 use futures::StreamExt;
 use serde::{Deserialize, Serialize};
 use tokio::sync::mpsc::Sender;
+use tokio::sync::watch;
 
+use crate::gossip_events::broker::MODULE_NAME;
 use crate::nodeconfig::NodeInfo;
 use crate::Modules;
 
 use super::{
-    broker::WebProxyError,
     core::*,
     response::{ResponseHeader, ResponseMessage},
 };
@@ -28,14 +29,6 @@ pub enum ModuleMessage {
     Response(U256, ResponseMessage),
 }
 
-/// First wrap all messages coming into this module and all messages going out in
-/// a single message.
-#[derive(Clone, Debug)]
-pub enum WebProxyMessage {
-    Input(WebProxyIn),
-    Output(WebProxyOut),
-}
-
 /// All possible calls TO this module.
 #[derive(Debug, Clone)]
 pub enum WebProxyIn {
@@ -49,27 +42,35 @@ pub enum WebProxyIn {
 pub enum WebProxyOut {
     ToNetwork(NodeID, ModuleMessage),
     ResponseGet(NodeID, U256, ResponseHeader),
-    UpdateStorage(WebProxyStorage),
 }
 
 /// The message handling part, but only for WebProxy messages.
-pub struct WebProxyMessages {
-    pub core: WebProxyCore,
-    broker: Broker<WebProxyMessage>,
+pub struct Messages {
+    core: WebProxyCore,
+    broker: Broker<WebProxyIn, WebProxyOut>,
+    tx: Option<watch::Sender<WebProxyStorage>>,
 }
 
-impl WebProxyMessages {
+impl Messages {
     /// Returns a new chat module.
     pub fn new(
-        storage: WebProxyStorage,
+        ds: Box<dyn DataStorage + Send>,
         cfg: WebProxyConfig,
         our_id: NodeID,
-        broker: Broker<WebProxyMessage>,
-    ) -> Result<Self, WebProxyError> {
-        Ok(Self {
-            core: WebProxyCore::new(storage, cfg, our_id),
-            broker,
-        })
+        broker: Broker<WebProxyIn, WebProxyOut>,
+    ) -> (Self, watch::Receiver<WebProxyStorage>) {
+        let str = ds.get(MODULE_NAME).unwrap_or("".into());
+        let storage = WebProxyStorageSave::from_str(&str).unwrap_or_default();
+
+        let (tx, rx) = watch::channel(storage.clone());
+        (
+            Self {
+                core: WebProxyCore::new(storage, cfg, our_id),
+                broker,
+                tx: Some(tx),
+            },
+            rx,
+        )
     }
 
     /// Processes one generic message and returns either an error
@@ -88,11 +89,15 @@ impl WebProxyMessages {
     /// Processes a node to node message and returns zero or more
     /// MessageOut.
     pub fn process_node_message(&mut self, src: NodeID, msg: ModuleMessage) -> Vec<WebProxyOut> {
-        let mut out = match msg {
+        let out = match msg {
             ModuleMessage::Request(nonce, request) => self.start_request(src, nonce, request),
             ModuleMessage::Response(nonce, response) => self.handle_response(src, nonce, response),
         };
-        out.push(WebProxyOut::UpdateStorage(self.core.storage.clone()));
+        self.tx.clone().map(|tx| {
+            tx.send(self.core.storage.clone())
+                .is_err()
+                .then(|| self.tx = None)
+        });
         out
     }
 
@@ -101,7 +106,7 @@ impl WebProxyMessages {
         self.core.node_list(
             nodes
                 .iter()
-                .filter(|ni| ni.modules.contains(Modules::ENABLE_WEBPROXY_REQUESTS))
+                .filter(|ni| ni.modules.contains(Modules::WEBPROXY_REQUESTS))
                 .map(|ni| ni.get_id())
                 .collect::<Vec<NodeID>>()
                 .into(),
@@ -111,7 +116,10 @@ impl WebProxyMessages {
 
     fn request_get(&mut self, rnd: U256, url: String, tx: Sender<Bytes>) -> Vec<WebProxyOut> {
         self.core.request_get(rnd, tx).map_or(vec![], |node| {
-            vec![WebProxyOut::ToNetwork(node, ModuleMessage::Request(rnd, url))]
+            vec![WebProxyOut::ToNetwork(
+                node,
+                ModuleMessage::Request(rnd, url),
+            )]
         })
     }
 
@@ -121,47 +129,47 @@ impl WebProxyMessages {
             match reqwest::get(request).await {
                 Ok(resp) => {
                     broker
-                        .emit_msg(WebProxyMessage::Output(WebProxyOut::ToNetwork(
+                        .emit_msg_out(WebProxyOut::ToNetwork(
                             src,
                             ModuleMessage::Response(nonce, ResponseMessage::Header((&resp).into())),
-                        )))
+                        ))
                         .expect("sending header");
                     let mut stream = resp.bytes_stream().chunks(1024);
                     while let Some(chunks) = stream.next().await {
                         for chunk in chunks {
                             broker
-                                .emit_msg(WebProxyMessage::Output(WebProxyOut::ToNetwork(
+                                .emit_msg_out(WebProxyOut::ToNetwork(
                                     src,
                                     ModuleMessage::Response(
                                         nonce,
                                         ResponseMessage::Body(chunk.expect("getting chunk")),
                                     ),
-                                )))
+                                ))
                                 .expect("sending body");
                         }
                     }
                     broker
-                        .emit_msg(WebProxyMessage::Output(WebProxyOut::ToNetwork(
+                        .emit_msg_out(WebProxyOut::ToNetwork(
                             src,
                             ModuleMessage::Response(nonce, ResponseMessage::Done),
-                        )))
+                        ))
                         .expect("sending done");
                 }
                 Err(e) => {
                     broker
-                        .emit_msg(WebProxyMessage::Output(WebProxyOut::ToNetwork(
+                        .emit_msg_out(WebProxyOut::ToNetwork(
                             src,
                             ModuleMessage::Response(nonce, ResponseMessage::Error(e.to_string())),
-                        )))
+                        ))
                         .expect("Sending done message for");
                     return;
                 }
             }
             broker
-                .emit_msg(WebProxyMessage::Output(WebProxyOut::ToNetwork(
+                .emit_msg_out(WebProxyOut::ToNetwork(
                     src,
                     ModuleMessage::Response(nonce, ResponseMessage::Done),
-                )))
+                ))
                 .expect("Sending done message for");
         });
         vec![]
@@ -181,26 +189,9 @@ impl WebProxyMessages {
     }
 }
 
-/// Convenience method to reduce long lines.
-impl From<WebProxyIn> for WebProxyMessage {
-    fn from(msg: WebProxyIn) -> Self {
-        WebProxyMessage::Input(msg)
-    }
-}
-
-/// Convenience method to reduce long lines.
-impl From<WebProxyOut> for WebProxyMessage {
-    fn from(msg: WebProxyOut) -> Self {
-        WebProxyMessage::Output(msg)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_something() -> Result<(), WebProxyError> {
-        Ok(())
+#[platform_async_trait()]
+impl SubsystemHandler<WebProxyIn, WebProxyOut> for Messages {
+    async fn messages(&mut self, msgs: Vec<WebProxyIn>) -> Vec<WebProxyOut> {
+        self.process_messages(msgs)
     }
 }
diff --git a/flmodules/src/web_proxy/response.rs b/flmodules/src/web_proxy/response.rs
index 78bd204d..afd09713 100644
--- a/flmodules/src/web_proxy/response.rs
+++ b/flmodules/src/web_proxy/response.rs
@@ -2,7 +2,7 @@ use std::{collections::HashMap, str::Utf8Error};
 
 use bytes::{Bytes, BytesMut};
 use serde::{Deserialize, Serialize};
-use serde_with::{base64::Base64, serde_as};
+use serde_with::{hex::Hex, serde_as};
 use tokio::sync::mpsc::Receiver;
 
 use flarch::nodeids::NodeID;
@@ -48,7 +48,7 @@ impl Response {
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum ResponseMessage {
     Header(ResponseHeader),
-    Body(#[serde_as(as = "Base64")]Bytes),
+    Body(#[serde_as(as = "Hex")]Bytes),
     Error(String),
     Done,
 }
diff --git a/flmodules/tests/load.rs b/flmodules/tests/load.rs
deleted file mode 100644
index 4b621df5..00000000
--- a/flmodules/tests/load.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use std::error::Error;
-
-use flarch::{nodeids::NodeID, start_logging};
-use flmodules::gossip_events::{
-    core::{Category, EventsStorage},
-    messages::{Config, GossipEvents, GossipIn, GossipOut, ModuleMessage},
-};
-
-#[tokio::test]
-// Makes sure that the messages from the old format are now correctly translated to the new format.
-async fn test_gossip() -> Result<(), Box<dyn Error>> {
-    start_logging();
-
-    let evs = EventsConfig::new();
-
-    let nc1 = NodeID::rnd();
-    let mut es1 = GossipEvents::new(Config::new(nc1));
-    es1.process_message(GossipIn::SetStorage(evs.storage1.clone()))?;
-
-    let nc2 = NodeID::rnd();
-    let mut es2 = GossipEvents::new(Config::new(nc2));
-    es2.process_message(GossipIn::SetStorage(evs.storage2.clone()))?;
-
-    let msg12 = es1.node_list(vec![nc1, nc2].into());
-    let msg21 = es2.process_messages(msg_out(msg12))?;
-    let msg12 = es1.process_messages(msg_out(msg21))?;
-    let msg21 = es2.process_messages(msg_out(msg12))?;
-    assert_eq!(1, msg21.len());
-    if let GossipOut::ToNetwork(_, ModuleMessage::Events(events)) = &msg21[0] {
-        assert_eq!(
-            2,
-            events
-                .iter()
-                .filter(|ev| ev.category == Category::TextMessage)
-                .count()
-        );
-    } else {
-        panic!("Didn't get node message with events");
-    }
-
-    Ok(())
-}
-
-fn msg_out(mut msgs: Vec<GossipOut>) -> Vec<GossipIn> {
-    msgs.drain(..)
-        .filter_map(|msg| match msg {
-            GossipOut::ToNetwork(id, msg_node) => Some(GossipIn::FromNetwork(id, msg_node)),
-            _ => None,
-        })
-        .collect()
-}
-
-struct EventsConfig {
-    _config1: String,
-    storage1: EventsStorage,
-    _config2: String,
-    storage2: EventsStorage,
-}
-
-impl EventsConfig {
-    fn new() -> Self {
-        let config1 = std::fs::read_to_string("tests/load/gossip_events-01.yaml")
-            .expect("Couldn't find gossip-events file");
-        let mut storage1 = EventsStorage::new();
-        storage1.set(&config1).expect("Setting storage");
-        let config2 = std::fs::read_to_string("tests/load/gossip_events-02.yaml")
-            .expect("Couldn't find gossip-events file");
-        let mut storage2 = EventsStorage::new();
-        storage2.set(&config2).expect("Setting storage");
-        Self {
-            _config1: config1,
-            storage1,
-            _config2: config2,
-            storage2,
-        }
-    }
-}
diff --git a/flmodules/tests/load/fledger_nodeConfig.yaml b/flmodules/tests/load/fledger_nodeConfig.yaml
deleted file mode 100644
index e4b25bcf..00000000
--- a/flmodules/tests/load/fledger_nodeConfig.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-NodeConfigV1:
-  info:
-    name: vague-cover
-    client: unknown
-    pubkey: wDYj/Rm4XFHTjpyWdDel6Umf/TS7s7s8U4Gp3F1OupA=
-  keypair: kkSSPuWG5IQ3BCaOTOnU0FwJbO5EhBs9IKgkXAO0R3nANiP9GbhcUdOOnJZ0N6XpSZ/9NLuzuzxTgancXU66kA==
diff --git a/flmodules/tests/load/gossip_events-01.yaml b/flmodules/tests/load/gossip_events-01.yaml
deleted file mode 100644
index 9eb4e664..00000000
--- a/flmodules/tests/load/gossip_events-01.yaml
+++ /dev/null
@@ -1,328 +0,0 @@
----
-V3:
-  storage:
-    TextMessage:
-      config:
-        unique: false
-        max_events: 50
-      events:
-        4a9a75831c7e040b22d72df24c352a9969f3fc3094547676617c3ae56ddc3064:
-          category: TextMessage
-          src: e0d58949b0180ff64a49a2888c961b3994fe58bc2de4babd464f5c3aefd73c56
-          created: 1665756692731
-          msg: fsdfasdfasd
-        5b11ef7a6a0c8bc500caab5c1996d5e200bc7e8e8e3ddde3bb4c4967014815be:
-          category: TextMessage
-          src: f994d64cb1988b7c66a52cb2f1fe5e6b15e4fdf5c5f398bb9fe83e5296accc2e
-          created: 1666768574422
-          msg: Hello Fledger from Germany.
-        bef5d1ab05a83fd41982716c94af546c7cc4a1fc3fb648353c4f743b554695b3:
-          category: TextMessage
-          src: e0d58949b0180ff64a49a2888c961b3994fe58bc2de4babd464f5c3aefd73c56
-          created: 1665756698788
-          msg: "more\n"
-        1f676b96ca97bb426dcbe73bad6a57f2ebddcda347d9eb40189103e1ea25a342:
-          category: TextMessage
-          src: 9f5d0753642c66d5b30e139bb632967e7a122dd356cc37254b806effdcc45501
-          created: 1666382447549
-          msg: Finalizing release of flnet on crates.io
-        91154eec61feaed1e168f2768eeb64b85129f4cffa9d34ccd5c63ecc059a8243:
-          category: TextMessage
-          src: 1e97c1e3e7327b15291c6614af238b9c97ed367c805a77df72646f0c351ef080
-          created: 1666643902020
-          msg: hello
-        f17c2216bc0dc48e5934b8e585bebce97abf75ed1c2f7a4a941305c9464f299d:
-          category: TextMessage
-          src: 9f5d0753642c66d5b30e139bb632967e7a122dd356cc37254b806effdcc45501
-          created: 1666787389976
-          msg: "Greetings to Germany - what would be your killer-app for fledger? I'm currently hesitating between chat (twitter) / web-hosting / encrypted torrent."
-    NodeInfo:
-      config:
-        unique: true
-        max_events: 100
-      events:
-        8c0bdaef13f369d3ed9e15aada9eabbbf2fff30c20b7bdb614319b07cf26d7c9:
-          category: NodeInfo
-          src: 79146dfa07aaeada16a2b567da55e54dd7af1c01c4f079ca552110b26a37597d
-          created: 1657811878771
-          msg: "---\nNodeInfoV2:\n  name: shaggy-scarecrow\n  client: unknown\n  pubkey: eRRt+geq6toWorVn2lXlTdevHAHE8HnKVSEQsmo3WX0=\n"
-        43fa56e1e8d256778e2635002614935a5310daeb2c5b8502e2c64de1b2565eb5:
-          category: NodeInfo
-          src: 3013796737f295990219aeb126bb2c52948b17ba3d8a5c11ccc3201300d81929
-          created: 1653838216840
-          msg: "{\"info\":\"abnormal-butter\",\"client\":\"node\",\"pubkey\":[48,19,121,103,55,242,149,153,2,25,174,177,38,187,44,82,148,139,23,186,61,138,92,17,204,195,32,19,0,216,25,41],\"node_capacities\":{\"leader\":false}}"
-        948863b5ad41ae8c8627eafed976d1fc4e2b44ddcf81f4bb011b82c1333435e4:
-          category: NodeInfo
-          src: e47c1873723b7a08f99457735bc825f82a2c6738d57ee14fa3c004375b6e1e10
-          created: 1653900898634
-          msg: "---\nNodeInfoV2:\n  name: flat-stick\n  client: unknown\n  pubkey: 5HwYc3I7egj5lFdzW8gl+CosZzjVfuFPo8AEN1tuHhA=\n"
-        5613241e34a438ea25ad33ab18801388076ccca2d6498af7a416cc6051a6168a:
-          category: NodeInfo
-          src: 6bc0afd686d74410b4b4a200b5020efda181526375b8c4583b0e6d09b7a25159
-          created: 1655561130694
-          msg: "---\nNodeInfoV2:\n  name: ancient-pencil\n  client: unknown\n  pubkey: a8Cv1obXRBC0tKIAtQIO/aGBUmN1uMRYOw5tCbeiUVk=\n"
-        2e64c41ab9ef4ac409b7c7d37d32ea15259e64269210d4a244cb1becaa6df106:
-          category: NodeInfo
-          src: c03623fd19b85c51d38e9c967437a5e9499ffd34bbb3bb3c5381a9dc5d4eba90
-          created: 1666875800723
-          msg: "---\nNodeInfoV2:\n  name: vague-cover\n  client: unknown\n  pubkey: wDYj/Rm4XFHTjpyWdDel6Umf/TS7s7s8U4Gp3F1OupA=\n"
-        f17d02303ba95595cc78bd0997f4777709023f8e9a4f0f313873fccaac6e3146:
-          category: NodeInfo
-          src: d7c5f61ec1061b49557c0c7360c4b25b8762e92df05caefe55d269324eb7e976
-          created: 1658557056614
-          msg: "---\nNodeInfoV2:\n  name: brash-oatmeal\n  client: unknown\n  pubkey: 18X2HsEGG0lVfAxzYMSyW4di6S3wXK7+VdJpMk636XY=\n"
-        946ccb8f305cc5bc21d3fe226f34e3990091ddc117f58abe942998f1cc25de1b:
-          category: NodeInfo
-          src: f97049d015420e729dfeb10a0e2e127edf4956e0ea8ce2f66cea005fa07e8d6d
-          created: 1666787455216
-          msg: "---\nNodeInfoV2:\n  name: outgoing-care\n  client: unknown\n  pubkey: +XBJ0BVCDnKd/rEKDi4Sft9JVuDqjOL2bOoAX6B+jW0=\n"
-        f0087760e4841a14a6f2971bbce34c7a05781723649a4a0a39b608ec6467ef2d:
-          category: NodeInfo
-          src: 26ad09d6144f1778eb4b33e71b965b5e48447081cf65b8d0d5ee04b16cc31c06
-          created: 1653832816773
-          msg: "{\"info\":\"abrupt-tree\",\"client\":\"node\",\"pubkey\":[38,173,9,214,20,79,23,120,235,75,51,231,27,150,91,94,72,68,112,129,207,101,184,208,213,238,4,177,108,195,28,6],\"node_capacities\":{\"leader\":false}}"
-        00159df3d000abcf8242a8c7bf8364d9abf68fd8bd367943d01f8916bd2b752b:
-          category: NodeInfo
-          src: 1e4bb6be6df4ca7c1794a9a1bf05971ee36ccd9c0520dea310fe7330bf474a2c
-          created: 1665762528368
-          msg: "---\nNodeInfoV2:\n  name: long-term-quilt\n  client: unknown\n  pubkey: Hku2vm30ynwXlKmhvwWXHuNszZwFIN6jEP5zML9HSiw=\n"
-        8ae4de84c987e119d39b8a67a7cb95fdd10d8674f9623698a28a0bae88388058:
-          category: NodeInfo
-          src: 3b170a40053fbee566100deb21aff34a9490d65e448f0b4cfbd57f7eb0c7d4d4
-          created: 1653831916525
-          msg: "{\"info\":\"abrupt-view\",\"client\":\"node\",\"pubkey\":[59,23,10,64,5,63,190,229,102,16,13,235,33,175,243,74,148,144,214,94,68,143,11,76,251,213,127,126,176,199,212,212],\"node_capacities\":{\"leader\":false}}"
-        62cfd2d9f6a59fd5a8b210783c53eac0f11eeff359d5e08d8f90580dc4abe2b2:
-          category: NodeInfo
-          src: d8e3143e02c620c19ba4b8e7d6e28a68e6e6691c2157396c0d6094bbe9b8400e
-          created: 1666643912270
-          msg: "---\nNodeInfoV2:\n  name: outrageous-cellar\n  client: unknown\n  pubkey: 2OMUPgLGIMGbpLjn1uKKaObmaRwhVzlsDWCUu+m4QA4=\n"
-        6f32d38c088e634a71fe71c2488dd32ac70a4a0e75b6883c3fe5e7290b614b7e:
-          category: NodeInfo
-          src: 399658c060fac6c4f72bd70cc55e89795fba903d40456a5b9e78068d1d49ecde
-          created: 1666875903040
-          msg: "---\nNodeInfoV2:\n  name: ludicrous-night\n  client: unknown\n  pubkey: OZZYwGD6xsT3K9cMxV6JeV+6kD1ARWpbnngGjR1J7N4=\n"
-        4b090cc0c669026a3ca564bd10f96441f93eb9c62f1f58362b5060ea9a7303a5:
-          category: NodeInfo
-          src: 3b12f9f9c85be7ce26e593730246118c303fa0720f5670deb65ce428af15ef50
-          created: 1653892375441
-          msg: "---\nNodeInfoV2:\n  name: somber-brake\n  client: unknown\n  pubkey: OxL5+chb584m5ZNzAkYRjDA/oHIPVnDetlzkKK8V71A=\n"
-        57435d37f00846ce21af42b14efa70b3e36475dc3a4f45669a6ec977ac475fab:
-          category: NodeInfo
-          src: 3b1018f6e447532c5aba14dccf8ec4ae85ecd139f624336f156295563e4672d6
-          created: 1653845417091
-          msg: "{\"info\":\"humorous-cherries\",\"client\":\"node\",\"pubkey\":[59,16,24,246,228,71,83,44,90,186,20,220,207,142,196,174,133,236,209,57,246,36,51,111,21,98,149,86,62,70,114,214],\"node_capacities\":{\"leader\":false}}"
-        452e01c973266ce7e08d4c71a6893a8825f358f94d8ea16a41d0834a77dcb7b5:
-          category: NodeInfo
-          src: ecb34f417caa0a5f4c9cdf191ca42d689a4a457c807af488dc39fdedeb132636
-          created: 1653850816282
-          msg: "{\"info\":\"hesitant-children\",\"client\":\"node\",\"pubkey\":[236,179,79,65,124,170,10,95,76,156,223,25,28,164,45,104,154,74,69,124,128,122,244,136,220,57,253,237,235,19,38,54],\"node_capacities\":{\"leader\":false}}"
-        c04a74d5fd75c7ccdd95a95aaccca4edb8b1b3ccb1fa35639bb247e01eb38532:
-          category: NodeInfo
-          src: 19177a73e6e99f88df8b6bc40bc11fab6b68a99233522642045c5b20c22968c8
-          created: 1653938864039
-          msg: "---\nNodeInfoV2:\n  name: craven-cub\n  client: unknown\n  pubkey: GRd6c+bpn4jfi2vEC8Efq2toqZIzUiZCBFxbIMIpaMg=\n"
-        23019ea728f2026bac871469906ec1e4509a096835390e5636e3c5e5c086994b:
-          category: NodeInfo
-          src: f9e94ffad4f6af53adc20eabedda953a9eab77601b681f2a3799eb4033cd248b
-          created: 1653839116954
-          msg: "{\"info\":\"standing-lamp\",\"client\":\"node\",\"pubkey\":[249,233,79,250,212,246,175,83,173,194,14,171,237,218,149,58,158,171,119,96,27,104,31,42,55,153,235,64,51,205,36,139],\"node_capacities\":{\"leader\":false}}"
-        f17c75389597ac656562d248d8cfc4c10a088e3e25de12c2b99432efb0a54f62:
-          category: NodeInfo
-          src: 97dd29f0d9b963e05267d10aae2b8fad29b7bfc32c3c906584fb18535de763af
-          created: 1653848117333
-          msg: "{\"info\":\"spotty-bed\",\"client\":\"node\",\"pubkey\":[151,221,41,240,217,185,99,224,82,103,209,10,174,43,143,173,41,183,191,195,44,60,144,101,132,251,24,83,93,231,99,175],\"node_capacities\":{\"leader\":false}}"
-        1a2895031520015ce4cf92eb12d3ad9e97bba2a10d67038e167d9a1658b06d6c:
-          category: NodeInfo
-          src: c25118b3aa312494e127212a1dfb3172ee3beb5c909b6d0bfb9a9e809cb76b67
-          created: 1657894903098
-          msg: "---\nNodeInfoV2:\n  name: dazzling-trees\n  client: unknown\n  pubkey: wlEYs6oxJJThJyEqHfsxcu4761yQm20L+5qegJy3a2c=\n"
-        b1219e3bf4c0948bbe9d0c4ab2254beaaab3e176b47b39a5817985e9a8a2e10d:
-          category: NodeInfo
-          src: 58b6b9028f704c081c1fbe6c124861c0390c913e6f601a58411feddb4619e248
-          created: 1653833717200
-          msg: "{\"info\":\"used-death\",\"client\":\"node\",\"pubkey\":[88,182,185,2,143,112,76,8,28,31,190,108,18,72,97,192,57,12,145,62,111,96,26,88,65,31,237,219,70,25,226,72],\"node_capacities\":{\"leader\":false}}"
-        833489763a4be0450073a9032a81f1b4d854a8876f4cdd5e1e9ea0343817dfc5:
-          category: NodeInfo
-          src: 07f5c490180ea158946f800004ea5bbc061edb2414996c8289367dd10bc365e8
-          created: 1653900948669
-          msg: "---\nNodeInfoV2:\n  name: afraid-creature\n  client: unknown\n  pubkey: B/XEkBgOoViUb4AABOpbvAYe2yQUmWyCiTZ90QvDZeg=\n"
-        e0bb0ffc86d8de05a0fda6ca5fb94b0adbd3ab224b47f806492c736bbd409d95:
-          category: NodeInfo
-          src: afedbc0e78b1f783d71334fa8af9bf1eb24141d46341733fbea5ad6d714d2af1
-          created: 1657629457681
-          msg: "---\nNodeInfoV2:\n  name: silent-blood\n  client: unknown\n  pubkey: r+28Dnix94PXEzT6ivm/HrJBQdRjQXM/vqWtbXFNKvE=\n"
-        3d9ec9d2efd5afce87df91d1ee5a448d4bce1ff0c4b47eebd309bb0cf05fcfc6:
-          category: NodeInfo
-          src: 841d99b215baedb2120460f9f7a9c2c966984fc405581b77ae14e574a5404579
-          created: 1653836416754
-          msg: "{\"info\":\"ceaseless-rod\",\"client\":\"node\",\"pubkey\":[132,29,153,178,21,186,237,178,18,4,96,249,247,169,194,201,102,152,79,196,5,88,27,119,174,20,229,116,165,64,69,121],\"node_capacities\":{\"leader\":false}}"
-        4e69bbb3a86d8f93d49aabf7f560737f37354256affe257162c204a36b7b342f:
-          category: NodeInfo
-          src: 8e6aab048dcc9e8e6d1163a0ef0666f24ad81df0c0c1c9657d3be3cf7c5aaee7
-          created: 1666768372806
-          msg: "---\nNodeInfoV2:\n  name: daffy-beggar\n  client: unknown\n  pubkey: jmqrBI3Mno5tEWOg7wZm8krYHfDAwcllfTvjz3xaruc=\n"
-        000853d7160f3928fa5282db4c4b85bf431e4aa90f7b5e5196258f8c13a06047:
-          category: NodeInfo
-          src: 136db004eab73e111036bb4b5c334ea5af0aff001d39589a1d3715e3f068bd0c
-          created: 1657803341020
-          msg: "---\nNodeInfoV2:\n  name: moaning-rat\n  client: unknown\n  pubkey: E22wBOq3PhEQNrtLXDNOpa8K/wAdOViaHTcV4/BovQw=\n"
-        fe9031d09ee3b21806b160913320bebad5104c7b058b2c99e78b45a8629c831b:
-          category: NodeInfo
-          src: 6d0c4f24e178c770118cfd924d4dcb6bc39afbcf1ec2d3c7a96e683cc6ee292c
-          created: 1653842717032
-          msg: "{\"info\":\"lonely-chain\",\"client\":\"node\",\"pubkey\":[109,12,79,36,225,120,199,112,17,140,253,146,77,77,203,107,195,154,251,207,30,194,211,199,169,110,104,60,198,238,41,44],\"node_capacities\":{\"leader\":false}}"
-        c0958aa669041dbda9e9970a06af96b783af559636b7ea550e50f68d37033237:
-          category: NodeInfo
-          src: a0fcb7c94e88736433edcb83f71634e57b5b913cba633ae8c1b204fe146da993
-          created: 1653846315902
-          msg: "{\"info\":\"needy-cub\",\"client\":\"node\",\"pubkey\":[160,252,183,201,78,136,115,100,51,237,203,131,247,22,52,229,123,91,145,60,186,99,58,232,193,178,4,254,20,109,169,147],\"node_capacities\":{\"leader\":false}}"
-        c7b2249438ab427bc938dd170f82d26eae9ef418cdb1330dcc6d42afaa3a4d9a:
-          category: NodeInfo
-          src: b534c304a4853c7c90a2f7936f288ffbdb466bf1b82f14cffc9cd23427fd5a73
-          created: 1655080923671
-          msg: "---\nNodeInfoV2:\n  name: wasteful-balloon\n  client: unknown\n  pubkey: tTTDBKSFPHyQoveTbyiP+9tGa/G4LxTP/JzSNCf9WnM=\n"
-        94d2dc84117099a66c422d6391a9ef5fea16f7d2d6e64a408fe4c0b01624e754:
-          category: NodeInfo
-          src: 4e25a245ae317adf66db37d76a65802deaf101b17b5f0900ee435fce3f71871f
-          created: 1666861216626
-          msg: "---\nNodeInfoV2:\n  name: Root Node 1\n  client: unknown\n  pubkey: TiWiRa4xet9m2zfXamWALerxAbF7XwkA7kNfzj9xhx8=\n"
-        5e0d534f4b4407142870f8d6ef0a95ffb2e756007bf0d226e88df16bdec5c818:
-          category: NodeInfo
-          src: 691994681b0f73458620f167c0937cd91c36edb1e11e0ce4996109851d6d667d
-          created: 1666860316782
-          msg: "---\nNodeInfoV2:\n  name: Root Node 2\n  client: unknown\n  pubkey: aRmUaBsPc0WGIPFnwJN82Rw27bHhHgzkmWEJhR1tZn0=\n"
-        0aa631ee6bdbf09621d55ca0cc986ab4fccbf60d6f5122803593fe000327326e:
-          category: NodeInfo
-          src: 00445197c49bb75dbf26bd54bcaffc875e9615cca12a49f5f4cfc33d3e2d8bc2
-          created: 1653844516059
-          msg: "{\"info\":\"boorish-place\",\"client\":\"node\",\"pubkey\":[0,68,81,151,196,155,183,93,191,38,189,84,188,175,252,135,94,150,21,204,161,42,73,245,244,207,195,61,62,45,139,194],\"node_capacities\":{\"leader\":false}}"
-        8fcf2e05f7ca13daed8b9f24137675b5a65382f81696a80b9f96bc51736676af:
-          category: NodeInfo
-          src: 9d3890af43bb439fd52e9cc661095218bc7525a9b9e6c5900302bcc1384964e5
-          created: 1666875800838
-          msg: "---\nNodeInfoV2:\n  name: hateful-choice\n  client: unknown\n  pubkey: nTiQr0O7Q5/VLpzGYQlSGLx1Jam55sWQAwK8wThJZOU=\n"
-        476f10d1ae6d1328706b714e3f30bf8ccd5b30944a7cd22b279eb6f749424754:
-          category: NodeInfo
-          src: 9f5d0753642c66d5b30e139bb632967e7a122dd356cc37254b806effdcc45501
-          created: 1666859463309
-          msg: "---\nNodeInfoV2:\n  name: comfortable-toothbrush\n  client: unknown\n  pubkey: n10HU2QsZtWzDhObtjKWfnoSLdNWzDclS4Bu/9zEVQE=\n"
-        fbb4f979b48a76d54b38a9028e3de3116a4b0cf928f57f092b88b1bfe90db2f7:
-          category: NodeInfo
-          src: e734fec11b23e717789714eb442e9ef6d1c32cf1ced098d81b7a6e38920aaaf2
-          created: 1653840916813
-          msg: "{\"info\":\"grateful-game\",\"client\":\"node\",\"pubkey\":[231,52,254,193,27,35,231,23,120,151,20,235,68,46,158,246,209,195,44,241,206,208,152,216,27,122,110,56,146,10,170,242],\"node_capacities\":{\"leader\":false}}"
-        edbd27d9bfa593c3c0575f72013625ead58b7141062aac7a6c373d28fe799ed6:
-          category: NodeInfo
-          src: 1e783b375211a27e0aefe94f60eab1af60b43abf3237d5dc8c5f04488bba6623
-          created: 1654013682538
-          msg: "---\nNodeInfoV2:\n  name: disgusted-team\n  client: unknown\n  pubkey: Hng7N1IRon4K7+lPYOqxr2C0Or8yN9XcjF8ESIu6ZiM=\n"
-        b4109388a8a7256cc7ef7047f5d68a2d8d3a76cfe07f1f130aaeb88a54dd8c54:
-          category: NodeInfo
-          src: 7feaf6856acbb1b952b7a6c543bdc84be7eb1eb5046589d4d2c5e41ecccdd196
-          created: 1665762528464
-          msg: "---\nNodeInfoV2:\n  name: thundering-able\n  client: unknown\n  pubkey: f+r2hWrLsblSt6bFQ73IS+frHrUEZYnU0sXkHszN0ZY=\n"
-        915b144b195d68b1d81fcc4efa0e4473279f3aa2dcdbd94c089e95c16112490c:
-          category: NodeInfo
-          src: 343d48b80be67f6e8a0d66a0fb5be9a8dca2f9d08fdfb6fb11c5b84c5c656950
-          created: 1666438460377
-          msg: "---\nNodeInfoV2:\n  name: quick-addition\n  client: unknown\n  pubkey: ND1IuAvmf26KDWag+1vpqNyi+dCP37b7EcW4TFxlaVA=\n"
-        b77f0d91a76dca809b9cf00f6a6868442ef1dcd028b915bfcafd798d49bd91a1:
-          category: NodeInfo
-          src: ec6548b9b5b10d5fb37fc9216ceded20c2a32dc0bfa81732382830434f40a8ec
-          created: 1657944988500
-          msg: "---\nNodeInfoV2:\n  name: sturdy-question\n  client: unknown\n  pubkey: 7GVIubWxDV+zf8khbO3tIMKjLcC/qBcyOCgwQ09AqOw=\n"
-        6bcd93ed0fd73d4b209b65adb4cd184a18ef068dc11470335a4f5a2c6dfc2ed2:
-          category: NodeInfo
-          src: 8048db9581647f410a8358aae850be4019ec405bdd26a03d3cb3a42c7372d242
-          created: 1666787268334
-          msg: "---\nNodeInfoV2:\n  name: near-letter\n  client: unknown\n  pubkey: gEjblYFkf0EKg1iq6FC+QBnsQFvdJqA9PLOkLHNy0kI=\n"
-        9e15b743e3ecf9ee8f356f84fe683a5c2910aeb334215402a4a74b271335d5d1:
-          category: NodeInfo
-          src: 8fa6c7e2991ddc5dc7f4444e63f8766b5648087bb34b820bc2fd3d7f1bfb2415
-          created: 1653851718703
-          msg: "{\"info\":\"opposite-chair\",\"client\":\"node\",\"pubkey\":[143,166,199,226,153,29,220,93,199,244,68,78,99,248,118,107,86,72,8,123,179,75,130,11,194,253,61,127,27,251,36,21],\"node_capacities\":{\"leader\":false}}"
-        003b12ddee586f474b1501a2f6fec8e3e354f2925338cb8b54b71502e041afc3:
-          category: NodeInfo
-          src: eb6cce15a439e801ea9fbcb83213f0c517d77605a213be2b0279edc81b8e8874
-          created: 1654243692382
-          msg: "---\nNodeInfoV2:\n  name: known-stream\n  client: unknown\n  pubkey: 62zOFaQ56AHqn7y4MhPwxRfXdgWiE74rAnntyBuOiHQ=\n"
-        3cb671e07e41a73d59a9f4e9146a138cade6ca063606c9780ab289c5e26b8a05:
-          category: NodeInfo
-          src: 02874541f322035e603600ce5b41dec4aa81f8b4cb1411785642e50469228d92
-          created: 1653841816573
-          msg: "{\"info\":\"lonely-dolls\",\"client\":\"node\",\"pubkey\":[2,135,69,65,243,34,3,94,96,54,0,206,91,65,222,196,170,129,248,180,203,20,17,120,86,66,229,4,105,34,141,146],\"node_capacities\":{\"leader\":false}}"
-        53e0cd8150e202cb18f39d7c02b8dc95ee6486e98ffb138eb061abb52a176710:
-          category: NodeInfo
-          src: fbc3f0e97dec446e4ba944adb86b9f605ede3f57e05f8efa0ba0e75b13d39427
-          created: 1666875806781
-          msg: "---\nNodeInfoV2:\n  name: abstracted-arm\n  client: unknown\n  pubkey: +8Pw6X3sRG5LqUStuGufYF7eP1fgX476C6DnWxPTlCc=\n"
-        73ee5fb50c3fffecd2bf187056d9238cfe2b5728325f9f083d9dd4e626596ee4:
-          category: NodeInfo
-          src: 55fc6ce2769db607e5ace589b6ae605d2e76ff238e2c2516a23a4d9e880431bc
-          created: 1653837316896
-          msg: "{\"info\":\"unruly-seed\",\"client\":\"node\",\"pubkey\":[85,252,108,226,118,157,182,7,229,172,229,137,182,174,96,93,46,118,255,35,142,44,37,22,162,58,77,158,136,4,49,188],\"node_capacities\":{\"leader\":false}}"
-        9a32f71cb42a1a82faec55ed9c80da831d6bc576c5eac3029f07b29d03bb4e02:
-          category: NodeInfo
-          src: f994d64cb1988b7c66a52cb2f1fe5e6b15e4fdf5c5f398bb9fe83e5296accc2e
-          created: 1666768489491
-          msg: "---\nNodeInfoV2:\n  name: clever-toe\n  client: unknown\n  pubkey: +ZTWTLGYi3xmpSyy8f5eaxXk/fXF85i7n+g+UpaszC4=\n"
-        e3d57d1bd6f901bac824bdbd20b8358802d18c1e2b289de3cc247b33040f21fb:
-          category: NodeInfo
-          src: 6cde1fb33ce1266c864fc039cf0d843a395f18c338870c17931a9c8c051261ab
-          created: 1657629841376
-          msg: "---\nNodeInfoV2:\n  name: relieved-attack\n  client: unknown\n  pubkey: bN4fszzhJmyGT8A5zw2EOjlfGMM4hwwXkxqcjAUSYas=\n"
-        5e31693351de99cb8fce0d98f64a20b891e193e620ca01da20b4651fa26250eb:
-          category: NodeInfo
-          src: e97b9ec09820dc30a58da32a0dc6997dbee228a9fcf2af841a88f07a75eb8e87
-          created: 1653840016600
-          msg: "{\"info\":\"snotty-blow\",\"client\":\"node\",\"pubkey\":[233,123,158,192,152,32,220,48,165,141,163,42,13,198,153,125,190,226,40,169,252,242,175,132,26,136,240,122,117,235,142,135],\"node_capacities\":{\"leader\":false}}"
-        caae24ff9eda93e74e43cb7505cc43a03d28a3160fb0c8264b528e28de3c0d43:
-          category: NodeInfo
-          src: f2a9d7d11cc2a7c3146a2cef7cb460597cdc9dff285026bcd75d5c1c273936f4
-          created: 1666859279148
-          msg: "---\nNodeInfoV2:\n  name: aback-house\n  client: unknown\n  pubkey: 8qnX0RzCp8MUaizvfLRgWXzcnf8oUCa8111cHCc5NvQ=\n"
-        ff98b608d4a13124f32d4229b9781527a5d72ef40c2e77127dae683ce7b7511d:
-          category: NodeInfo
-          src: e0d58949b0180ff64a49a2888c961b3994fe58bc2de4babd464f5c3aefd73c56
-          created: 1666875134217
-          msg: "---\nNodeInfoV2:\n  name: bitter-zoo\n  client: unknown\n  pubkey: 4NWJSbAYD/ZKSaKIjJYbOZT+WLwt5Lq9Rk9cOu/XPFY=\n"
-        d86a9227d50d592b6ad5d75963a4eb837614257c41d188efc9e646d8ea495f5b:
-          category: NodeInfo
-          src: 562139476f55fc698b73f9f067575e86a4301453e719ffec222fbe761abc3f8b
-          created: 1653849916186
-          msg: "{\"info\":\"nutty-top\",\"client\":\"node\",\"pubkey\":[86,33,57,71,111,85,252,105,139,115,249,240,103,87,94,134,164,48,20,83,231,25,255,236,34,47,190,118,26,188,63,139],\"node_capacities\":{\"leader\":false}}"
-        4a676d0b098bb7c375ea2e307f54f92c8ec8446c7fc22b5791bb6ecb293ceeec:
-          category: NodeInfo
-          src: 3c22f9b57cdc65f0d37550487d2247e69c8ab3b55b371458ffc30b11e97b7942
-          created: 1653849016845
-          msg: "{\"info\":\"immense-bean\",\"client\":\"node\",\"pubkey\":[60,34,249,181,124,220,101,240,211,117,80,72,125,34,71,230,156,138,179,181,91,55,20,88,255,195,11,17,233,123,121,66],\"node_capacities\":{\"leader\":false}}"
-        095fc6fc4bd1883719f36c3c098e619514b1a3f9713368c25c4c1765dad013de:
-          category: NodeInfo
-          src: 0bdedcab7c685af2e6cdee983e2997ebd7044d31e997d8528d7fdefe32e95c51
-          created: 1653843617336
-          msg: "{\"info\":\"squealing-color\",\"client\":\"node\",\"pubkey\":[11,222,220,171,124,104,90,242,230,205,238,152,62,41,151,235,215,4,77,49,233,151,216,82,141,127,222,254,50,233,92,81],\"node_capacities\":{\"leader\":false}}"
-        54f1ea6cc21dc05efa0a9d1242992b5800f62835555cad7782a105935407b792:
-          category: NodeInfo
-          src: 4d76dd73a4257175c1879e399a5f846651d812ba885485f1e81dbb4ef59e61ea
-          created: 1653835516982
-          msg: "{\"info\":\"statuesque-baseball\",\"client\":\"node\",\"pubkey\":[77,118,221,115,164,37,113,117,193,135,158,57,154,95,132,102,81,216,18,186,136,84,133,241,232,29,187,78,245,158,97,234],\"node_capacities\":{\"leader\":false}}"
-        7955499f0bc94ab96b6933d2d66b9a107d36a2ade7df6b3a90c4dff994a576d1:
-          category: NodeInfo
-          src: 0ff27dc7ab7ab37e39cf34644d725c94e647015e85b42ffd1deb8efafc486022
-          created: 1653834616755
-          msg: "{\"info\":\"living-party\",\"client\":\"node\",\"pubkey\":[15,242,125,199,171,122,179,126,57,207,52,100,77,114,92,148,230,71,1,94,133,180,47,253,29,235,142,250,252,72,96,34],\"node_capacities\":{\"leader\":false}}"
-        5c5164ca710f62970a67651ba9c46b8f898cc465ed797754c2328615db69d824:
-          category: NodeInfo
-          src: c9a2cac4d2bcc0a788a16bac005defe5e39046bcd5a45d79e54631947907bc7f
-          created: 1653847217413
-          msg: "{\"info\":\"dynamic-mist\",\"client\":\"node\",\"pubkey\":[201,162,202,196,210,188,192,167,136,161,107,172,0,93,239,229,227,144,70,188,213,164,93,121,229,70,49,148,121,7,188,127],\"node_capacities\":{\"leader\":false}}"
-        c3d2eb9a94faa87ab86e9bd4aa3a9972fb40d4466766d61d5de6a0abd923a433:
-          category: NodeInfo
-          src: 1e97c1e3e7327b15291c6614af238b9c97ed367c805a77df72646f0c351ef080
-          created: 1666643875789
-          msg: "---\nNodeInfoV2:\n  name: drunk-sheep\n  client: unknown\n  pubkey: HpfB4+cyexUpHGYUryOLnJftNnyAWnffcmRvDDUe8IA=\n"
-        514819e93dcd0ef42be0323308b4eefb49caac47d38bec0b11dcf4233a0a848e:
-          category: NodeInfo
-          src: f473b0b86ffa08d136b16a1c0bf2ead36111663b17e1760a8d3827cfad4da6f3
-          created: 1657567986217
-          msg: "---\nNodeInfoV2:\n  name: callous-guide\n  client: unknown\n  pubkey: 9HOwuG/6CNE2sWocC/Lq02ERZjsX4XYKjTgnz61NpvM=\n"
diff --git a/flmodules/tests/load/gossip_events-02.yaml b/flmodules/tests/load/gossip_events-02.yaml
deleted file mode 100644
index 53ca5a34..00000000
--- a/flmodules/tests/load/gossip_events-02.yaml
+++ /dev/null
@@ -1,333 +0,0 @@
----
-V3:
-  storage:
-    NodeInfo:
-      config:
-        unique: true
-        max_events: 100
-      events:
-        003b12ddee586f474b1501a2f6fec8e3e354f2925338cb8b54b71502e041afc3:
-          category: NodeInfo
-          src: eb6cce15a439e801ea9fbcb83213f0c517d77605a213be2b0279edc81b8e8874
-          created: 1654243692382
-          msg: "---\nNodeInfoV2:\n  name: known-stream\n  client: unknown\n  pubkey: 62zOFaQ56AHqn7y4MhPwxRfXdgWiE74rAnntyBuOiHQ=\n"
-        1a2895031520015ce4cf92eb12d3ad9e97bba2a10d67038e167d9a1658b06d6c:
-          category: NodeInfo
-          src: c25118b3aa312494e127212a1dfb3172ee3beb5c909b6d0bfb9a9e809cb76b67
-          created: 1657894903098
-          msg: "---\nNodeInfoV2:\n  name: dazzling-trees\n  client: unknown\n  pubkey: wlEYs6oxJJThJyEqHfsxcu4761yQm20L+5qegJy3a2c=\n"
-        4b090cc0c669026a3ca564bd10f96441f93eb9c62f1f58362b5060ea9a7303a5:
-          category: NodeInfo
-          src: 3b12f9f9c85be7ce26e593730246118c303fa0720f5670deb65ce428af15ef50
-          created: 1653892375441
-          msg: "---\nNodeInfoV2:\n  name: somber-brake\n  client: unknown\n  pubkey: OxL5+chb584m5ZNzAkYRjDA/oHIPVnDetlzkKK8V71A=\n"
-        c3d2eb9a94faa87ab86e9bd4aa3a9972fb40d4466766d61d5de6a0abd923a433:
-          category: NodeInfo
-          src: 1e97c1e3e7327b15291c6614af238b9c97ed367c805a77df72646f0c351ef080
-          created: 1666643875789
-          msg: "---\nNodeInfoV2:\n  name: drunk-sheep\n  client: unknown\n  pubkey: HpfB4+cyexUpHGYUryOLnJftNnyAWnffcmRvDDUe8IA=\n"
-        514819e93dcd0ef42be0323308b4eefb49caac47d38bec0b11dcf4233a0a848e:
-          category: NodeInfo
-          src: f473b0b86ffa08d136b16a1c0bf2ead36111663b17e1760a8d3827cfad4da6f3
-          created: 1657567986217
-          msg: "---\nNodeInfoV2:\n  name: callous-guide\n  client: unknown\n  pubkey: 9HOwuG/6CNE2sWocC/Lq02ERZjsX4XYKjTgnz61NpvM=\n"
-        b4109388a8a7256cc7ef7047f5d68a2d8d3a76cfe07f1f130aaeb88a54dd8c54:
-          category: NodeInfo
-          src: 7feaf6856acbb1b952b7a6c543bdc84be7eb1eb5046589d4d2c5e41ecccdd196
-          created: 1665762528464
-          msg: "---\nNodeInfoV2:\n  name: thundering-able\n  client: unknown\n  pubkey: f+r2hWrLsblSt6bFQ73IS+frHrUEZYnU0sXkHszN0ZY=\n"
-        06da929e2aa3805af3f35caa6727f7eaf0dbbc482a52d8e16996dafa082550ff:
-          category: NodeInfo
-          src: e0d58949b0180ff64a49a2888c961b3994fe58bc2de4babd464f5c3aefd73c56
-          created: 1666902339840
-          msg: "---\nNodeInfoV2:\n  name: bitter-zoo\n  client: unknown\n  pubkey: 4NWJSbAYD/ZKSaKIjJYbOZT+WLwt5Lq9Rk9cOu/XPFY=\n"
-        948863b5ad41ae8c8627eafed976d1fc4e2b44ddcf81f4bb011b82c1333435e4:
-          category: NodeInfo
-          src: e47c1873723b7a08f99457735bc825f82a2c6738d57ee14fa3c004375b6e1e10
-          created: 1653900898634
-          msg: "---\nNodeInfoV2:\n  name: flat-stick\n  client: unknown\n  pubkey: 5HwYc3I7egj5lFdzW8gl+CosZzjVfuFPo8AEN1tuHhA=\n"
-        4a676d0b098bb7c375ea2e307f54f92c8ec8446c7fc22b5791bb6ecb293ceeec:
-          category: NodeInfo
-          src: 3c22f9b57cdc65f0d37550487d2247e69c8ab3b55b371458ffc30b11e97b7942
-          created: 1653849016845
-          msg: "{\"info\":\"immense-bean\",\"client\":\"node\",\"pubkey\":[60,34,249,181,124,220,101,240,211,117,80,72,125,34,71,230,156,138,179,181,91,55,20,88,255,195,11,17,233,123,121,66],\"node_capacities\":{\"leader\":false}}"
-        095fc6fc4bd1883719f36c3c098e619514b1a3f9713368c25c4c1765dad013de:
-          category: NodeInfo
-          src: 0bdedcab7c685af2e6cdee983e2997ebd7044d31e997d8528d7fdefe32e95c51
-          created: 1653843617336
-          msg: "{\"info\":\"squealing-color\",\"client\":\"node\",\"pubkey\":[11,222,220,171,124,104,90,242,230,205,238,152,62,41,151,235,215,4,77,49,233,151,216,82,141,127,222,254,50,233,92,81],\"node_capacities\":{\"leader\":false}}"
-        b77f0d91a76dca809b9cf00f6a6868442ef1dcd028b915bfcafd798d49bd91a1:
-          category: NodeInfo
-          src: ec6548b9b5b10d5fb37fc9216ceded20c2a32dc0bfa81732382830434f40a8ec
-          created: 1657944988500
-          msg: "---\nNodeInfoV2:\n  name: sturdy-question\n  client: unknown\n  pubkey: 7GVIubWxDV+zf8khbO3tIMKjLcC/qBcyOCgwQ09AqOw=\n"
-        c0958aa669041dbda9e9970a06af96b783af559636b7ea550e50f68d37033237:
-          category: NodeInfo
-          src: a0fcb7c94e88736433edcb83f71634e57b5b913cba633ae8c1b204fe146da993
-          created: 1653846315902
-          msg: "{\"info\":\"needy-cub\",\"client\":\"node\",\"pubkey\":[160,252,183,201,78,136,115,100,51,237,203,131,247,22,52,229,123,91,145,60,186,99,58,232,193,178,4,254,20,109,169,147],\"node_capacities\":{\"leader\":false}}"
-        2bdb58431425b1b71f20d9dddc7cfc378f3afaa1db505626337ec59f2b04a97f:
-          category: NodeInfo
-          src: 691994681b0f73458620f167c0937cd91c36edb1e11e0ce4996109851d6d667d
-          created: 1666858517231
-          msg: "---\nNodeInfoV2:\n  name: Root Node 2\n  client: unknown\n  pubkey: aRmUaBsPc0WGIPFnwJN82Rw27bHhHgzkmWEJhR1tZn0=\n"
-        f0087760e4841a14a6f2971bbce34c7a05781723649a4a0a39b608ec6467ef2d:
-          category: NodeInfo
-          src: 26ad09d6144f1778eb4b33e71b965b5e48447081cf65b8d0d5ee04b16cc31c06
-          created: 1653832816773
-          msg: "{\"info\":\"abrupt-tree\",\"client\":\"node\",\"pubkey\":[38,173,9,214,20,79,23,120,235,75,51,231,27,150,91,94,72,68,112,129,207,101,184,208,213,238,4,177,108,195,28,6],\"node_capacities\":{\"leader\":false}}"
-        c04a74d5fd75c7ccdd95a95aaccca4edb8b1b3ccb1fa35639bb247e01eb38532:
-          category: NodeInfo
-          src: 19177a73e6e99f88df8b6bc40bc11fab6b68a99233522642045c5b20c22968c8
-          created: 1653938864039
-          msg: "---\nNodeInfoV2:\n  name: craven-cub\n  client: unknown\n  pubkey: GRd6c+bpn4jfi2vEC8Efq2toqZIzUiZCBFxbIMIpaMg=\n"
-        476f10d1ae6d1328706b714e3f30bf8ccd5b30944a7cd22b279eb6f749424754:
-          category: NodeInfo
-          src: 9f5d0753642c66d5b30e139bb632967e7a122dd356cc37254b806effdcc45501
-          created: 1666859463309
-          msg: "---\nNodeInfoV2:\n  name: comfortable-toothbrush\n  client: unknown\n  pubkey: n10HU2QsZtWzDhObtjKWfnoSLdNWzDclS4Bu/9zEVQE=\n"
-        8c0bdaef13f369d3ed9e15aada9eabbbf2fff30c20b7bdb614319b07cf26d7c9:
-          category: NodeInfo
-          src: 79146dfa07aaeada16a2b567da55e54dd7af1c01c4f079ca552110b26a37597d
-          created: 1657811878771
-          msg: "---\nNodeInfoV2:\n  name: shaggy-scarecrow\n  client: unknown\n  pubkey: eRRt+geq6toWorVn2lXlTdevHAHE8HnKVSEQsmo3WX0=\n"
-        000853d7160f3928fa5282db4c4b85bf431e4aa90f7b5e5196258f8c13a06047:
-          category: NodeInfo
-          src: 136db004eab73e111036bb4b5c334ea5af0aff001d39589a1d3715e3f068bd0c
-          created: 1657803341020
-          msg: "---\nNodeInfoV2:\n  name: moaning-rat\n  client: unknown\n  pubkey: E22wBOq3PhEQNrtLXDNOpa8K/wAdOViaHTcV4/BovQw=\n"
-        833489763a4be0450073a9032a81f1b4d854a8876f4cdd5e1e9ea0343817dfc5:
-          category: NodeInfo
-          src: 07f5c490180ea158946f800004ea5bbc061edb2414996c8289367dd10bc365e8
-          created: 1653900948669
-          msg: "---\nNodeInfoV2:\n  name: afraid-creature\n  client: unknown\n  pubkey: B/XEkBgOoViUb4AABOpbvAYe2yQUmWyCiTZ90QvDZeg=\n"
-        452e01c973266ce7e08d4c71a6893a8825f358f94d8ea16a41d0834a77dcb7b5:
-          category: NodeInfo
-          src: ecb34f417caa0a5f4c9cdf191ca42d689a4a457c807af488dc39fdedeb132636
-          created: 1653850816282
-          msg: "{\"info\":\"hesitant-children\",\"client\":\"node\",\"pubkey\":[236,179,79,65,124,170,10,95,76,156,223,25,28,164,45,104,154,74,69,124,128,122,244,136,220,57,253,237,235,19,38,54],\"node_capacities\":{\"leader\":false}}"
-        5e31693351de99cb8fce0d98f64a20b891e193e620ca01da20b4651fa26250eb:
-          category: NodeInfo
-          src: e97b9ec09820dc30a58da32a0dc6997dbee228a9fcf2af841a88f07a75eb8e87
-          created: 1653840016600
-          msg: "{\"info\":\"snotty-blow\",\"client\":\"node\",\"pubkey\":[233,123,158,192,152,32,220,48,165,141,163,42,13,198,153,125,190,226,40,169,252,242,175,132,26,136,240,122,117,235,142,135],\"node_capacities\":{\"leader\":false}}"
-        3d9ec9d2efd5afce87df91d1ee5a448d4bce1ff0c4b47eebd309bb0cf05fcfc6:
-          category: NodeInfo
-          src: 841d99b215baedb2120460f9f7a9c2c966984fc405581b77ae14e574a5404579
-          created: 1653836416754
-          msg: "{\"info\":\"ceaseless-rod\",\"client\":\"node\",\"pubkey\":[132,29,153,178,21,186,237,178,18,4,96,249,247,169,194,201,102,152,79,196,5,88,27,119,174,20,229,116,165,64,69,121],\"node_capacities\":{\"leader\":false}}"
-        9a32f71cb42a1a82faec55ed9c80da831d6bc576c5eac3029f07b29d03bb4e02:
-          category: NodeInfo
-          src: f994d64cb1988b7c66a52cb2f1fe5e6b15e4fdf5c5f398bb9fe83e5296accc2e
-          created: 1666768489491
-          msg: "---\nNodeInfoV2:\n  name: clever-toe\n  client: unknown\n  pubkey: +ZTWTLGYi3xmpSyy8f5eaxXk/fXF85i7n+g+UpaszC4=\n"
-        73ee5fb50c3fffecd2bf187056d9238cfe2b5728325f9f083d9dd4e626596ee4:
-          category: NodeInfo
-          src: 55fc6ce2769db607e5ace589b6ae605d2e76ff238e2c2516a23a4d9e880431bc
-          created: 1653837316896
-          msg: "{\"info\":\"unruly-seed\",\"client\":\"node\",\"pubkey\":[85,252,108,226,118,157,182,7,229,172,229,137,182,174,96,93,46,118,255,35,142,44,37,22,162,58,77,158,136,4,49,188],\"node_capacities\":{\"leader\":false}}"
-        f17d02303ba95595cc78bd0997f4777709023f8e9a4f0f313873fccaac6e3146:
-          category: NodeInfo
-          src: d7c5f61ec1061b49557c0c7360c4b25b8762e92df05caefe55d269324eb7e976
-          created: 1658557056614
-          msg: "---\nNodeInfoV2:\n  name: brash-oatmeal\n  client: unknown\n  pubkey: 18X2HsEGG0lVfAxzYMSyW4di6S3wXK7+VdJpMk636XY=\n"
-        6bcd93ed0fd73d4b209b65adb4cd184a18ef068dc11470335a4f5a2c6dfc2ed2:
-          category: NodeInfo
-          src: 8048db9581647f410a8358aae850be4019ec405bdd26a03d3cb3a42c7372d242
-          created: 1666787268334
-          msg: "---\nNodeInfoV2:\n  name: near-letter\n  client: unknown\n  pubkey: gEjblYFkf0EKg1iq6FC+QBnsQFvdJqA9PLOkLHNy0kI=\n"
-        915b144b195d68b1d81fcc4efa0e4473279f3aa2dcdbd94c089e95c16112490c:
-          category: NodeInfo
-          src: 343d48b80be67f6e8a0d66a0fb5be9a8dca2f9d08fdfb6fb11c5b84c5c656950
-          created: 1666438460377
-          msg: "---\nNodeInfoV2:\n  name: quick-addition\n  client: unknown\n  pubkey: ND1IuAvmf26KDWag+1vpqNyi+dCP37b7EcW4TFxlaVA=\n"
-        c7b2249438ab427bc938dd170f82d26eae9ef418cdb1330dcc6d42afaa3a4d9a:
-          category: NodeInfo
-          src: b534c304a4853c7c90a2f7936f288ffbdb466bf1b82f14cffc9cd23427fd5a73
-          created: 1655080923671
-          msg: "---\nNodeInfoV2:\n  name: wasteful-balloon\n  client: unknown\n  pubkey: tTTDBKSFPHyQoveTbyiP+9tGa/G4LxTP/JzSNCf9WnM=\n"
-        4e69bbb3a86d8f93d49aabf7f560737f37354256affe257162c204a36b7b342f:
-          category: NodeInfo
-          src: 8e6aab048dcc9e8e6d1163a0ef0666f24ad81df0c0c1c9657d3be3cf7c5aaee7
-          created: 1666768372806
-          msg: "---\nNodeInfoV2:\n  name: daffy-beggar\n  client: unknown\n  pubkey: jmqrBI3Mno5tEWOg7wZm8krYHfDAwcllfTvjz3xaruc=\n"
-        5c5164ca710f62970a67651ba9c46b8f898cc465ed797754c2328615db69d824:
-          category: NodeInfo
-          src: c9a2cac4d2bcc0a788a16bac005defe5e39046bcd5a45d79e54631947907bc7f
-          created: 1653847217413
-          msg: "{\"info\":\"dynamic-mist\",\"client\":\"node\",\"pubkey\":[201,162,202,196,210,188,192,167,136,161,107,172,0,93,239,229,227,144,70,188,213,164,93,121,229,70,49,148,121,7,188,127],\"node_capacities\":{\"leader\":false}}"
-        54f1ea6cc21dc05efa0a9d1242992b5800f62835555cad7782a105935407b792:
-          category: NodeInfo
-          src: 4d76dd73a4257175c1879e399a5f846651d812ba885485f1e81dbb4ef59e61ea
-          created: 1653835516982
-          msg: "{\"info\":\"statuesque-baseball\",\"client\":\"node\",\"pubkey\":[77,118,221,115,164,37,113,117,193,135,158,57,154,95,132,102,81,216,18,186,136,84,133,241,232,29,187,78,245,158,97,234],\"node_capacities\":{\"leader\":false}}"
-        00159df3d000abcf8242a8c7bf8364d9abf68fd8bd367943d01f8916bd2b752b:
-          category: NodeInfo
-          src: 1e4bb6be6df4ca7c1794a9a1bf05971ee36ccd9c0520dea310fe7330bf474a2c
-          created: 1665762528368
-          msg: "---\nNodeInfoV2:\n  name: long-term-quilt\n  client: unknown\n  pubkey: Hku2vm30ynwXlKmhvwWXHuNszZwFIN6jEP5zML9HSiw=\n"
-        57435d37f00846ce21af42b14efa70b3e36475dc3a4f45669a6ec977ac475fab:
-          category: NodeInfo
-          src: 3b1018f6e447532c5aba14dccf8ec4ae85ecd139f624336f156295563e4672d6
-          created: 1653845417091
-          msg: "{\"info\":\"humorous-cherries\",\"client\":\"node\",\"pubkey\":[59,16,24,246,228,71,83,44,90,186,20,220,207,142,196,174,133,236,209,57,246,36,51,111,21,98,149,86,62,70,114,214],\"node_capacities\":{\"leader\":false}}"
-        77a9d42794e5794655f73cc69ff125c87bfb3f7f6bdcdffb39d2c376f7a0a3eb:
-          category: NodeInfo
-          src: c03623fd19b85c51d38e9c967437a5e9499ffd34bbb3bb3c5381a9dc5d4eba90
-          created: 1666645932340
-          msg: "---\nNodeInfoV2:\n  name: vague-cover\n  client: unknown\n  pubkey: wDYj/Rm4XFHTjpyWdDel6Umf/TS7s7s8U4Gp3F1OupA=\n"
-        d86a9227d50d592b6ad5d75963a4eb837614257c41d188efc9e646d8ea495f5b:
-          category: NodeInfo
-          src: 562139476f55fc698b73f9f067575e86a4301453e719ffec222fbe761abc3f8b
-          created: 1653849916186
-          msg: "{\"info\":\"nutty-top\",\"client\":\"node\",\"pubkey\":[86,33,57,71,111,85,252,105,139,115,249,240,103,87,94,134,164,48,20,83,231,25,255,236,34,47,190,118,26,188,63,139],\"node_capacities\":{\"leader\":false}}"
-        b1219e3bf4c0948bbe9d0c4ab2254beaaab3e176b47b39a5817985e9a8a2e10d:
-          category: NodeInfo
-          src: 58b6b9028f704c081c1fbe6c124861c0390c913e6f601a58411feddb4619e248
-          created: 1653833717200
-          msg: "{\"info\":\"used-death\",\"client\":\"node\",\"pubkey\":[88,182,185,2,143,112,76,8,28,31,190,108,18,72,97,192,57,12,145,62,111,96,26,88,65,31,237,219,70,25,226,72],\"node_capacities\":{\"leader\":false}}"
-        fbb4f979b48a76d54b38a9028e3de3116a4b0cf928f57f092b88b1bfe90db2f7:
-          category: NodeInfo
-          src: e734fec11b23e717789714eb442e9ef6d1c32cf1ced098d81b7a6e38920aaaf2
-          created: 1653840916813
-          msg: "{\"info\":\"grateful-game\",\"client\":\"node\",\"pubkey\":[231,52,254,193,27,35,231,23,120,151,20,235,68,46,158,246,209,195,44,241,206,208,152,216,27,122,110,56,146,10,170,242],\"node_capacities\":{\"leader\":false}}"
-        9e15b743e3ecf9ee8f356f84fe683a5c2910aeb334215402a4a74b271335d5d1:
-          category: NodeInfo
-          src: 8fa6c7e2991ddc5dc7f4444e63f8766b5648087bb34b820bc2fd3d7f1bfb2415
-          created: 1653851718703
-          msg: "{\"info\":\"opposite-chair\",\"client\":\"node\",\"pubkey\":[143,166,199,226,153,29,220,93,199,244,68,78,99,248,118,107,86,72,8,123,179,75,130,11,194,253,61,127,27,251,36,21],\"node_capacities\":{\"leader\":false}}"
-        23019ea728f2026bac871469906ec1e4509a096835390e5636e3c5e5c086994b:
-          category: NodeInfo
-          src: f9e94ffad4f6af53adc20eabedda953a9eab77601b681f2a3799eb4033cd248b
-          created: 1653839116954
-          msg: "{\"info\":\"standing-lamp\",\"client\":\"node\",\"pubkey\":[249,233,79,250,212,246,175,83,173,194,14,171,237,218,149,58,158,171,119,96,27,104,31,42,55,153,235,64,51,205,36,139],\"node_capacities\":{\"leader\":false}}"
-        514c8101a0557bf2911af11b4d7507b871eafa78528c829de5b625fe670198f9:
-          category: NodeInfo
-          src: fbc3f0e97dec446e4ba944adb86b9f605ede3f57e05f8efa0ba0e75b13d39427
-          created: 1666859800712
-          msg: "---\nNodeInfoV2:\n  name: abstracted-arm\n  client: unknown\n  pubkey: +8Pw6X3sRG5LqUStuGufYF7eP1fgX476C6DnWxPTlCc=\n"
-        edbd27d9bfa593c3c0575f72013625ead58b7141062aac7a6c373d28fe799ed6:
-          category: NodeInfo
-          src: 1e783b375211a27e0aefe94f60eab1af60b43abf3237d5dc8c5f04488bba6623
-          created: 1654013682538
-          msg: "---\nNodeInfoV2:\n  name: disgusted-team\n  client: unknown\n  pubkey: Hng7N1IRon4K7+lPYOqxr2C0Or8yN9XcjF8ESIu6ZiM=\n"
-        caae24ff9eda93e74e43cb7505cc43a03d28a3160fb0c8264b528e28de3c0d43:
-          category: NodeInfo
-          src: f2a9d7d11cc2a7c3146a2cef7cb460597cdc9dff285026bcd75d5c1c273936f4
-          created: 1666859279148
-          msg: "---\nNodeInfoV2:\n  name: aback-house\n  client: unknown\n  pubkey: 8qnX0RzCp8MUaizvfLRgWXzcnf8oUCa8111cHCc5NvQ=\n"
-        8f8435af08af7bd119e3d7a49ad99d9b464929da0af323ce3d5aade069439e74:
-          category: NodeInfo
-          src: 4e25a245ae317adf66db37d76a65802deaf101b17b5f0900ee435fce3f71871f
-          created: 1666859415341
-          msg: "---\nNodeInfoV2:\n  name: Root Node 1\n  client: unknown\n  pubkey: TiWiRa4xet9m2zfXamWALerxAbF7XwkA7kNfzj9xhx8=\n"
-        43fa56e1e8d256778e2635002614935a5310daeb2c5b8502e2c64de1b2565eb5:
-          category: NodeInfo
-          src: 3013796737f295990219aeb126bb2c52948b17ba3d8a5c11ccc3201300d81929
-          created: 1653838216840
-          msg: "{\"info\":\"abnormal-butter\",\"client\":\"node\",\"pubkey\":[48,19,121,103,55,242,149,153,2,25,174,177,38,187,44,82,148,139,23,186,61,138,92,17,204,195,32,19,0,216,25,41],\"node_capacities\":{\"leader\":false}}"
-        e0bb0ffc86d8de05a0fda6ca5fb94b0adbd3ab224b47f806492c736bbd409d95:
-          category: NodeInfo
-          src: afedbc0e78b1f783d71334fa8af9bf1eb24141d46341733fbea5ad6d714d2af1
-          created: 1657629457681
-          msg: "---\nNodeInfoV2:\n  name: silent-blood\n  client: unknown\n  pubkey: r+28Dnix94PXEzT6ivm/HrJBQdRjQXM/vqWtbXFNKvE=\n"
-        7955499f0bc94ab96b6933d2d66b9a107d36a2ade7df6b3a90c4dff994a576d1:
-          category: NodeInfo
-          src: 0ff27dc7ab7ab37e39cf34644d725c94e647015e85b42ffd1deb8efafc486022
-          created: 1653834616755
-          msg: "{\"info\":\"living-party\",\"client\":\"node\",\"pubkey\":[15,242,125,199,171,122,179,126,57,207,52,100,77,114,92,148,230,71,1,94,133,180,47,253,29,235,142,250,252,72,96,34],\"node_capacities\":{\"leader\":false}}"
-        0aa631ee6bdbf09621d55ca0cc986ab4fccbf60d6f5122803593fe000327326e:
-          category: NodeInfo
-          src: 00445197c49bb75dbf26bd54bcaffc875e9615cca12a49f5f4cfc33d3e2d8bc2
-          created: 1653844516059
-          msg: "{\"info\":\"boorish-place\",\"client\":\"node\",\"pubkey\":[0,68,81,151,196,155,183,93,191,38,189,84,188,175,252,135,94,150,21,204,161,42,73,245,244,207,195,61,62,45,139,194],\"node_capacities\":{\"leader\":false}}"
-        3cb671e07e41a73d59a9f4e9146a138cade6ca063606c9780ab289c5e26b8a05:
-          category: NodeInfo
-          src: 02874541f322035e603600ce5b41dec4aa81f8b4cb1411785642e50469228d92
-          created: 1653841816573
-          msg: "{\"info\":\"lonely-dolls\",\"client\":\"node\",\"pubkey\":[2,135,69,65,243,34,3,94,96,54,0,206,91,65,222,196,170,129,248,180,203,20,17,120,86,66,229,4,105,34,141,146],\"node_capacities\":{\"leader\":false}}"
-        5613241e34a438ea25ad33ab18801388076ccca2d6498af7a416cc6051a6168a:
-          category: NodeInfo
-          src: 6bc0afd686d74410b4b4a200b5020efda181526375b8c4583b0e6d09b7a25159
-          created: 1655561130694
-          msg: "---\nNodeInfoV2:\n  name: ancient-pencil\n  client: unknown\n  pubkey: a8Cv1obXRBC0tKIAtQIO/aGBUmN1uMRYOw5tCbeiUVk=\n"
-        62cfd2d9f6a59fd5a8b210783c53eac0f11eeff359d5e08d8f90580dc4abe2b2:
-          category: NodeInfo
-          src: d8e3143e02c620c19ba4b8e7d6e28a68e6e6691c2157396c0d6094bbe9b8400e
-          created: 1666643912270
-          msg: "---\nNodeInfoV2:\n  name: outrageous-cellar\n  client: unknown\n  pubkey: 2OMUPgLGIMGbpLjn1uKKaObmaRwhVzlsDWCUu+m4QA4=\n"
-        e3d57d1bd6f901bac824bdbd20b8358802d18c1e2b289de3cc247b33040f21fb:
-          category: NodeInfo
-          src: 6cde1fb33ce1266c864fc039cf0d843a395f18c338870c17931a9c8c051261ab
-          created: 1657629841376
-          msg: "---\nNodeInfoV2:\n  name: relieved-attack\n  client: unknown\n  pubkey: bN4fszzhJmyGT8A5zw2EOjlfGMM4hwwXkxqcjAUSYas=\n"
-        946ccb8f305cc5bc21d3fe226f34e3990091ddc117f58abe942998f1cc25de1b:
-          category: NodeInfo
-          src: f97049d015420e729dfeb10a0e2e127edf4956e0ea8ce2f66cea005fa07e8d6d
-          created: 1666787455216
-          msg: "---\nNodeInfoV2:\n  name: outgoing-care\n  client: unknown\n  pubkey: +XBJ0BVCDnKd/rEKDi4Sft9JVuDqjOL2bOoAX6B+jW0=\n"
-        f17c75389597ac656562d248d8cfc4c10a088e3e25de12c2b99432efb0a54f62:
-          category: NodeInfo
-          src: 97dd29f0d9b963e05267d10aae2b8fad29b7bfc32c3c906584fb18535de763af
-          created: 1653848117333
-          msg: "{\"info\":\"spotty-bed\",\"client\":\"node\",\"pubkey\":[151,221,41,240,217,185,99,224,82,103,209,10,174,43,143,173,41,183,191,195,44,60,144,101,132,251,24,83,93,231,99,175],\"node_capacities\":{\"leader\":false}}"
-        8ae4de84c987e119d39b8a67a7cb95fdd10d8674f9623698a28a0bae88388058:
-          category: NodeInfo
-          src: 3b170a40053fbee566100deb21aff34a9490d65e448f0b4cfbd57f7eb0c7d4d4
-          created: 1653831916525
-          msg: "{\"info\":\"abrupt-view\",\"client\":\"node\",\"pubkey\":[59,23,10,64,5,63,190,229,102,16,13,235,33,175,243,74,148,144,214,94,68,143,11,76,251,213,127,126,176,199,212,212],\"node_capacities\":{\"leader\":false}}"
-        fe9031d09ee3b21806b160913320bebad5104c7b058b2c99e78b45a8629c831b:
-          category: NodeInfo
-          src: 6d0c4f24e178c770118cfd924d4dcb6bc39afbcf1ec2d3c7a96e683cc6ee292c
-          created: 1653842717032
-          msg: "{\"info\":\"lonely-chain\",\"client\":\"node\",\"pubkey\":[109,12,79,36,225,120,199,112,17,140,253,146,77,77,203,107,195,154,251,207,30,194,211,199,169,110,104,60,198,238,41,44],\"node_capacities\":{\"leader\":false}}"
-        98de383a868226808fd006697bcc2a2e29e1a9947a60579b668ebedc72b884a4:
-          category: NodeInfo
-          src: 9d3890af43bb439fd52e9cc661095218bc7525a9b9e6c5900302bcc1384964e5
-          created: 1666645932525
-          msg: "---\nNodeInfoV2:\n  name: hateful-choice\n  client: unknown\n  pubkey: nTiQr0O7Q5/VLpzGYQlSGLx1Jam55sWQAwK8wThJZOU=\n"
-    TextMessage:
-      config:
-        unique: false
-        max_events: 50
-      events:
-        91154eec61feaed1e168f2768eeb64b85129f4cffa9d34ccd5c63ecc059a8243:
-          category: TextMessage
-          src: 1e97c1e3e7327b15291c6614af238b9c97ed367c805a77df72646f0c351ef080
-          created: 1666643902020
-          msg: hello
-        4a9a75831c7e040b22d72df24c352a9969f3fc3094547676617c3ae56ddc3064:
-          category: TextMessage
-          src: e0d58949b0180ff64a49a2888c961b3994fe58bc2de4babd464f5c3aefd73c56
-          created: 1665756692731
-          msg: fsdfasdfasd
-        c36ba1aa972adcff7230bb8cfa50807bbd814a06c69fb5e047de0ffa59f37637:
-          category: TextMessage
-          src: e0d58949b0180ff64a49a2888c961b3994fe58bc2de4babd464f5c3aefd73c56
-          created: 1665762376363
-          msg: Message 1
-        5b11ef7a6a0c8bc500caab5c1996d5e200bc7e8e8e3ddde3bb4c4967014815be:
-          category: TextMessage
-          src: f994d64cb1988b7c66a52cb2f1fe5e6b15e4fdf5c5f398bb9fe83e5296accc2e
-          created: 1666768574422
-          msg: Hello Fledger from Germany.
-        495ba2407f10326bcf757abd6788590cadc491c04c84249a9cd4ba8f30216e74:
-          category: TextMessage
-          src: e0d58949b0180ff64a49a2888c961b3994fe58bc2de4babd464f5c3aefd73c56
-          created: 1665762382405
-          msg: Message 2
-        bef5d1ab05a83fd41982716c94af546c7cc4a1fc3fb648353c4f743b554695b3:
-          category: TextMessage
-          src: e0d58949b0180ff64a49a2888c961b3994fe58bc2de4babd464f5c3aefd73c56
-          created: 1665756698788
-          msg: "more\n"
-        1f676b96ca97bb426dcbe73bad6a57f2ebddcda347d9eb40189103e1ea25a342:
-          category: TextMessage
-          src: 9f5d0753642c66d5b30e139bb632967e7a122dd356cc37254b806effdcc45501
-          created: 1666382447549
-          msg: Finalizing release of flnet on crates.io
-        f17c2216bc0dc48e5934b8e585bebce97abf75ed1c2f7a4a941305c9464f299d:
-          category: TextMessage
-          src: 9f5d0753642c66d5b30e139bb632967e7a122dd356cc37254b806effdcc45501
-          created: 1666787389976
-          msg: "Greetings to Germany - what would be your killer-app for fledger? I'm currently hesitating between chat (twitter) / web-hosting / encrypted torrent."
diff --git a/flmodules/tests/test_config.rs b/flmodules/tests/test_config.rs
new file mode 100644
index 00000000..9061b291
--- /dev/null
+++ b/flmodules/tests/test_config.rs
@@ -0,0 +1,83 @@
+use bytes::Bytes;
+use flmacro::VersionedSerde;
+use serde::{Deserialize, Serialize};
+use serde_with::{base64::Base64, serde_as};
+
+#[serde_as]
+#[derive(VersionedSerde, Clone, PartialEq, Debug)]
+#[versions = "[ConfigV1, ConfigV2, ConfigV3]"]
+struct Config {
+    #[serde_as(as = "Base64")]
+    name4: Bytes,
+}
+
+impl From<ConfigV3> for Config {
+    fn from(value: ConfigV3) -> Self {
+        Self { name4: value.name3 }
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+struct ConfigV3 {
+    name3: Bytes,
+}
+
+impl From<ConfigV2> for ConfigV3 {
+    fn from(value: ConfigV2) -> Self {
+        Self { name3: value.name2 }
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+struct ConfigV2 {
+    name2: Bytes,
+}
+
+impl From<ConfigV1> for ConfigV2 {
+    fn from(value: ConfigV1) -> Self {
+        Self { name2: value.name }
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+struct ConfigV1 {
+    name: Bytes,
+}
+
+#[test]
+fn test_config() -> Result<(), Box<dyn std::error::Error>> {
+    // Simulate the storage of an old configuration.
+    let v1 = ConfigV1 { name: "123".into() };
+    let cv1 = ConfigVersion::V1(v1);
+    let c: Config = cv1.clone().into();
+    let cv1_str = serde_yaml::to_string(&cv1)?;
+
+    // Now the old version is recovered, and automatically converted
+    // to the latest version.
+    let c_recover: Config = serde_yaml::from_str(&cv1_str)?;
+    assert_eq!(c_recover, cv1.into());
+
+    // Storing and retrieving the latest version is always
+    // done using the original struct, `Config` in this case.
+    let c_str = serde_yaml::to_string(&c)?;
+    let c_recover = serde_yaml::from_str(&c_str)?;
+    assert_eq!(c, c_recover);
+    Ok(())
+}
+
+#[derive(VersionedSerde, Clone, PartialEq, Debug)]
+struct NewStruct {
+    field: String,
+}
+
+#[test]
+fn test_new_struct() -> Result<(), Box<dyn std::error::Error>> {
+    let ns = NewStruct {
+        field: "123".into(),
+    };
+    let ns_str = serde_yaml::to_string(&ns)?;
+    let ns_recover = serde_yaml::from_str(&ns_str)?;
+    assert_eq!(ns, ns_recover);
+
+    Ok(())
+}
diff --git a/flmodules/tests/webpage.rs b/flmodules/tests/webpage.rs
new file mode 100644
index 00000000..49922fa7
--- /dev/null
+++ b/flmodules/tests/webpage.rs
@@ -0,0 +1,407 @@
+// This test creates a domain with a webpage in it.
+// The setup uses 3 nodes to create the root domain,
+// and a 4th node to add a subdomain to it, storing a
+// webpage.
+// Then a 5th node tries to read the webpage, given the
+// subdomain.
+
+use flarch::{
+    broker::BrokerError,
+    data_storage::{DataStorage, DataStorageTemp},
+    start_logging_filter_level,
+};
+use flcrypto::access::Condition;
+use flmodules::{
+    dht_router::{broker::DHTRouter, kademlia},
+    dht_storage::{
+        broker::DHTStorage,
+        core::{Cuckoo, DHTConfig, RealmConfig},
+        realm_view::RealmView,
+    },
+    flo::{
+        blob::{FloBlobPage, FloBlobTag},
+        crypto::Rules,
+        flo::FloWrapper,
+        realm::{FloRealm, RealmID},
+    },
+    nodeconfig::NodeConfig,
+    router::broker::BrokerRouter,
+    testing::{
+        flo::Wallet,
+        network_simul::{NetworkSimul, RouterNode},
+    },
+    timer::{Timer, TimerMessage},
+};
+use serde::{de::DeserializeOwned, Serialize};
+use std::error::Error;
+
+#[derive(Clone)]
+struct Node {
+    _config: NodeConfig,
+    router: BrokerRouter,
+    wallet: Wallet,
+    _dht_routing: DHTRouter,
+    dht_storage: DHTStorage,
+}
+
+impl Node {
+    async fn new(
+        ds: Box<dyn DataStorage + Send>,
+        timer: &mut Timer,
+        router_node: RouterNode,
+    ) -> Result<Self, Box<dyn Error>> {
+        let dht_router = DHTRouter::start(
+            router_node.config.info.get_id(),
+            router_node.router.clone(),
+            timer,
+            kademlia::Config::default(),
+        )
+        .await?;
+
+        log::debug!("{} is new node", router_node.config.info.get_id());
+
+        Ok(Self {
+            dht_storage: DHTStorage::start(
+                ds,
+                router_node.config.info.get_id(),
+                DHTConfig {
+                    realms: vec![],
+                    owned: vec![],
+                    timeout: 10,
+                },
+                dht_router.broker.clone(),
+                timer,
+            )
+            .await?,
+            _config: router_node.config,
+            router: router_node.router,
+            wallet: Wallet::new(),
+            _dht_routing: dht_router,
+        })
+    }
+}
+
+struct Simul {
+    nodes: Vec<Node>,
+    steps: usize,
+    simul: NetworkSimul,
+    timer: Timer,
+    realm_id: RealmID,
+}
+
+impl Simul {
+    async fn new() -> Result<Self, BrokerError> {
+        Ok(Self {
+            nodes: vec![],
+            steps: 2,
+            simul: NetworkSimul::new().await?,
+            timer: Timer::simul(),
+            realm_id: RealmID::zero(),
+        })
+    }
+
+    async fn new_node(&mut self) -> Result<Node, Box<dyn Error>> {
+        self.nodes.push(
+            Node::new(
+                Box::new(DataStorageTemp::new()),
+                &mut self.timer,
+                self.simul.new_node().await?,
+            )
+            .await?,
+        );
+        self.simul.send_node_info().await?;
+        self.tick().await?;
+        self.send_sync().await?;
+        Ok(self.nodes.last().unwrap().clone())
+    }
+
+    async fn new_nodes(&mut self, nbr: usize) -> Result<Vec<Node>, Box<dyn Error>> {
+        let mut nodes = vec![];
+        for _ in 0..nbr {
+            nodes.push(self.new_node().await?);
+        }
+        Ok(nodes)
+    }
+
+    async fn send_sync(&mut self) -> Result<(), BrokerError> {
+        for node in &mut self.nodes {
+            node.dht_storage.sync()?;
+        }
+        self.settle().await
+    }
+
+    async fn settle(&mut self) -> Result<(), BrokerError> {
+        self.simul.settle().await?;
+        for node in &mut self.nodes {
+            node.router.settle(vec![]).await?;
+        }
+        Ok(())
+    }
+
+    async fn tick(&mut self) -> Result<(), BrokerError> {
+        self.settle().await?;
+        self.timer.broker.emit_msg_out(TimerMessage::Second)?;
+        self.settle().await
+    }
+
+    async fn sync_check<T: Serialize + DeserializeOwned + Clone>(
+        &mut self,
+        fw: &FloWrapper<T>,
+    ) -> Result<usize, Box<dyn Error>> {
+        let id = &fw.global_id();
+        let version = fw.version();
+        for step in 0..self.steps {
+            self.send_sync().await?;
+            let mut matches = 0;
+            for node in &mut self.nodes {
+                if node
+                    .dht_storage
+                    .get_flo::<T>(id)
+                    .await
+                    .map(|flo| flo.version() == version)
+                    .unwrap_or(false)
+                {
+                    matches += 1
+                }
+            }
+            log::info!(
+                "{}: step {step} matches {matches}/{}",
+                format!("version {}/{}", fw.flo().flo_type(), fw.version()),
+                self.nodes.len()
+            );
+            if matches == self.nodes.len() {
+                return Ok(step + 1);
+            }
+        }
+        Err("Didn't succeed to sync all".into())
+    }
+
+    async fn sync_check_cuckoos<T: Serialize + DeserializeOwned + Clone>(
+        &mut self,
+        fw: &FloWrapper<T>,
+        cuckoos: usize,
+    ) -> Result<usize, Box<dyn Error>> {
+        let id = &fw.global_id();
+        for step in 0..self.steps {
+            self.send_sync().await?;
+            let mut matches = 0;
+            for node in &mut self.nodes {
+                if node
+                    .dht_storage
+                    .get_cuckoos(id)
+                    .await
+                    .map(|num| num.len() == cuckoos)
+                    .unwrap_or(false)
+                {
+                    matches += 1
+                }
+            }
+            log::info!(
+                "{}: step {step} matches {matches}/{}",
+                format!("version {}/{}", fw.flo().flo_type(), fw.version()),
+                self.nodes.len()
+            );
+            if matches == self.nodes.len() {
+                return Ok(step + 1);
+            }
+        }
+        Err("Didn't succeed to sync all".into())
+    }
+
+    async fn store_all(&mut self) -> Result<(), Box<dyn Error>> {
+        for node in &mut self.nodes {
+            node.wallet.set_realm_id(self.realm_id.clone());
+            node.wallet.store(&mut node.dht_storage.broker)?;
+        }
+        self.send_sync().await?;
+        Ok(())
+    }
+}
+
+const LOG_LVL: log::LevelFilter = log::LevelFilter::Info;
+
+#[tokio::test]
+async fn run_test() -> Result<(), Box<dyn Error>> {
+    // start_logging_filter_level(vec![], LOG_LVL);
+    start_logging_filter_level(vec!["flmodules::dht_storage", "webpage"], LOG_LVL);
+    let mut simul = Simul::new().await?;
+    let root_nodes_nbr = 3;
+    let noise_nodes_nbr = 10;
+
+    let mut root_nodes = simul.new_nodes(root_nodes_nbr).await?;
+
+    log::info!("Creating the realm");
+    let mut root_wallet = Wallet::new();
+
+    // let every root-node handle the domain as it sees fit.
+    root_wallet.badge_condition = Some(Condition::NofT(
+        1,
+        root_nodes
+            .iter_mut()
+            .map(|n| n.wallet.get_badge_condition())
+            .collect(),
+    ));
+    let mut realm = FloRealm::new(
+        "root",
+        root_wallet.get_badge_rules(),
+        RealmConfig {
+            max_space: 1e6 as u64,
+            max_flo_size: 1e4 as u32,
+        },
+    )?;
+    root_wallet.set_realm_id(realm.realm_id());
+    root_nodes[0].dht_storage.store_flo(realm.flo().clone())?;
+    simul.realm_id = realm.realm_id();
+    simul.settle().await?;
+
+    log::info!("Adding {noise_nodes_nbr} nodes");
+    let mut noise_nodes = vec![];
+    for _ in 0..noise_nodes_nbr {
+        noise_nodes.push(simul.new_node().await?);
+    }
+    simul.store_all().await?;
+
+    log::info!("Setting up all node ids and start synching");
+    simul.sync_check(&realm).await?;
+
+    log::info!("Creating a Tag");
+    let root_tag = FloBlobTag::new(realm.realm_id(), Rules::None, "root_tag", None)?;
+    realm.edit_sign_update(
+        |r| r.set_service("tag", root_tag.flo_id()),
+        root_wallet.get_badge_condition(),
+        realm.rules().clone(),
+        vec![],
+        &[&*root_nodes[0].wallet.get_signer()],
+    )?;
+    root_nodes[0].dht_storage.store_flo(realm.flo().clone())?;
+
+    log::info!("Creating 4th node and sub-tag");
+    let mut node_4 = simul.new_node().await?;
+    simul.sync_check(&realm).await?;
+
+    let sub_tag = FloBlobTag::new(realm.realm_id(), Rules::None, "sub_tag", None)?;
+    node_4.dht_storage.store_flo(sub_tag.clone().into())?;
+    simul.sync_check(&sub_tag).await?;
+
+    log::info!("Storing webpage");
+    let homepage = FloBlobPage::new(
+        realm.realm_id(),
+        node_4.wallet.get_rules(),
+        "/",
+        INDEX_HTML.into(),
+        None,
+    )?;
+    realm.edit_sign_update(
+        |r| r.set_service("http", homepage.flo_id()),
+        root_wallet.get_badge_condition(),
+        realm.rules().clone(),
+        vec![],
+        &[&*root_nodes[0].wallet.get_signer()],
+    )?;
+    node_4.dht_storage.store_flo(homepage.clone().into())?;
+    node_4.dht_storage.store_flo(realm.clone().into())?;
+    simul.sync_check(&sub_tag).await?;
+    simul.sync_check(&homepage).await?;
+    simul.sync_check(&realm).await?;
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn test_realm_view() -> Result<(), Box<dyn Error>> {
+    // start_logging_filter_level(vec![], LOG_LVL);
+    start_logging_filter_level(vec!["flmodules::dht_storage", "webpage"], LOG_LVL);
+
+    log::info!("Setting up root nodes, realm, root page, and root tag.");
+
+    let mut simul = Simul::new().await?;
+    let nbr_root = 3;
+    let nbr_noise = 10;
+    let mut root_nodes = simul.new_nodes(nbr_root).await?;
+
+    let mut wallet_root = Wallet::new();
+    wallet_root.badge_condition = Some(Condition::NofT(
+        1,
+        root_nodes
+            .iter_mut()
+            .map(|n| n.wallet.get_badge_condition())
+            .collect(),
+    ));
+
+    let mut rv_root = RealmView::new_create_realm_config(
+        root_nodes[0].dht_storage.clone(),
+        "root",
+        wallet_root.get_badge_rules(),
+        RealmConfig {
+            max_space: 6e3 as u64,
+            max_flo_size: 3e3 as u32,
+        },
+    )
+    .await?;
+
+    let root_http = rv_root.create_http("fledger", INDEX_HTML.to_string(), None, None)?;
+    let signers = vec![&*(root_nodes[0].wallet.signer.as_deref().unwrap())];
+    rv_root.set_realm_http(root_http.flo_id(), &signers).await?;
+    let root_tag = rv_root.create_tag("fledger", None, None)?;
+    rv_root.set_realm_tag(root_tag.flo_id(), &signers).await?;
+
+    log::info!("Setting up noise nodes and fetching realm, page, and tag");
+    let noise_nodes = simul.new_nodes(nbr_noise).await?;
+    simul.sync_check(&root_tag).await?;
+    simul.sync_check(&root_http).await?;
+    simul.sync_check(&rv_root.realm).await?;
+
+    let mut rv_noise = RealmView::new(noise_nodes[0].dht_storage.clone()).await?;
+    assert!(rv_noise.pages.len() > 0);
+    assert!(rv_noise.tags.len() > 0);
+
+    let cuckoo_nbr: usize = 3;
+    for nbr in 0..cuckoo_nbr {
+        log::info!("Adding cuckoo page and tag #{nbr}");
+        let cuckoo_page = rv_noise.create_http_cuckoo(
+            &format!("cuckoo_{nbr}"),
+            "<html><h1>Cuckoo".to_string(),
+            None,
+            None,
+            Cuckoo::Parent(rv_noise.pages[0].flo_id()),
+        )?;
+        let cuckoo_tag = rv_noise.create_tag_cuckoo(
+            &format!("cuckoo_{nbr}"),
+            None,
+            None,
+            Cuckoo::Parent(rv_noise.tags[0].flo_id()),
+        )?;
+        log::trace!("IDs: {} - {}", cuckoo_page.flo_id(), cuckoo_tag.flo_id());
+        simul.sync_check(&cuckoo_tag).await?;
+        simul.sync_check(&cuckoo_page).await?;
+    }
+    simul.sync_check(&rv_root.realm).await?;
+
+    log::info!("New node, and checking cuckoos");
+    let new_node = simul.new_node().await?;
+    simul
+        .sync_check_cuckoos(&rv_noise.pages.first().unwrap(), cuckoo_nbr)
+        .await?;
+    simul
+        .sync_check_cuckoos(&rv_noise.tags.first().unwrap(), cuckoo_nbr)
+        .await?;
+    let rv_new = RealmView::new(new_node.dht_storage.clone()).await?;
+    assert_eq!(cuckoo_nbr + 1, rv_new.pages.len());
+    assert_eq!(cuckoo_nbr + 1, rv_new.tags.len());
+
+    Ok(())
+}
+
+const INDEX_HTML: &str = r##"
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Fledger</title>
+  </head>
+<body>
+<h1>Fledger</h1>
+
+Fast, Fun, Fair Ledger, or Fledger puts the <strong>FUN</strong> back in blockchain!
+</body>
+</html>
+    "##;
diff --git a/flnode/Cargo.lock b/flnode/Cargo.lock
index 2ed5f5ce..1421824c 100644
--- a/flnode/Cargo.lock
+++ b/flnode/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,36 +93,37 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -143,7 +144,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -158,7 +159,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -182,7 +183,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -205,14 +206,25 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -221,24 +233,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -249,23 +261,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -315,9 +327,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 dependencies = [
  "serde",
 ]
@@ -340,11 +352,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -354,9 +372,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -372,9 +390,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -397,11 +415,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -424,19 +448,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "const-oid"
@@ -462,9 +476,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -509,9 +523,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -531,6 +545,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -545,7 +560,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -569,7 +584,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -580,14 +595,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -657,7 +672,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -674,6 +689,17 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
 [[package]]
 name = "ed25519-compact"
 version = "2.1.1"
@@ -681,7 +707,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
- "getrandom",
+ "ed25519",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -713,9 +755,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -723,9 +765,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -740,6 +782,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -761,20 +813,23 @@ name = "flarch"
 version = "0.8.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "wasm-bindgen",
@@ -786,42 +841,68 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
+name = "flcrypto"
+version = "0.8.0"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "flarch",
+ "flmacro",
+ "log",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde_with",
+ "sha2",
+ "thiserror 2.0.11",
+ "typetag",
+]
+
+[[package]]
+name = "flmacro"
 version = "0.8.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "flmodules"
 version = "0.8.0"
 dependencies = [
+ "async-recursion",
  "async-stream",
  "async-trait",
  "bimap",
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "bytes",
  "ed25519-compact",
+ "ed25519-dalek",
  "flarch",
+ "flcrypto",
+ "flmacro",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
+ "num-bigint",
  "rand",
  "reqwest",
+ "rmp-serde",
  "serde",
  "serde_derive",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "strum_macros",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "toml",
+ "typetag",
 ]
 
 [[package]]
@@ -835,7 +916,7 @@ dependencies = [
  "flarch",
  "flmodules",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
@@ -845,7 +926,7 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "toml",
 ]
@@ -867,9 +948,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -882,9 +963,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -892,15 +973,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -909,38 +990,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -974,10 +1055,22 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -990,9 +1083,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "group"
@@ -1013,15 +1106,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hex"
@@ -1049,9 +1142,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1083,9 +1176,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "humantime"
@@ -1095,9 +1188,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1114,9 +1207,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http",
@@ -1132,9 +1225,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1145,16 +1238,15 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1173,6 +1265,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1181,12 +1391,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1202,12 +1423,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1234,18 +1455,27 @@ dependencies = [
  "rand",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
  "webrtc-util",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1264,16 +1494,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1285,9 +1516,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linked-hash-map"
@@ -1295,6 +1526,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1307,9 +1544,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "md-5"
@@ -1344,9 +1581,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1360,22 +1597,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1419,6 +1655,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1447,9 +1684,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1465,9 +1702,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1477,9 +1714,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1495,9 +1732,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1528,6 +1765,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1553,31 +1796,11 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1609,9 +1832,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1639,18 +1862,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -1659,46 +1882,50 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.15",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1730,14 +1957,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -1749,18 +1976,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1770,9 +1997,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1781,15 +2008,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -1819,6 +2046,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-util",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -1847,13 +2075,35 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rtcp"
 version = "0.11.0"
@@ -1861,7 +2111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1875,7 +2125,7 @@ dependencies = [
  "portable-atomic",
  "rand",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1887,9 +2137,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -1911,9 +2161,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -1938,36 +2188,44 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -1980,19 +2238,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2007,7 +2259,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand",
  "substring",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2031,7 +2283,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2040,9 +2292,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2050,15 +2302,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2076,20 +2328,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -2099,9 +2351,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2120,15 +2372,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2138,14 +2390,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2224,9 +2476,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2248,12 +2500,31 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "stun"
 version = "0.6.0"
@@ -2267,7 +2538,7 @@ dependencies = [
  "rand",
  "ring",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2301,9 +2572,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2312,9 +2583,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -2339,34 +2610,54 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2385,19 +2676,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2410,9 +2711,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2427,31 +2728,30 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2476,9 +2776,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2489,9 +2789,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2510,11 +2810,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -2523,14 +2823,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
  "pin-project-lite",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -2550,9 +2850,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -2560,9 +2860,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -2589,7 +2889,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2608,12 +2908,18 @@ dependencies = [
  "rand",
  "ring",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -2621,31 +2927,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typetag"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "typetag-impl"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unicode-ident"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -2665,9 +2980,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2680,6 +2995,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2688,11 +3015,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2735,14 +3062,24 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2750,36 +3087,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2787,33 +3124,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -2821,20 +3159,20 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -2845,9 +3183,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -2859,9 +3197,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2869,9 +3217,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -2904,7 +3252,7 @@ dependencies = [
  "sha2",
  "smol_str",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -2929,7 +3277,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -2965,7 +3313,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -2987,7 +3335,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -3005,7 +3353,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3020,7 +3368,7 @@ dependencies = [
  "bytes",
  "rand",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3036,7 +3384,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3059,7 +3407,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3080,7 +3428,7 @@ dependencies = [
  "nix",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3239,13 +3587,34 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -3272,7 +3641,7 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3294,6 +3663,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3312,7 +3705,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -3332,5 +3746,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/flnode/Cargo.toml b/flnode/Cargo.toml
index 0e81508f..16caa351 100644
--- a/flnode/Cargo.toml
+++ b/flnode/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flnode"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 authors = ["Linus Gasser <linus@gasser.blue>"]
 description = "Glue code for flmodules"
@@ -11,8 +11,8 @@ readme = "README.md"
 keywords = ["test", "utils", "fledger"]
 
 [dependencies]
-flmodules = {path = "../flmodules", version = "0.8"}
-flarch = {path = "../flarch", version = "0.8"}
+flmodules = {path = "../flmodules", version = "0.9"}
+flarch = {path = "../flarch", version = "0.9"}
 
 async-trait = "0.1"
 rand = "0.8"
diff --git a/flnode/src/node.rs b/flnode/src/node.rs
index 7c9d8c4d..a886df79 100644
--- a/flnode/src/node.rs
+++ b/flnode/src/node.rs
@@ -1,27 +1,35 @@
 use log::{error, info};
 use std::collections::HashMap;
 use thiserror::Error;
+use tokio::sync::watch;
 
-use flarch::{
-    broker::{Broker, BrokerError},
-    nodeids::NodeID,
-};
+use flarch::{broker::BrokerError, nodeids::NodeID};
 use flarch::{
     data_storage::{DataStorage, StorageError},
     tasks::now,
 };
 use flmodules::{
+    dht_router::{broker::DHTRouter, kademlia},
+    dht_storage::{self, broker::DHTStorage, core::DHTConfig},
+    flo::storage::CryptoStorage,
     gossip_events::{
-        broker::GossipBroker,
-        core::{self, Category, Event},
-        messages::{GossipIn, GossipMessage},
-    }, network::messages::{NetworkError, NetworkIn, NetworkMessage}, nodeconfig::{ConfigError, NodeConfig, NodeInfo}, overlay::broker::OverlayRandom, ping::{broker::PingBroker, messages::PingConfig}, random_connections::broker::RandomBroker, timer::{TimerBroker, TimerMessage}, web_proxy::{
+        broker::Gossip,
+        core::{self, Category},
+    },
+    network::broker::{BrokerNetwork, NetworkError, NetworkIn},
+    nodeconfig::{ConfigError, NodeConfig, NodeInfo},
+    ping::{broker::Ping, messages::PingConfig},
+    random_connections::broker::RandomBroker,
+    router::broker::{BrokerRouter, RouterNetwork, RouterRandom},
+    timer::Timer,
+    web_proxy::{
         broker::{WebProxy, WebProxyError},
         core::WebProxyConfig,
-    }, Modules
+    },
+    Modules,
 };
 
-use crate::stat::StatBroker;
+use crate::stat::{NetStats, NetworkStats};
 
 #[derive(Error, Debug)]
 pub enum NodeError {
@@ -41,6 +49,8 @@ pub enum NodeError {
     Yaml(#[from] serde_yaml::Error),
     #[error(transparent)]
     WebProxy(#[from] WebProxyError),
+    #[error(transparent)]
+    DHTStorage(#[from] dht_storage::broker::StorageError),
 }
 
 /// The node structure holds it all together. It is the main structure of the project.
@@ -48,24 +58,33 @@ pub struct Node {
     /// The node configuration
     pub node_config: NodeConfig,
     /// Storage to be used
-    pub storage: Box<dyn DataStorage>,
+    pub storage: Box<dyn DataStorage + Send>,
     /// Network broker
-    pub broker_net: Broker<NetworkMessage>,
+    pub broker_net: BrokerNetwork,
+    /// Network IO broker
+    pub network_io: BrokerRouter,
+    /// Timer broker
+    pub timer: Timer,
+    /// Storing all the signers and ACEs
+    pub crypto_storage: CryptoStorage,
 
     // Subsystem data
     /// Stores the connection data
-    pub stat: Option<StatBroker>,
+    pub stat: Option<watch::Receiver<NetStats>>,
     /// Handles a random number of connections
     pub random: Option<RandomBroker>,
     /// Gossip-events sent and received
-    pub gossip: Option<GossipBroker>,
+    pub gossip: Option<Gossip>,
     /// Pings all connected nodes and informs about failing nodes
-    pub ping: Option<PingBroker>,
+    pub ping: Option<Ping>,
     /// Answers GET requests from another node
     pub webproxy: Option<WebProxy>,
+    /// Sets up a dht routing system using Kademlia
+    pub dht_router: Option<DHTRouter>,
+    /// Decentralized storage system using DHTRouting
+    pub dht_storage: Option<DHTStorage>,
 }
 
-const STORAGE_GOSSIP_EVENTS: &str = "gossip_events";
 const STORAGE_CONFIG: &str = "nodeConfig";
 
 impl Node {
@@ -76,7 +95,7 @@ impl Node {
     pub async fn start(
         storage: Box<dyn DataStorage + Send>,
         node_config: NodeConfig,
-        broker_net: Broker<NetworkMessage>,
+        broker_net: BrokerNetwork,
     ) -> Result<Self, NodeError> {
         info!(
             "Starting node: {} = {}",
@@ -84,32 +103,44 @@ impl Node {
             node_config.info.get_id()
         );
 
+        let mut timer = Timer::start().await?;
+        timer
+            .tick_second(broker_net.clone(), NetworkIn::Tick)
+            .await?;
+        let network_io = RouterNetwork::start(broker_net.clone()).await?;
+
         let modules = node_config.info.modules;
         let id = node_config.info.get_id();
         let mut random = None;
         let mut gossip = None;
         let mut ping = None;
         let mut webproxy = None;
-        if modules.contains(Modules::ENABLE_RAND) {
-            let rnd = RandomBroker::start(id, broker_net.clone()).await?;
-            if modules.contains(Modules::ENABLE_GOSSIP) {
-                gossip = Some(GossipBroker::start(id, rnd.broker.clone()).await?);
-                Self::init_gossip(
-                    &mut gossip.as_mut().unwrap(),
-                    storage.clone(),
-                    &node_config.info,
-                )
-                .await?;
+        let mut stat = None;
+        let mut dht_router = None;
+        let mut dht_storage = None;
+        if modules.contains(Modules::RAND) {
+            let rnd = RandomBroker::start(id, broker_net.clone(), &mut timer).await?;
+            if modules.contains(Modules::GOSSIP) {
+                gossip = Some(
+                    Gossip::start(
+                        storage.clone(),
+                        node_config.info.clone(),
+                        rnd.broker.clone(),
+                        &mut timer,
+                    )
+                    .await?,
+                );
             }
-            if modules.contains(Modules::ENABLE_PING) {
-                ping = Some(PingBroker::start(PingConfig::default(), rnd.broker.clone()).await?);
+            if modules.contains(Modules::PING) {
+                ping =
+                    Some(Ping::start(PingConfig::default(), rnd.broker.clone(), &mut timer).await?);
             }
-            if modules.contains(Modules::ENABLE_WEBPROXY) {
+            if modules.contains(Modules::WEBPROXY) {
                 webproxy = Some(
                     WebProxy::start(
-                        storage.clone(),
+                        storage.clone_box(),
                         id,
-                        OverlayRandom::start(rnd.broker.clone()).await?,
+                        RouterRandom::start(rnd.broker.clone()).await?,
                         WebProxyConfig::default(),
                     )
                     .await?,
@@ -117,77 +148,53 @@ impl Node {
             }
             random = Some(rnd);
         }
-        let stat = if modules.contains(Modules::ENABLE_STAT) {
-            Some(StatBroker::start(broker_net.clone()).await?)
-        } else {
-            None
-        };
+        if modules.contains(Modules::STAT) {
+            stat = Some(NetworkStats::start(broker_net.clone()).await?)
+        }
+        if modules.contains(Modules::DHT_ROUTER) {
+            let routing = DHTRouter::start(
+                id,
+                network_io.clone(),
+                &mut timer,
+                kademlia::Config::default(),
+            )
+            .await?;
+            if modules.contains(Modules::DHT_STORAGE) {
+                dht_storage = Some(
+                    DHTStorage::start(
+                        storage.clone_box(),
+                        id,
+                        DHTConfig::default(),
+                        routing.broker.clone(),
+                        &mut timer,
+                    )
+                    .await?,
+                );
+            }
+            dht_router = Some(routing);
+        }
 
-        let mut node = Self {
+        Ok(Self {
+            crypto_storage: CryptoStorage::new(storage.clone()),
             storage,
             node_config,
             broker_net,
+            network_io,
+            timer,
             stat,
             random,
             gossip,
             ping,
             webproxy,
-        };
-        node.add_timer(TimerBroker::start().await?).await;
-        Ok(node)
-    }
-
-    /// Adds a timer broker to the Node. Automatically called by Node::start.
-    pub async fn add_timer(&mut self, mut timer: Broker<TimerMessage>) {
-        timer
-            .forward(
-                self.broker_net.clone(),
-                Box::new(|msg| (msg == TimerMessage::Second).then(|| NetworkIn::Tick.into())),
-            )
-            .await;
-        if let Some(r) = self.random.as_mut() {
-            r.add_timer(timer.clone()).await;
-        }
-        if let Some(g) = self.gossip.as_mut() {
-            g.add_timer(timer.clone()).await;
-        }
-        if let Some(p) = self.ping.as_mut() {
-            p.add_timer(timer).await;
-        }
-    }
-
-    /// Update all data-storage. Goes through all storage modules, reads the queues of messages,
-    /// and processes the ones with updated data.
-    pub fn update(&mut self) {
-        if let Some(s) = self.stat.as_mut() {
-            s.update();
-        }
-        if let Some(r) = self.random.as_mut() {
-            r.update();
-        }
-        if let Some(g) = self.gossip.as_mut() {
-            g.update();
-        }
-        if let Some(p) = self.ping.as_mut() {
-            p.update();
-        }
-    }
-
-    /// Start processing of network and logic messages, in case they haven't been
-    /// called automatically.
-    /// Also updates all storage fields in the node_data field.
-    pub async fn process(&mut self) -> Result<(), NodeError> {
-        self.update();
-        if let Some(g) = self.gossip.as_mut() {
-            self.storage.set(STORAGE_GOSSIP_EVENTS, &g.storage.get()?)?;
-        }
-        Ok(())
+            dht_router,
+            dht_storage,
+        })
     }
 
     /// Requests a list of all connected nodes
     pub async fn request_list(&mut self) -> Result<(), NodeError> {
         self.broker_net
-            .emit_msg(NetworkIn::WSUpdateListRequest.into())?;
+            .emit_msg_in(NetworkIn::WSUpdateListRequest)?;
         Ok(())
     }
 
@@ -202,7 +209,7 @@ impl Node {
     /// currently connected to, and can be shorter than the list of all nodes in the system.
     pub fn nodes_connected(&self) -> Result<Vec<NodeInfo>, NodeError> {
         if let Some(r) = self.random.as_ref() {
-            return self.nodes_info(r.storage.connected.get_nodes().0);
+            return self.nodes_info(r.storage.borrow().connected.get_nodes().0);
         }
         Err(NodeError::Missing("Random".into()))
     }
@@ -211,7 +218,7 @@ impl Node {
     /// to a subset of these nodes, which can be get with `nodes_connected`.
     pub fn nodes_online(&self) -> Result<Vec<NodeInfo>, NodeError> {
         if let Some(r) = self.random.as_ref() {
-            return self.nodes_info(r.storage.known.0.clone());
+            return self.nodes_info(r.storage.borrow().known.0.clone());
         }
         Err(NodeError::Missing("Random".into()))
     }
@@ -253,32 +260,6 @@ impl Node {
         }
     }
 
-    // Reads the gossip configuration and stores it in the gossip-storage.
-    async fn init_gossip(
-        gossip: &mut GossipBroker,
-        gossip_storage: Box<dyn DataStorage>,
-        node_info: &NodeInfo,
-    ) -> Result<(), NodeError> {
-        let gossip_msgs_str = gossip_storage.get(STORAGE_GOSSIP_EVENTS).unwrap();
-        if !gossip_msgs_str.is_empty() {
-            if let Err(e) = gossip.storage.set(&gossip_msgs_str) {
-                log::warn!("Couldn't load gossip messages: {}", e);
-            }
-        }
-        gossip.storage.add_event(Event {
-            category: Category::NodeInfo,
-            src: node_info.get_id(),
-            created: now(),
-            msg: node_info.encode(),
-        });
-        gossip
-            .broker
-            .emit_msg(GossipMessage::Input(GossipIn::SetStorage(
-                gossip.storage.clone(),
-            )))?;
-        Ok(())
-    }
-
     /// Static method
 
     /// Fetches the config
@@ -300,7 +281,7 @@ impl Node {
         config
             .info
             .modules
-            .set(Modules::ENABLE_WEBPROXY_REQUESTS, enable_webproxy_request);
+            .set(Modules::WEBPROXY_REQUESTS, enable_webproxy_request);
         Self::set_config(storage, &config.encode())?;
         Ok(config)
     }
@@ -314,7 +295,7 @@ impl Node {
 
 #[cfg(test)]
 mod tests {
-    use flarch::{data_storage::DataStorageTemp, start_logging};
+    use flarch::{broker::Broker, data_storage::DataStorageTemp, start_logging, start_logging_filter_level};
     use flmodules::gossip_events::{
         core::{Category, Event},
         messages::GossipIn,
@@ -328,7 +309,7 @@ mod tests {
 
         let storage = DataStorageTemp::new();
         let nc = NodeConfig::new();
-        let mut nd = Node::start(storage.clone(), nc.clone(), Broker::new()).await?;
+        let mut nd = Node::start(storage.clone_box(), nc.clone(), Broker::new()).await?;
         let event = Event {
             category: Category::TextMessage,
             src: nc.info.get_id(),
@@ -339,12 +320,16 @@ mod tests {
             .as_mut()
             .unwrap()
             .broker
-            .settle_msg(GossipIn::AddEvent(event.clone()).into())
+            .settle_msg_in(GossipIn::AddEvent(event.clone()).into())
             .await?;
-        nd.process().await?;
 
-        let nd2 = Node::start(storage.clone(), nc.clone(), Broker::new()).await?;
-        let events = nd2.gossip.unwrap().storage.events(Category::TextMessage);
+        let nd2 = Node::start(storage.clone_box(), nc.clone(), Broker::new()).await?;
+        let events = nd2
+            .gossip
+            .unwrap()
+            .storage
+            .borrow()
+            .events(Category::TextMessage);
         assert_eq!(1, events.len());
         assert_eq!(&event, events.get(0).unwrap());
         Ok(())
@@ -352,7 +337,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_store_node() -> Result<(), Box<dyn std::error::Error>> {
-        start_logging();
+        start_logging_filter_level(vec![], log::LevelFilter::Info);
 
         let mut node = Node::start(
             Box::new(DataStorageTemp::new()),
@@ -360,8 +345,12 @@ mod tests {
             Broker::new(),
         )
         .await?;
-        node.update();
-        log::debug!("storage is: {:?}", node.gossip.as_ref().unwrap().storage);
+        node.gossip.as_mut().unwrap().broker.settle(vec![]).await?;
+
+        log::debug!(
+            "storage is: {:?}",
+            node.gossip.as_ref().unwrap().storage.borrow()
+        );
         assert_eq!(1, node.gossip.unwrap().events(Category::NodeInfo).len());
         Ok(())
     }
diff --git a/flnode/src/stat.rs b/flnode/src/stat.rs
index 26f440dc..534b12be 100644
--- a/flnode/src/stat.rs
+++ b/flnode/src/stat.rs
@@ -1,31 +1,52 @@
-use std::{collections::HashMap, sync::mpsc::Receiver};
+use std::collections::HashMap;
 
-use flmodules::network::messages::{NetworkOut, NetworkConnectionState, NetworkMessage};
 use flarch::{
-    broker::{Broker, BrokerError},
+    broker::{Broker, BrokerError, SubsystemHandler},
     nodeids::U256,
+    platform_async_trait,
 };
+use flmodules::network::broker::{BrokerNetwork, NetworkConnectionState, NetworkIn, NetworkOut};
+use tokio::sync::watch;
+
+pub type NetStats = HashMap<U256, NetworkConnectionState>;
 
 /// Collects the statistics of the connections sent by the network broker.
-pub struct StatBroker {
-    pub states: HashMap<U256, NetworkConnectionState>,
-    tap: Receiver<NetworkMessage>,
+pub struct NetworkStats {
+    stats: NetStats,
+    tx: Option<watch::Sender<NetStats>>,
 }
 
-impl StatBroker {
-    pub async fn start(mut broker_net: Broker<NetworkMessage>) -> Result<Self, BrokerError> {
-        let (tap, _) = broker_net.get_tap_sync().await?;
-        Ok(Self {
-            states: HashMap::new(),
-            tap,
-        })
+impl NetworkStats {
+    pub async fn start(
+        mut broker_net: BrokerNetwork,
+    ) -> Result<watch::Receiver<NetStats>, BrokerError> {
+        let stats = NetStats::default();
+        let (tx, rx) = watch::channel(stats.clone());
+        let mut broker = Broker::new();
+        broker
+            .add_handler(Box::new(Self {
+                stats,
+                tx: Some(tx),
+            }))
+            .await?;
+        broker_net
+            .add_translator_o_ti(broker, Box::new(|msg| Some(msg)))
+            .await?;
+        Ok(rx)
     }
+}
 
-    pub fn update(&mut self) {
-        for msg in self.tap.try_iter() {
-            if let NetworkMessage::Output(NetworkOut::ConnectionState(state)) = msg {
-                self.states.insert(state.id, state);
+#[platform_async_trait()]
+impl SubsystemHandler<NetworkOut, NetworkIn> for NetworkStats {
+    async fn messages(&mut self, msgs: Vec<NetworkOut>) -> Vec<NetworkIn> {
+        for msg in msgs {
+            if let NetworkOut::ConnectionState(state) = msg {
+                self.stats.insert(state.id, state);
+                self.tx
+                    .clone()
+                    .map(|tx| tx.send(self.stats.clone()).is_err().then(|| self.tx = None));
             }
         }
+        vec![]
     }
 }
diff --git a/flnode/tests/gossip_events.rs b/flnode/tests/gossip_events.rs
index beec6690..2bb94e7b 100644
--- a/flnode/tests/gossip_events.rs
+++ b/flnode/tests/gossip_events.rs
@@ -5,7 +5,7 @@ mod helpers;
 use helpers::*;
 
 async fn gossip(nbr_nodes: usize) -> Result<(), NetworkError> {
-    start_logging_filter_level(vec![], log::LevelFilter::Debug);
+    start_logging_filter_level(vec![], log::LevelFilter::Info);
 
     let mut net = NetworkSimul::new();
     log::info!("Creating {nbr_nodes} nodes");
@@ -26,7 +26,6 @@ async fn gossip(nbr_nodes: usize) -> Result<(), NetworkError> {
             .nodes
             .values_mut()
             .map(|node_timer| {
-                node_timer.node.update();
                 node_timer.messages()
             })
             .reduce(|n, nbr| n + nbr)
@@ -86,9 +85,10 @@ mod tests {
         Ok(())
     }
 
+    // 30 nodes have trouble correctly shutting down, so we keep it to 20 for now.
     #[tokio::test]
-    async fn gossip_30() -> Result<(), NetworkError> {
-        gossip(30).await?;
+    async fn gossip_20() -> Result<(), NetworkError> {
+        gossip(20).await?;
         Ok(())
     }
 }
diff --git a/flnode/tests/helpers/mod.rs b/flnode/tests/helpers/mod.rs
index 3607be8c..cca5e709 100644
--- a/flnode/tests/helpers/mod.rs
+++ b/flnode/tests/helpers/mod.rs
@@ -4,14 +4,20 @@ use flarch::{
     broker::{Broker, BrokerError},
     data_storage::DataStorageTemp,
     nodeids::U256,
-    web_rtc::{node_connection::NCInput, WebRTCConnMessage},
+    web_rtc::{
+        node_connection::{NCInput, NCOutput},
+        WebRTCConnInput, WebRTCConnOutput,
+    },
+};
+use flmodules::{
+    network::broker::{BrokerNetwork, NetworkIn, NetworkOut},
+    timer::BrokerTimer,
 };
 use flmodules::{
     nodeconfig::{NodeConfig, NodeInfo},
     timer::TimerMessage,
     Modules,
 };
-use flmodules::network::messages::{NetworkIn, NetworkOut, NetworkMessage};
 
 use flnode::node::{Node, NodeError};
 use thiserror::Error;
@@ -27,8 +33,8 @@ pub enum NetworkError {
 pub struct NetworkSimul {
     pub nodes: HashMap<U256, NodeTimer>,
     pub messages: u64,
-    node_brokers: HashMap<U256, Broker<NetworkMessage>>,
-    node_taps: HashMap<U256, Receiver<NetworkMessage>>,
+    node_brokers: HashMap<U256, BrokerNetwork>,
+    node_taps: HashMap<U256, Receiver<NetworkIn>>,
 }
 
 impl NetworkSimul {
@@ -51,7 +57,7 @@ impl NetworkSimul {
 
     pub async fn tick(&mut self) -> Result<(), NetworkError> {
         for node in self.nodes.values_mut() {
-            node.timer.settle_msg(TimerMessage::Second).await?;
+            node.timer.settle_msg_out(TimerMessage::Second).await?;
         }
         Ok(())
     }
@@ -66,7 +72,7 @@ impl NetworkSimul {
         for id in self.nodes.keys() {
             if let Some(broker) = self.node_brokers.get_mut(id) {
                 broker
-                    .settle_msg(NetworkOut::NodeListFromWS(list.clone()).into())
+                    .settle_msg_out(NetworkOut::NodeListFromWS(list.clone()))
                     .await?;
             }
         }
@@ -77,7 +83,7 @@ impl NetworkSimul {
         let mut broker = Broker::new();
         let node_timer = NodeTimer::new(broker.clone(), self.nodes.len() as u32, modules).await?;
         let id = node_timer.node.node_config.info.get_id();
-        let (tap, _) = broker.get_tap_sync().await?;
+        let (tap, _) = broker.get_tap_in_sync().await?;
         self.node_taps.insert(id, tap);
         self.node_brokers.insert(id, broker);
         self.nodes.insert(id, node_timer);
@@ -96,13 +102,6 @@ impl NetworkSimul {
         }
     }
 
-    #[allow(dead_code)]
-    pub async fn send_message(&mut self, id: &U256, bm: NetworkMessage) {
-        if let Some(ch) = self.node_brokers.get_mut(id) {
-            ch.settle_msg(bm).await.expect("Couldn't send message");
-        }
-    }
-
     async fn process_one(&mut self) {
         self.tick().await.unwrap();
         let ids: Vec<U256> = self.nodes.keys().cloned().collect();
@@ -112,7 +111,7 @@ impl NetworkSimul {
                     if let Some(broker) = self.node_brokers.get_mut(&id_dst) {
                         log::trace!("Send: {} -> {}: {:?}", id, id_dst, msg_out);
                         broker
-                            .settle_msg(msg_out)
+                            .settle_msg_out(msg_out)
                             .await
                             .expect("processing one message");
                         self.messages += 1;
@@ -120,35 +119,26 @@ impl NetworkSimul {
                 }
             }
         }
-
-        for id in ids.iter() {
-            self.nodes.get_mut(id).unwrap().process().await;
-        }
     }
 
-    fn process_msg(&self, id: &U256, msg: NetworkMessage) -> Vec<(U256, NetworkMessage)> {
+    fn process_msg(&self, id: &U256, msg: NetworkIn) -> Vec<(U256, NetworkOut)> {
         match msg {
-            NetworkMessage::Input(NetworkIn::Connect(id_dst)) => {
+            NetworkIn::Connect(id_dst) => {
                 vec![
-                    (*id, NetworkOut::Connected(id_dst).into()),
-                    (id_dst, NetworkOut::Connected(*id).into()),
+                    (*id, NetworkOut::Connected(id_dst)),
+                    (id_dst, NetworkOut::Connected(*id)),
                 ]
             }
-            NetworkMessage::Input(NetworkIn::MessageToNode(from_id, msg_str)) => vec![(
-                from_id,
-                NetworkOut::MessageFromNode(id.clone(), msg_str).into(),
-            )],
-            NetworkMessage::WebRTC(WebRTCConnMessage::InputNC(
-                id_dst,
-                NCInput::Text(msg_node),
-            )) => {
+            NetworkIn::MessageToNode(from_id, msg_str) => {
+                vec![(from_id, NetworkOut::MessageFromNode(id.clone(), msg_str))]
+            }
+            NetworkIn::WebRTC(WebRTCConnOutput::Message(id_dst, NCOutput::Text(msg_node))) => {
                 vec![(
                     id_dst.clone(),
-                    NetworkMessage::WebRTC(WebRTCConnMessage::InputNC(
+                    NetworkOut::WebRTC(WebRTCConnInput::Message(
                         *id,
-                        NCInput::Text(msg_node.clone()).into(),
-                    ))
-                    .into(),
+                        NCInput::Text(msg_node.clone()),
+                    )),
                 )]
             }
             _ => vec![],
@@ -158,12 +148,12 @@ impl NetworkSimul {
 
 pub struct NodeTimer {
     pub node: Node,
-    pub timer: Broker<TimerMessage>,
+    pub timer: BrokerTimer,
 }
 
 impl NodeTimer {
     pub async fn new(
-        broker_net: Broker<NetworkMessage>,
+        broker_net: BrokerNetwork,
         start: u32,
         modules: Modules,
     ) -> Result<Self, NodeError> {
@@ -181,18 +171,16 @@ impl NodeTimer {
             node_config = NodeConfig::new();
         }
         node_config.info.modules = modules;
-        let mut node_data = Node::start(
+        let node_data = Node::start(
             Box::new(DataStorageTemp::new()),
             node_config,
             broker_net.clone(),
         )
         .await?;
-        let timer = Broker::new();
-        node_data.add_timer(timer.clone()).await;
 
         Ok(Self {
+            timer: node_data.timer.broker.clone(),
             node: node_data,
-            timer,
         })
     }
 
@@ -200,14 +188,6 @@ impl NodeTimer {
         self.node.node_config.info.clone()
     }
 
-    pub async fn process(&mut self) {
-        self.node
-            .process()
-            .await
-            .err()
-            .map(|e| log::error!("While processing node-data: {e:?}"));
-    }
-
     #[allow(dead_code)]
     pub fn messages(&mut self) -> usize {
         self.node.gossip.as_ref().unwrap().chat_events().len()
diff --git a/flnode/tests/ping.rs b/flnode/tests/ping.rs
index 0704a285..af57193a 100644
--- a/flnode/tests/ping.rs
+++ b/flnode/tests/ping.rs
@@ -1,4 +1,4 @@
-use flarch::{broker::Broker, start_logging};
+use flarch::start_logging;
 use flmodules::{timer::TimerMessage, Modules};
 mod helpers;
 use helpers::*;
@@ -6,20 +6,17 @@ use helpers::*;
 async fn ping_n(nbr_nodes: usize) -> Result<(), NetworkError> {
     let mut net = NetworkSimul::new();
     log::info!("Creating {nbr_nodes} nodes");
-    let mut timer = Broker::new();
-    net.add_nodes(Modules::ENABLE_RAND | Modules::ENABLE_PING, nbr_nodes)
+    net.add_nodes(Modules::RAND | Modules::PING, nbr_nodes)
         .await?;
+    net.process(5).await;
     for node_timer in net.nodes.values_mut() {
-        node_timer.node.add_timer(timer.clone()).await;
+        node_timer.node.timer.broker.emit_msg_out(TimerMessage::Second)?;
     }
-    net.process(5).await;
-    timer.emit_msg(TimerMessage::Second)?;
 
     for node_timer in net.nodes.values_mut() {
-        node_timer.node.update();
         assert_eq!(
             0,
-            node_timer.node.ping.as_ref().unwrap().storage.failed.len()
+            node_timer.node.ping.as_ref().unwrap().storage.borrow().failed.len()
         );
         assert_eq!(
             node_timer
@@ -28,10 +25,11 @@ async fn ping_n(nbr_nodes: usize) -> Result<(), NetworkError> {
                 .as_ref()
                 .unwrap()
                 .storage
+                .borrow()
                 .connected
                 .0
                 .len(),
-            node_timer.node.ping.as_ref().unwrap().storage.stats.len()
+            node_timer.node.ping.as_ref().unwrap().storage.borrow().stats.len()
         );
     }
 
diff --git a/flnode/tests/random_connections.rs b/flnode/tests/random_connections.rs
index e61ba532..72c07353 100644
--- a/flnode/tests/random_connections.rs
+++ b/flnode/tests/random_connections.rs
@@ -6,7 +6,7 @@ use helpers::*;
 async fn connect_nodes_n(nbr_nodes: usize) -> Result<(), NetworkError> {
     let mut net = NetworkSimul::new();
     log::info!("Creating {nbr_nodes} nodes");
-    net.add_nodes(Modules::ENABLE_RAND, nbr_nodes).await?;
+    net.add_nodes(Modules::RAND, nbr_nodes).await?;
     net.process(5).await;
     log::info!("Sent a total of {} messages", net.messages);
 
@@ -21,9 +21,8 @@ async fn connect_nodes_n(nbr_nodes: usize) -> Result<(), NetworkError> {
         }
         nodes_visited.push(id);
         let node = net.nodes.get_mut(&id).unwrap();
-        node.node.update();
         let nd = node.node.random.as_ref().unwrap().storage.clone();
-        for n in nd.connected.0 {
+        for n in &nd.borrow().connected.0 {
             if nodes_to_visit.contains(&n.id) || nodes_visited.contains(&n.id) {
                 continue;
             }
diff --git a/test/fledger-nodejs/Cargo.lock b/test/fledger-nodejs/Cargo.lock
index c4d57c71..9c80e650 100644
--- a/test/fledger-nodejs/Cargo.lock
+++ b/test/fledger-nodejs/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,36 +93,37 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -143,7 +144,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -158,7 +159,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -182,7 +183,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -205,14 +206,25 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -221,24 +233,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -249,23 +261,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -315,9 +327,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 dependencies = [
  "serde",
 ]
@@ -340,11 +352,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -354,9 +372,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -372,9 +390,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -397,11 +415,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -424,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "console_error_panic_hook"
@@ -462,9 +486,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -509,9 +533,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -531,6 +555,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -545,7 +570,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -569,7 +594,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -580,14 +605,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -657,7 +682,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -674,6 +699,17 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
 [[package]]
 name = "ed25519-compact"
 version = "2.1.1"
@@ -681,7 +717,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
- "getrandom",
+ "ed25519",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -713,9 +765,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -723,9 +775,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -784,23 +836,26 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "flarch"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "wasm-bindgen",
@@ -812,17 +867,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
-version = "0.8.0"
+name = "flcrypto"
+version = "0.9.0"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
+ "bytes",
+ "ed25519-dalek",
+ "flarch",
+ "flmacro",
+ "log",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde_with",
+ "sha2",
+ "thiserror 2.0.11",
+ "typetag",
 ]
 
 [[package]]
 name = "fledger-node"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "console_error_panic_hook",
  "env_logger",
@@ -831,44 +895,62 @@ dependencies = [
  "flmodules",
  "flnode",
  "log",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "flmacro"
+version = "0.9.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "flmodules"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
+ "async-recursion",
  "async-stream",
  "async-trait",
  "bimap",
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
+ "btparse",
  "bytes",
  "ed25519-compact",
+ "ed25519-dalek",
  "flarch",
+ "flcrypto",
+ "flmacro",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
+ "num-bigint",
  "rand",
  "reqwest",
+ "rmp-serde",
  "serde",
  "serde_derive",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "strum_macros",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "toml",
+ "typetag",
 ]
 
 [[package]]
 name = "flnode"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "async-trait",
  "chrono",
@@ -876,7 +958,7 @@ dependencies = [
  "flarch",
  "flmodules",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
@@ -886,7 +968,7 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "toml",
 ]
@@ -908,9 +990,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -923,9 +1005,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -933,15 +1015,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -950,38 +1032,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1015,10 +1097,22 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -1031,9 +1125,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "group"
@@ -1054,15 +1148,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hex"
@@ -1090,9 +1184,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1124,9 +1218,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "humantime"
@@ -1136,9 +1230,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1155,9 +1249,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http",
@@ -1173,9 +1267,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1186,16 +1280,15 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1214,6 +1307,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1222,12 +1433,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1243,12 +1465,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1275,18 +1497,27 @@ dependencies = [
  "rand",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
  "webrtc-util",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1305,16 +1536,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1326,9 +1558,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linked-hash-map"
@@ -1336,6 +1568,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1348,9 +1586,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 dependencies = [
  "serde",
  "value-bag",
@@ -1389,9 +1627,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1405,22 +1643,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1464,6 +1701,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1492,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1510,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1522,9 +1760,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1540,9 +1778,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1573,6 +1811,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1598,31 +1842,11 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1654,9 +1878,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1684,18 +1908,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -1704,46 +1928,50 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.15",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1775,14 +2003,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -1794,18 +2022,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1815,9 +2043,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1826,15 +2054,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -1864,6 +2092,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-util",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -1892,13 +2121,35 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rtcp"
 version = "0.11.0"
@@ -1906,7 +2157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1920,7 +2171,7 @@ dependencies = [
  "portable-atomic",
  "rand",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1932,9 +2183,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -1956,9 +2207,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -1983,36 +2234,44 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -2025,19 +2284,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2052,7 +2305,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand",
  "substring",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2076,7 +2329,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2085,9 +2338,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2095,15 +2348,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2121,13 +2374,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2141,9 +2394,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -2153,9 +2406,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2174,15 +2427,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2192,14 +2445,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2278,9 +2531,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2302,12 +2555,31 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "stun"
 version = "0.6.0"
@@ -2321,7 +2593,7 @@ dependencies = [
  "rand",
  "ring",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2344,15 +2616,15 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "sval"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53eb957fbc79a55306d5d25d87daf3627bc3800681491cda0709eef36c748bfe"
+checksum = "d4c2f18f53c889ec3dfe1c08b20fd51406d09b14bf18b366416718763ccff05a"
 
 [[package]]
 name = "sval_buffer"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96e860aef60e9cbf37888d4953a13445abf523c534640d1f6174d310917c410d"
+checksum = "4b8cb1bb48d0bed828b908e6b99e7ab8c7244994dc27948a2e31d42e8c4d77c1"
 dependencies = [
  "sval",
  "sval_ref",
@@ -2360,18 +2632,18 @@ dependencies = [
 
 [[package]]
 name = "sval_dynamic"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea3f2b07929a1127d204ed7cb3905049381708245727680e9139dac317ed556f"
+checksum = "ba574872d4ad653071a9db76c49656082db83a37cd5f559874273d36b4a02b9d"
 dependencies = [
  "sval",
 ]
 
 [[package]]
 name = "sval_fmt"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e188677497de274a1367c4bda15bd2296de4070d91729aac8f0a09c1abf64d"
+checksum = "944450b2dbbf8aae98537776b399b23d72b19243ee42522cfd110305f3c9ba5a"
 dependencies = [
  "itoa",
  "ryu",
@@ -2380,9 +2652,9 @@ dependencies = [
 
 [[package]]
 name = "sval_json"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f456c07dae652744781f2245d5e3b78e6a9ebad70790ac11eb15dbdbce5282"
+checksum = "411bbd543c413796ccfbaa44f6676e20032b6c69e4996cb6c3e6ef30c79b96d1"
 dependencies = [
  "itoa",
  "ryu",
@@ -2391,9 +2663,9 @@ dependencies = [
 
 [[package]]
 name = "sval_nested"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "886feb24709f0476baaebbf9ac10671a50163caa7e439d7a7beb7f6d81d0a6fb"
+checksum = "f30582d2a90869b380f8260559138c1b68ac3e0765520959f22a1a1fdca31769"
 dependencies = [
  "sval",
  "sval_buffer",
@@ -2402,18 +2674,18 @@ dependencies = [
 
 [[package]]
 name = "sval_ref"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be2e7fc517d778f44f8cb64140afa36010999565528d48985f55e64d45f369ce"
+checksum = "762d3fbf3c0869064b7c93808c67ad2ed0292dde9b060ac282817941d4707dff"
 dependencies = [
  "sval",
 ]
 
 [[package]]
 name = "sval_serde"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79bf66549a997ff35cd2114a27ac4b0c2843280f2cfa84b240d169ecaa0add46"
+checksum = "752d307438c6a6a3d095a2fecf6950cfb946d301a5bd6b57f047db4f6f8d97b9"
 dependencies = [
  "serde",
  "sval",
@@ -2433,9 +2705,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2444,9 +2716,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -2471,34 +2743,54 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2517,19 +2809,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2542,9 +2844,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2559,31 +2861,30 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2608,9 +2909,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2621,9 +2922,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2642,11 +2943,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -2655,14 +2956,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
  "pin-project-lite",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -2682,9 +2983,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -2692,9 +2993,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -2721,7 +3022,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2740,7 +3041,7 @@ dependencies = [
  "rand",
  "ring",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
@@ -2759,31 +3060,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typetag"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "typetag-impl"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unicode-ident"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -2803,9 +3113,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2818,6 +3128,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2826,18 +3148,18 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
 name = "value-bag"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
+checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
 dependencies = [
  "value-bag-serde1",
  "value-bag-sval2",
@@ -2845,9 +3167,9 @@ dependencies = [
 
 [[package]]
 name = "value-bag-serde1"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccacf50c5cb077a9abb723c5bcb5e0754c1a433f1e1de89edc328e2760b6328b"
+checksum = "4bb773bd36fd59c7ca6e336c94454d9c66386416734817927ac93d81cb3c5b0b"
 dependencies = [
  "erased-serde",
  "serde",
@@ -2856,9 +3178,9 @@ dependencies = [
 
 [[package]]
 name = "value-bag-sval2"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1785bae486022dfb9703915d42287dcb284c1ee37bd1080eeba78cc04721285b"
+checksum = "53a916a702cac43a88694c97657d449775667bcd14b70419441d05b7fea4a83a"
 dependencies = [
  "sval",
  "sval_buffer",
@@ -2909,14 +3231,24 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2924,36 +3256,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2961,33 +3293,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -2995,20 +3328,20 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -3019,9 +3352,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -3033,9 +3366,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3043,9 +3386,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -3078,7 +3421,7 @@ dependencies = [
  "sha2",
  "smol_str",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -3103,7 +3446,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -3139,7 +3482,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -3161,7 +3504,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -3179,7 +3522,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3194,7 +3537,7 @@ dependencies = [
  "bytes",
  "rand",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3210,7 +3553,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3233,7 +3576,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3254,7 +3597,7 @@ dependencies = [
  "nix",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3413,13 +3756,34 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -3446,7 +3810,7 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3468,6 +3832,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3486,7 +3874,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -3506,5 +3915,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/test/fledger-nodejs/Cargo.toml b/test/fledger-nodejs/Cargo.toml
index 724f34d6..05e406f9 100644
--- a/test/fledger-nodejs/Cargo.toml
+++ b/test/fledger-nodejs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fledger-node"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 authors = ["Linus Gasser <linus@gasser.blue>"]
 description = "The fledger server as a CLI using node, to test wasm"
@@ -18,9 +18,9 @@ crate-type = ["cdylib", "rlib"]
 local = []
 
 [dependencies]
-flarch = {path="../../flarch", features = ["node"], version = "0.8"}
-flmodules = {path="../../flmodules", version = "0.8"}
-flnode = {path = "../../flnode", version = "0.8"}
+flarch = {path="../../flarch", features = ["node"], version = "0.9"}
+flmodules = {path="../../flmodules", version = "0.9"}
+flnode = {path = "../../flnode", version = "0.9"}
 
 thiserror = "1"
 env_logger = "0.11"
diff --git a/test/fledger-nodejs/src/node.rs b/test/fledger-nodejs/src/node.rs
index 6047648d..8737d9e9 100644
--- a/test/fledger-nodejs/src/node.rs
+++ b/test/fledger-nodejs/src/node.rs
@@ -19,7 +19,7 @@ const VERSION_STRING: &str = "123";
 pub async fn main() {
     console_error_panic_hook::set_once();
 
-    femme::with_level(femme::LevelFilter::Debug);
+    femme::with_level(femme::LevelFilter::Info);
 
     log::info!("Starting app with version {}", VERSION_STRING);
 
diff --git a/test/signal-fledger/Cargo.lock b/test/signal-fledger/Cargo.lock
index c7c057ce..27302bf7 100644
--- a/test/signal-fledger/Cargo.lock
+++ b/test/signal-fledger/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,36 +93,37 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -143,7 +144,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -158,7 +159,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -182,7 +183,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -205,14 +206,25 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -221,24 +233,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -249,23 +261,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -315,9 +327,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 dependencies = [
  "serde",
 ]
@@ -340,11 +352,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -354,9 +372,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -372,9 +390,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -397,11 +415,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -424,19 +448,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "const-oid"
@@ -462,9 +476,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -509,9 +523,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -531,6 +545,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -545,7 +560,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -569,7 +584,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -580,14 +595,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -657,7 +672,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -674,6 +689,17 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
 [[package]]
 name = "ed25519-compact"
 version = "2.1.1"
@@ -681,7 +707,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
- "getrandom",
+ "ed25519",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -713,9 +755,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -723,9 +765,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -740,6 +782,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -761,20 +813,23 @@ name = "flarch"
 version = "0.8.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "wasm-bindgen",
@@ -786,42 +841,68 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
+name = "flcrypto"
+version = "0.8.0"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "flarch",
+ "flmacro",
+ "log",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde_with",
+ "sha2",
+ "thiserror 2.0.11",
+ "typetag",
+]
+
+[[package]]
+name = "flmacro"
 version = "0.8.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "flmodules"
 version = "0.8.0"
 dependencies = [
+ "async-recursion",
  "async-stream",
  "async-trait",
  "bimap",
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "bytes",
  "ed25519-compact",
+ "ed25519-dalek",
  "flarch",
+ "flcrypto",
+ "flmacro",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
+ "num-bigint",
  "rand",
  "reqwest",
+ "rmp-serde",
  "serde",
  "serde_derive",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "strum_macros",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "toml",
+ "typetag",
 ]
 
 [[package]]
@@ -834,7 +915,7 @@ dependencies = [
  "flarch",
  "flmodules",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
@@ -844,7 +925,7 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "toml",
 ]
@@ -866,9 +947,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -881,9 +962,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -891,15 +972,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -908,38 +989,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -973,10 +1054,22 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -989,9 +1082,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "group"
@@ -1012,15 +1105,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hex"
@@ -1048,9 +1141,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1082,9 +1175,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "humantime"
@@ -1094,9 +1187,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1113,9 +1206,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http",
@@ -1131,9 +1224,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1144,16 +1237,15 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1172,6 +1264,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1180,12 +1390,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1201,12 +1422,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1233,18 +1454,27 @@ dependencies = [
  "rand",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
  "webrtc-util",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1263,16 +1493,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1284,9 +1515,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linked-hash-map"
@@ -1294,6 +1525,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1306,9 +1543,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "md-5"
@@ -1343,9 +1580,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1359,22 +1596,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1418,6 +1654,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1446,9 +1683,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1464,9 +1701,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1476,9 +1713,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1494,9 +1731,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1527,6 +1764,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1552,31 +1795,11 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1608,9 +1831,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1638,18 +1861,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -1658,46 +1881,50 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.15",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1729,14 +1956,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -1748,18 +1975,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1769,9 +1996,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1780,15 +2007,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -1818,6 +2045,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-util",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -1846,13 +2074,35 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rtcp"
 version = "0.11.0"
@@ -1860,7 +2110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1874,7 +2124,7 @@ dependencies = [
  "portable-atomic",
  "rand",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1886,9 +2136,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -1910,9 +2160,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -1937,36 +2187,44 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -1979,19 +2237,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2006,7 +2258,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand",
  "substring",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2030,7 +2282,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2039,9 +2291,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2049,15 +2301,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2075,20 +2327,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -2098,9 +2350,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2119,15 +2371,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2137,14 +2389,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2196,7 +2448,7 @@ dependencies = [
  "flmodules",
  "flnode",
  "log",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -2236,9 +2488,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2260,12 +2512,31 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "stun"
 version = "0.6.0"
@@ -2279,7 +2550,7 @@ dependencies = [
  "rand",
  "ring",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2313,9 +2584,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2324,9 +2595,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -2351,34 +2622,54 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2397,19 +2688,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2422,9 +2723,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2439,31 +2740,30 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2488,9 +2788,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2501,9 +2801,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2522,11 +2822,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -2535,14 +2835,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
  "pin-project-lite",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -2562,9 +2862,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -2572,9 +2872,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -2601,7 +2901,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2620,12 +2920,18 @@ dependencies = [
  "rand",
  "ring",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -2633,31 +2939,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typetag"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "typetag-impl"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unicode-ident"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -2677,9 +2992,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2692,6 +3007,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2700,11 +3027,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2747,14 +3074,24 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2762,36 +3099,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2799,33 +3136,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -2833,20 +3171,20 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -2857,9 +3195,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -2871,9 +3209,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2881,9 +3229,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -2916,7 +3264,7 @@ dependencies = [
  "sha2",
  "smol_str",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -2941,7 +3289,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -2977,7 +3325,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -2999,7 +3347,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -3017,7 +3365,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3032,7 +3380,7 @@ dependencies = [
  "bytes",
  "rand",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3048,7 +3396,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3071,7 +3419,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3092,7 +3440,7 @@ dependencies = [
  "nix",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3251,13 +3599,34 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -3284,7 +3653,7 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3306,6 +3675,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3324,7 +3717,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -3344,5 +3758,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/test/signal-fledger/Cargo.toml b/test/signal-fledger/Cargo.toml
index 870ac364..607b4f9e 100644
--- a/test/signal-fledger/Cargo.toml
+++ b/test/signal-fledger/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 edition = "2021"
 name = "signal-node"
-version = "0.8.0"
+version = "0.9.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-flarch = {path = "../../flarch", version = "0.8"}
-flmodules = {path = "../../flmodules", version = "0.8"}
-flnode = {path = "../../flnode", version = "0.8"}
+flarch = {path = "../../flarch", version = "0.9"}
+flmodules = {path = "../../flmodules", version = "0.9"}
+flnode = {path = "../../flnode", version = "0.9"}
 
 env_logger = "0.11"
 log = "0.4"
diff --git a/test/signal-fledger/src/main.rs b/test/signal-fledger/src/main.rs
index 394722ac..3e8b8c2c 100644
--- a/test/signal-fledger/src/main.rs
+++ b/test/signal-fledger/src/main.rs
@@ -7,7 +7,7 @@ use flarch::{
         connection::ConnectionConfig, web_socket_server::WebSocketServer, websocket::WSSError,
     },
 };
-use flmodules::network::{network_broker_start, signal::SignalServer, NetworkSetupError};
+use flmodules::network::{network_start, signal::SignalServer, NetworkSetupError};
 use flnode::node::{Node, NodeError};
 use thiserror::Error;
 
@@ -29,21 +29,25 @@ async fn main() -> Result<(), TestError> {
 
     let wss = WebSocketServer::new(8765).await?;
     let mut signal_server = SignalServer::new(wss, 2).await?;
-    let (msgs_signal, _) = signal_server.get_tap_sync().await?;
+    let (msgs_signal, _) = signal_server.get_tap_out_sync().await?;
     log::info!("Started listening on port 8765");
 
-    let mut node1 = create_node().await?;
+    let node1 = create_node().await?;
     log::info!("Node1: {}", node1.node_config.info.get_id());
-    let mut node2 = create_node().await?;
+    let node2 = create_node().await?;
     log::info!("Node2: {}", node2.node_config.info.get_id());
 
     for i in 0..5 {
         log::info!("Running step {i}");
-        node1.process().await?;
-        log::info!("Node 1: {:?}", node1.ping.as_ref().unwrap().storage.stats);
+        log::info!(
+            "Node 1: {:?}",
+            node1.ping.as_ref().unwrap().storage.borrow().stats
+        );
 
-        node2.process().await?;
-        log::info!("Node 2: {:?}", node2.ping.as_ref().unwrap().storage.stats);
+        log::info!(
+            "Node 2: {:?}",
+            node2.ping.as_ref().unwrap().storage.borrow().stats
+        );
 
         for msg in msgs_signal.try_iter() {
             log::debug!("Signal: {msg:?}");
@@ -57,9 +61,11 @@ async fn main() -> Result<(), TestError> {
         .as_ref()
         .unwrap()
         .storage
+        .borrow()
         .stats
         .get(&node2.node_config.info.get_id())
-        .unwrap();
+        .unwrap()
+        .clone();
     assert_eq!(1, ping1.tx);
     assert_eq!(1, ping1.rx);
 
@@ -68,9 +74,11 @@ async fn main() -> Result<(), TestError> {
         .as_ref()
         .unwrap()
         .storage
+        .borrow()
         .stats
         .get(&node1.node_config.info.get_id())
-        .unwrap();
+        .unwrap()
+        .clone();
     assert_eq!(1, ping2.tx);
     assert_eq!(1, ping2.rx);
 
@@ -81,13 +89,13 @@ async fn main() -> Result<(), TestError> {
 
 async fn create_node() -> Result<Node, TestError> {
     let storage = DataStorageTemp::new();
-    let node_config = Node::get_config(storage.clone())?;
-    let network = network_broker_start(
+    let node_config = Node::get_config(storage.clone_box())?;
+    let network = network_start(
         node_config.clone(),
         ConnectionConfig::from_signal("ws://localhost:8765"),
     )
     .await?;
-    Node::start(Box::new(storage), node_config, network)
+    Node::start(Box::new(storage), node_config, network.broker)
         .await
         .map_err(|e| e.into())
 }
diff --git a/test/webrtc-libc-wasm/Makefile b/test/webrtc-libc-wasm/Makefile
index abdfe7a6..342a953f 100644
--- a/test/webrtc-libc-wasm/Makefile
+++ b/test/webrtc-libc-wasm/Makefile
@@ -1,5 +1,5 @@
 all: kill build run
-PKILL = @ps aux | grep "$1" | grep -v grep | awk '{print $$2}' | xargs -r kill
+PKILL = @/bin/ps aux | grep "$1" | egrep -v "(grep|vscode|rust-analyzer)" | awk '{print $$2}' | xargs -r kill
 
 run:
 	$(MAKE) libc &
diff --git a/test/webrtc-libc-wasm/libc/Cargo.lock b/test/webrtc-libc-wasm/libc/Cargo.lock
index 651358aa..33fa1ef9 100644
--- a/test/webrtc-libc-wasm/libc/Cargo.lock
+++ b/test/webrtc-libc-wasm/libc/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,36 +93,37 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -143,7 +144,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -158,7 +159,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -182,7 +183,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -205,14 +206,25 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -221,24 +233,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -249,23 +261,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -315,9 +327,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 dependencies = [
  "serde",
 ]
@@ -340,11 +352,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -354,9 +372,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -372,9 +390,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -397,11 +415,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -424,19 +448,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "const-oid"
@@ -462,9 +476,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -509,9 +523,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -531,6 +545,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -545,7 +560,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -569,7 +584,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -580,14 +595,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -657,7 +672,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -674,6 +689,17 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
 [[package]]
 name = "ed25519-compact"
 version = "2.1.1"
@@ -681,7 +707,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
- "getrandom",
+ "ed25519",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -713,9 +755,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -723,9 +765,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -740,6 +782,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -761,20 +813,23 @@ name = "flarch"
 version = "0.8.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "wasm-bindgen",
@@ -786,42 +841,68 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
+name = "flcrypto"
+version = "0.8.0"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "flarch",
+ "flmacro",
+ "log",
+ "rand",
+ "rmp-serde",
+ "serde",
+ "serde_with",
+ "sha2",
+ "thiserror 2.0.11",
+ "typetag",
+]
+
+[[package]]
+name = "flmacro"
 version = "0.8.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "flmodules"
 version = "0.8.0"
 dependencies = [
+ "async-recursion",
  "async-stream",
  "async-trait",
  "bimap",
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "bytes",
  "ed25519-compact",
+ "ed25519-dalek",
  "flarch",
+ "flcrypto",
+ "flmacro",
  "futures",
- "getrandom",
+ "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
+ "num-bigint",
  "rand",
  "reqwest",
+ "rmp-serde",
  "serde",
  "serde_derive",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "strum_macros",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "toml",
+ "typetag",
 ]
 
 [[package]]
@@ -841,9 +922,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -856,9 +937,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -866,15 +947,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -883,38 +964,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -948,10 +1029,22 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -964,9 +1057,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "group"
@@ -987,15 +1080,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hex"
@@ -1023,9 +1116,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1057,9 +1150,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "humantime"
@@ -1069,9 +1162,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1088,9 +1181,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http",
@@ -1106,9 +1199,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1119,16 +1212,15 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1147,6 +1239,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1155,12 +1365,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1176,12 +1397,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1208,18 +1429,27 @@ dependencies = [
  "rand",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
  "webrtc-util",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1238,16 +1468,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1259,9 +1490,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linked-hash-map"
@@ -1269,6 +1500,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1281,9 +1518,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "md-5"
@@ -1318,9 +1555,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1334,22 +1571,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1393,6 +1629,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1421,9 +1658,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1439,9 +1676,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1451,9 +1688,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1469,9 +1706,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1502,6 +1739,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1527,31 +1770,11 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1583,9 +1806,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1613,18 +1836,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -1633,46 +1856,50 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.15",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1704,14 +1931,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -1723,18 +1950,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1744,9 +1971,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1755,15 +1982,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -1793,6 +2020,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-util",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -1821,13 +2049,35 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rtcp"
 version = "0.11.0"
@@ -1835,7 +2085,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1849,7 +2099,7 @@ dependencies = [
  "portable-atomic",
  "rand",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1861,9 +2111,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -1885,9 +2135,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -1912,36 +2162,44 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -1954,19 +2212,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -1981,7 +2233,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand",
  "substring",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2005,7 +2257,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2014,9 +2266,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2024,15 +2276,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2050,20 +2302,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -2073,9 +2325,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2094,15 +2346,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2112,14 +2364,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2198,9 +2450,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2222,12 +2474,31 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "stun"
 version = "0.6.0"
@@ -2241,7 +2512,7 @@ dependencies = [
  "rand",
  "ring",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2275,9 +2546,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2286,9 +2557,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -2313,34 +2584,54 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2359,19 +2650,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2384,9 +2685,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2401,31 +2702,30 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2450,9 +2750,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2463,9 +2763,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2484,11 +2784,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -2497,14 +2797,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
  "pin-project-lite",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -2524,9 +2824,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -2534,9 +2834,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -2563,7 +2863,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2582,12 +2882,18 @@ dependencies = [
  "rand",
  "ring",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -2595,31 +2901,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typetag"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "typetag-impl"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unicode-ident"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -2639,9 +2954,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2654,6 +2969,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2662,11 +2989,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2709,14 +3036,24 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2724,36 +3061,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2761,33 +3098,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -2795,20 +3133,20 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -2819,9 +3157,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -2833,9 +3171,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2843,9 +3191,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -2878,7 +3226,7 @@ dependencies = [
  "sha2",
  "smol_str",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -2903,7 +3251,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -2939,7 +3287,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -2961,7 +3309,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -2979,7 +3327,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -2994,7 +3342,7 @@ dependencies = [
  "bytes",
  "rand",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3010,7 +3358,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3033,7 +3381,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3045,7 +3393,7 @@ dependencies = [
  "flarch",
  "flmodules",
  "log",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
 ]
@@ -3066,7 +3414,7 @@ dependencies = [
  "nix",
  "portable-atomic",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3225,13 +3573,34 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -3258,7 +3627,7 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3280,6 +3649,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3298,7 +3691,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -3318,5 +3732,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/test/webrtc-libc-wasm/libc/Cargo.toml b/test/webrtc-libc-wasm/libc/Cargo.toml
index 46f58ee9..0f67dcf1 100644
--- a/test/webrtc-libc-wasm/libc/Cargo.toml
+++ b/test/webrtc-libc-wasm/libc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webrtc-test-libc"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 authors = ["Linus Gasser <linus@gasser.blue>"]
 description = "Test connection-setup for libc"
@@ -11,8 +11,8 @@ readme = "README.md"
 keywords = ["test", "libc", "webrtc", "websocket", "fledger"]
 
 [dependencies]
-flmodules = {path="../../../flmodules", version = "0.8"}
-flarch = {path="../../../flarch", version = "0.8"}
+flmodules = {path="../../../flmodules", version = "0.9"}
+flarch = {path="../../../flarch", version = "0.9"}
 
 log = "0.4"
 thiserror = "1"
diff --git a/test/webrtc-libc-wasm/libc/src/main.rs b/test/webrtc-libc-wasm/libc/src/main.rs
index ac183239..13cb8e18 100644
--- a/test/webrtc-libc-wasm/libc/src/main.rs
+++ b/test/webrtc-libc-wasm/libc/src/main.rs
@@ -1,18 +1,18 @@
 use thiserror::Error;
 
 use flarch::{
-    broker::{Broker, BrokerError},
+    broker::BrokerError,
     nodeids::U256,
     start_logging_filter,
     web_rtc::{connection::ConnectionConfig, web_socket_server::WebSocketServer},
 };
-use flmodules::nodeconfig::NodeConfig;
 use flmodules::network::{
-    messages::{NetworkIn, NetworkOut, NetworkMessage},
-    network_broker_start,
+    broker::{BrokerNetwork, NetworkIn, NetworkOut},
+    network_start,
     signal::SignalServer,
     NetworkSetupError,
 };
+use flmodules::nodeconfig::NodeConfig;
 
 const URL: &str = "ws://127.0.0.1:8765";
 
@@ -34,12 +34,12 @@ async fn main() -> Result<(), MainError> {
     let (nc, mut broker) = spawn_node().await?;
     log::info!("Starting node: {} / {}", nc.info.name, nc.info.get_id());
 
-    let (mut tap, _) = broker.get_tap().await.expect("Failed to get tap");
+    let (mut tap, _) = broker.get_tap_out().await.expect("Failed to get tap");
     let mut msgs_rcv = 0;
 
     loop {
         let msg = tap.recv().await.expect("expected message");
-        if let NetworkMessage::Output(NetworkOut::MessageFromNode(id, msg_net)) = msg {
+        if let NetworkOut::MessageFromNode(id, msg_net) = msg {
             log::info!("Got message from other node: {}", msg_net);
             if msgs_rcv == 0 {
                 msgs_rcv += 1;
@@ -61,24 +61,21 @@ async fn start_signal_server() {
         .expect("Failed to start signalling server");
 }
 
-async fn spawn_node() -> Result<(NodeConfig, Broker<NetworkMessage>), MainError> {
+async fn spawn_node() -> Result<(NodeConfig, BrokerNetwork), MainError> {
     let nc = NodeConfig::new();
 
     log::info!("Starting node {}: {}", nc.info.get_id(), nc.info.name);
     log::debug!("Connecting to websocket at {URL}");
-    let net = network_broker_start(nc.clone(), ConnectionConfig::from_signal(URL))
+    let net = network_start(nc.clone(), ConnectionConfig::from_signal(URL))
         .await
         .expect("Starting node failed");
 
-    Ok((nc, net))
+    Ok((nc, net.broker))
 }
 
-async fn send(src: &mut Broker<NetworkMessage>, id: U256, msg: &str) {
-    src.emit_msg(NetworkMessage::Input(NetworkIn::MessageToNode(
-        id,
-        msg.into(),
-    )))
-    .expect("Sending to node");
+async fn send(src: &mut BrokerNetwork, id: U256, msg: &str) {
+    src.emit_msg_in(NetworkIn::MessageToNode(id, msg.into()))
+        .expect("Sending to node");
 }
 
 #[cfg(test)]
@@ -99,8 +96,8 @@ mod tests {
         let (nc1, mut broker1) = spawn_node().await?;
         log::debug!("Starting node 2");
         let (nc2, mut broker2) = spawn_node().await?;
-        let (tap2, _) = broker2.get_tap_sync().await.expect("Failed to get tap");
-        let (tap1, _) = broker1.get_tap_sync().await.expect("Failed to get tap");
+        let (tap2, _) = broker2.get_tap_out_sync().await.expect("Failed to get tap");
+        let (tap1, _) = broker1.get_tap_out_sync().await.expect("Failed to get tap");
         wait_ms(1000).await;
         for _ in 1..=2 {
             log::debug!("Sending first message");
@@ -113,9 +110,9 @@ mod tests {
         Ok(())
     }
 
-    async fn wait_msg(tap: &Receiver<NetworkMessage>, msg: &str) {
+    async fn wait_msg(tap: &Receiver<NetworkOut>, msg: &str) {
         for msg_net in tap {
-            if let NetworkMessage::Output(NetworkOut::MessageFromNode(_, nm)) = &msg_net {
+            if let NetworkOut::MessageFromNode(_, nm) = &msg_net {
                 if nm == msg {
                     break;
                 }
diff --git a/test/webrtc-libc-wasm/wasm/Cargo.lock b/test/webrtc-libc-wasm/wasm/Cargo.lock
index 5600f6d1..177c245b 100644
--- a/test/webrtc-libc-wasm/wasm/Cargo.lock
+++ b/test/webrtc-libc-wasm/wasm/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -93,36 +93,37 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -143,7 +144,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -158,7 +159,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -182,7 +183,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "synstructure 0.13.1",
 ]
 
@@ -205,14 +206,25 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -221,24 +233,24 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -249,23 +261,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -315,9 +327,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 dependencies = [
  "serde",
 ]
@@ -340,11 +352,17 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "btparse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387e80962b798815a2b5c4bcfdb6bf626fa922ffe9f74e373103b858738e9f31"
+
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -354,9 +372,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -372,9 +390,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "shlex",
 ]
@@ -397,11 +415,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -424,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "console_error_panic_hook"
@@ -462,9 +486,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -509,9 +533,9 @@ dependencies = [
 
 [[package]]
 name = "ct-codecs"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "026ac6ceace6298d2c557ef5ed798894962296469ec7842288ea64674201a2d1"
+checksum = "b916ba8ce9e4182696896f015e8a5ae6081b305f74690baa8465e35f5a142ea4"
 
 [[package]]
 name = "ctr"
@@ -531,6 +555,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
+ "digest",
  "fiat-crypto",
  "rustc_version",
  "subtle",
@@ -545,7 +570,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -569,7 +594,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -580,14 +605,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
 
 [[package]]
 name = "der"
@@ -657,7 +682,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -674,6 +699,17 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "serde",
+ "signature",
+]
+
 [[package]]
 name = "ed25519-compact"
 version = "2.1.1"
@@ -681,9 +717,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
 dependencies = [
  "ct-codecs",
+ "ed25519",
  "getrandom 0.2.15",
 ]
 
+[[package]]
+name = "ed25519-dalek"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "rand_core 0.6.4",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -713,9 +765,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -723,9 +775,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -740,6 +792,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -758,23 +820,26 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "flarch"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "async-trait",
+ "btparse",
+ "bytes",
  "chrono",
  "env_logger",
- "flarch_macro",
+ "flmacro",
  "futures",
  "js-sys",
  "log",
  "rand 0.8.5",
+ "rmp-serde",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "wasm-bindgen",
@@ -786,47 +851,74 @@ dependencies = [
 ]
 
 [[package]]
-name = "flarch_macro"
-version = "0.8.0"
+name = "flcrypto"
+version = "0.9.0"
+dependencies = [
+ "bytes",
+ "ed25519-dalek",
+ "flarch",
+ "flmacro",
+ "log",
+ "rand 0.8.5",
+ "rmp-serde",
+ "serde",
+ "serde_with",
+ "sha2",
+ "thiserror 2.0.11",
+ "typetag",
+]
+
+[[package]]
+name = "flmacro"
+version = "0.9.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "flmodules"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
+ "async-recursion",
  "async-stream",
  "async-trait",
  "bimap",
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
+ "btparse",
  "bytes",
  "ed25519-compact",
+ "ed25519-dalek",
  "flarch",
+ "flcrypto",
+ "flmacro",
  "futures",
  "getrandom 0.2.15",
  "itertools",
  "log",
  "names",
+ "num-bigint",
  "rand 0.8.5",
  "reqwest",
+ "rmp-serde",
  "serde",
  "serde_derive",
  "serde_json",
  "serde_with",
  "serde_yaml",
  "sha2",
- "thiserror",
+ "strum_macros",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "toml",
+ "typetag",
 ]
 
 [[package]]
 name = "fltest-wasm"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "async-trait",
  "console_error_panic_hook",
@@ -839,7 +931,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-logger",
@@ -863,9 +955,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -878,9 +970,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -888,15 +980,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -905,38 +997,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -987,6 +1079,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -999,9 +1103,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "group"
@@ -1022,15 +1126,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hex"
@@ -1058,9 +1162,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1092,9 +1196,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "humantime"
@@ -1104,9 +1208,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1123,9 +1227,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http",
@@ -1141,9 +1245,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1154,16 +1258,15 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1182,6 +1285,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1190,12 +1411,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1211,12 +1443,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1243,18 +1475,27 @@ dependencies = [
  "rand 0.8.5",
  "rtcp",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
  "webrtc-util",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54b12ebb6799019b044deaf431eadfe23245b259bba5a2c0796acec3943a3cdb"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1273,16 +1514,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1294,9 +1536,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linked-hash-map"
@@ -1304,6 +1546,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1316,9 +1564,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "md-5"
@@ -1353,9 +1601,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "minicov"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
  "cc",
  "walkdir",
@@ -1369,20 +1617,19 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
@@ -1428,6 +1675,7 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1456,9 +1704,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1474,9 +1722,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "opaque-debug"
@@ -1486,9 +1734,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "p256"
@@ -1504,9 +1752,9 @@ dependencies = [
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -1537,6 +1785,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1562,31 +1816,11 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1618,9 +1852,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -1648,18 +1882,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -1668,46 +1902,50 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom 0.2.15",
  "rand 0.8.5",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.11",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1785,9 +2023,9 @@ dependencies = [
 
 [[package]]
 name = "rcgen"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
 dependencies = [
  "pem",
  "ring",
@@ -1799,18 +2037,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1820,9 +2058,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1831,15 +2069,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -1869,6 +2107,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-util",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -1904,6 +2143,28 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rtcp"
 version = "0.11.0"
@@ -1911,7 +2172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1925,7 +2186,7 @@ dependencies = [
  "portable-atomic",
  "rand 0.8.5",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -1937,9 +2198,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc_version"
@@ -1961,9 +2222,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
 dependencies = [
  "once_cell",
  "ring",
@@ -1988,36 +2249,44 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "same-file"
@@ -2030,19 +2299,13 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2057,7 +2320,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand 0.8.5",
  "substring",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2081,7 +2344,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2090,9 +2353,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2100,15 +2363,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -2126,20 +2389,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -2149,9 +2412,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2170,15 +2433,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2188,14 +2451,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2274,9 +2537,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2298,12 +2561,31 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "stun"
 version = "0.6.0"
@@ -2317,7 +2599,7 @@ dependencies = [
  "rand 0.8.5",
  "ring",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2351,9 +2633,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2362,9 +2644,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -2389,34 +2671,54 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2435,19 +2737,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2460,9 +2772,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2477,31 +2789,30 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2526,9 +2837,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2539,9 +2850,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2560,11 +2871,11 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.1",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -2573,14 +2884,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
  "pin-project-lite",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -2600,9 +2911,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -2610,9 +2921,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -2639,7 +2950,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2658,12 +2969,18 @@ dependencies = [
  "rand 0.8.5",
  "ring",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -2671,31 +2988,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typetag"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "044fc3365ddd307c297fe0fe7b2e70588cdab4d0f62dc52055ca0d11b174cf0e"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "typetag-impl"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "d9d30226ac9cbd2d1ff775f74e8febdab985dab14fb14aa2582c29a92d5555dc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unicode-ident"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -2715,9 +3041,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2730,6 +3056,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2738,11 +3076,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2791,14 +3129,24 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2806,36 +3154,36 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2843,33 +3191,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
+checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
 dependencies = [
- "console_error_panic_hook",
  "js-sys",
  "minicov",
- "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test-macro",
@@ -2877,13 +3226,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.43"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
+checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2899,9 +3248,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -2912,9 +3261,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf"
+checksum = "c7ed9d8b15c7fb594d72bfb4b5a276f3d2029333cd93a932f376f5937f6f80ee"
 dependencies = [
  "futures",
  "js-sys",
@@ -2926,9 +3275,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2936,9 +3295,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -2971,7 +3330,7 @@ dependencies = [
  "sha2",
  "smol_str",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -2996,7 +3355,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -3032,7 +3391,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -3054,7 +3413,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -3072,7 +3431,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3087,7 +3446,7 @@ dependencies = [
  "bytes",
  "rand 0.8.5",
  "rtp",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3103,7 +3462,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand 0.8.5",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3126,7 +3485,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3147,7 +3506,7 @@ dependencies = [
  "nix",
  "portable-atomic",
  "rand 0.8.5",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3306,13 +3665,34 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -3339,7 +3719,7 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -3361,6 +3741,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3379,7 +3783,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -3399,5 +3824,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
diff --git a/test/webrtc-libc-wasm/wasm/Cargo.toml b/test/webrtc-libc-wasm/wasm/Cargo.toml
index bf800ac4..8a0141e9 100644
--- a/test/webrtc-libc-wasm/wasm/Cargo.toml
+++ b/test/webrtc-libc-wasm/wasm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fltest-wasm"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 authors = ["Linus Gasser <linus@gasser.blue>"]
 description = "Test connection-setup for wasm"
@@ -14,8 +14,8 @@ keywords = ["test", "libc", "webrtc", "websocket", "fledger"]
 crate-type = ["cdylib"]
 
 [dependencies]
-flarch = {path="../../../flarch", features=["node"], version = "0.8"}
-flmodules = {path="../../../flmodules", version = "0.8"}
+flarch = {path="../../../flarch", features=["node"], version = "0.9"}
+flmodules = {path="../../../flmodules", version = "0.9"}
 
 wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
 js-sys = "0.3"
diff --git a/test/webrtc-libc-wasm/wasm/src/lib.rs b/test/webrtc-libc-wasm/wasm/src/lib.rs
index 753e9720..c64c0557 100644
--- a/test/webrtc-libc-wasm/wasm/src/lib.rs
+++ b/test/webrtc-libc-wasm/wasm/src/lib.rs
@@ -3,12 +3,16 @@ use std::sync::mpsc::RecvError;
 use thiserror::Error;
 use wasm_bindgen::prelude::*;
 
-use flarch::{broker::{Destination, BrokerError}, tasks::wait_ms, web_rtc::connection::ConnectionConfig};
-use flmodules::nodeconfig::{NodeConfig, NodeInfo};
+use flarch::{
+    broker::{BrokerError, Destination},
+    tasks::wait_ms,
+    web_rtc::connection::ConnectionConfig,
+};
 use flmodules::network::{
-    messages::{NetworkIn, NetworkOut, NetworkError, NetworkMessage},
-    network_broker_start, NetworkSetupError,
+    broker::{NetworkError, NetworkIn, NetworkOut},
+    network_start, NetworkSetupError,
 };
+use flmodules::nodeconfig::{NodeConfig, NodeInfo};
 
 const URL: &str = "ws://127.0.0.1:8765";
 
@@ -28,8 +32,10 @@ async fn run_app() -> Result<(), StartError> {
     log::info!("Starting app");
 
     let nc = NodeConfig::new();
-    let mut net = network_broker_start(nc.clone(), ConnectionConfig::from_signal(URL)).await?;
-    let (rx, tap_indx) = net.get_tap_sync().await?;
+    let mut net = network_start(nc.clone(), ConnectionConfig::from_signal(URL))
+        .await?
+        .broker;
+    let (rx, tap_indx) = net.get_tap_out_sync().await?;
     let mut i: i32 = 0;
     loop {
         i += 1;
@@ -38,36 +44,34 @@ async fn run_app() -> Result<(), StartError> {
             log::info!("Waiting - {}", i / 10);
         }
         while let Ok(msg) = rx.try_recv() {
-            if let NetworkMessage::Output(reply) = msg {
-                match reply {
-                    NetworkOut::MessageFromNode(id, msg_net) => {
-                        log::info!("Got node message: {} / {:?}", id, msg_net);
-                        net.remove_subsystem(tap_indx).await?;
-                        return Ok(());
-                    }
-                    NetworkOut::NodeListFromWS(list) => {
-                        let other: Vec<NodeInfo> = list
-                            .iter()
-                            .filter(|n| n.get_id() != nc.info.get_id())
-                            .cloned()
-                            .collect();
-                        log::info!("Got list: {:?}", other);
-                        if other.len() > 0 {
-                            net.emit_msg_dest(
-                                Destination::NoTap,
-                                NetworkIn::MessageToNode(
-                                    other.get(0).unwrap().get_id(),
-                                    "Hello from Rust wasm".to_string(),
-                                )
-                                .into(),
-                            )?;
-                        }
+            match msg {
+                NetworkOut::MessageFromNode(id, msg_net) => {
+                    log::info!("Got node message: {} / {:?}", id, msg_net);
+                    net.remove_subsystem(tap_indx).await?;
+                    return Ok(());
+                }
+                NetworkOut::NodeListFromWS(list) => {
+                    let other: Vec<NodeInfo> = list
+                        .iter()
+                        .filter(|n| n.get_id() != nc.info.get_id())
+                        .cloned()
+                        .collect();
+                    log::info!("Got list: {:?}", other);
+                    if other.len() > 0 {
+                        net.emit_msg_in_dest(
+                            Destination::NoTap,
+                            NetworkIn::MessageToNode(
+                                other.get(0).unwrap().get_id(),
+                                "Hello from Rust wasm".to_string(),
+                            )
+                            .into(),
+                        )?;
                     }
-                    _ => log::debug!("Got other message: {:?}", reply),
                 }
+                _ => log::debug!("Got other message: {:?}", msg),
             }
         }
-        net.emit_msg(NetworkMessage::Input(NetworkIn::WSUpdateListRequest))?;
+        net.emit_msg_in(NetworkIn::WSUpdateListRequest)?;
         wait_ms(1000).await;
     }
 }