Skip to content

Commit 8a5e6d0

Browse files
committed
Update to newer netwatch & iroh-metrics and enable netmon in wasm
1 parent 9be3f57 commit 8a5e6d0

File tree

7 files changed

+176
-56
lines changed

7 files changed

+176
-56
lines changed

.cargo/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[target.wasm32-unknown-unknown]
22
runner = "wasm-bindgen-test-runner"
3+
rustflags = ['--cfg', 'getrandom_backend="wasm_js"']

Cargo.lock

Lines changed: 148 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,7 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)", "cfg(iroh_l
4141

4242
[workspace.lints.clippy]
4343
unused-async = "warn"
44+
45+
[patch.crates-io]
46+
netwatch = { git = "https://github.com/n0-computer/net-tools.git", branch = "matheus23/netwatch-wasm" }
47+
iroh-metrics = { git = "https://github.com/n0-computer/iroh-metrics.git", branch = "main" }

iroh-relay/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ server = [
152152
"quinn/log",
153153
"quinn/platform-verifier",
154154
"quinn/runtime-tokio",
155+
"iroh-metrics/service",
155156
]
156157
metrics = ["iroh-metrics/metrics"]
157158
test-utils = []

iroh/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ http = "1"
4343
iroh-base = { version = "0.33.0", default-features = false, features = ["key", "relay"], path = "../iroh-base" }
4444
iroh-relay = { version = "0.33", path = "../iroh-relay", default-features = false }
4545
n0-future = "0.1.2"
46+
netwatch = { version = "0.3" }
4647
pin-project = "1"
4748
pkarr = { version = "2", default-features = false, features = [
4849
"async",
@@ -102,7 +103,6 @@ parse-size = { version = "=1.0.0", optional = true } # pinned version to avoid b
102103
hickory-resolver = { version = "=0.25.0-alpha.5" }
103104
igd-next = { version = "0.15.1", features = ["aio_tokio"] }
104105
netdev = { version = "0.31.0" }
105-
netwatch = { version = "0.3" }
106106
portmapper = { version = "0.3", default-features = false }
107107
quinn = { package = "iroh-quinn", version = "0.13.0", default-features = false, features = ["platform-verifier", "runtime-tokio", "rustls-ring"] }
108108
tokio = { version = "1", features = [

0 commit comments

Comments
 (0)