Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

feat(iroh): Enable netwatch::netmon::Monitor and the metrics feature in Wasm #3206

Merged
merged 13 commits into from
Mar 4, 2025
Merged

feat(iroh): Enable netwatch::netmon::Monitor and the metrics feature in Wasm #3206

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2dc5b95
Simplify socket construction
matheus23 Feb 25, 2025
3d286fa
refactor: Extract out socket-related state into structs
matheus23 Feb 25, 2025
b694575
refactor: Move socket construction into `ActorSocketState::bind` and …
matheus23 Feb 25, 2025
d3a6c7b
refactor: Use `socket.v4` and `socket.v6` instead of `pconn` terms
matheus23 Feb 25, 2025
9be3f57
fix clippy's lints
matheus23 Feb 25, 2025
aa89003
Move `IpMappedAddrs` out of `SocketState` into `MagicSock`
matheus23 Feb 26, 2025
b671e1c
Update to newer netwatch & iroh-metrics and enable netmon in wasm
matheus23 Feb 26, 2025
67236f9
Clippy fix
matheus23 Feb 26, 2025
2df73d2
Enalbe `service` feature in `iroh-dns-server`
matheus23 Feb 26, 2025
a5cfc95
Update `iroh-metrics` to `0.32`
matheus23 Feb 26, 2025
7ba2ac8
Also update portmapper to the latest version
matheus23 Feb 26, 2025
7ce02a3
Merge remote-tracking branch 'origin/main' into matheus23/use-netwatc…
matheus23 Feb 28, 2025
170c856
Update `netwatch` to released version
matheus23 Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[target.wasm32-unknown-unknown]
runner = "wasm-bindgen-test-runner"
rustflags = ['--cfg', 'getrandom_backend="wasm_js"']
172 changes: 151 additions & 21 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)", "cfg(iroh_l

[workspace.lints.clippy]
unused-async = "warn"

[patch.crates-io]
netwatch = { git = "https://github.com/n0-computer/net-tools.git", branch = "matheus23/netwatch-wasm" }
2 changes: 1 addition & 1 deletion iroh-dns-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ governor = "0.6.3" #needs new release of tower_governor for 0.7.0
hickory-server = { version = "=0.25.0-alpha.5", features = ["dns-over-rustls", "dns-over-https-rustls"] }
http = "1.0.0"
humantime-serde = "1.1.1"
iroh-metrics = { version = "0.31.0" }
iroh-metrics = { version = "0.32.0", features = ["metrics", "service"] }
lru = "0.12.3"
n0-future = "0.1.2"
pkarr = { version = "2.3.1", features = [ "async", "relay", "dht"], default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions iroh-net-report/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ anyhow = "1"
bytes = "1.7"
derive_more = { version = "1.0.0", features = ["display"] }
iroh-base = { version = "0.33.0", path = "../iroh-base", default-features = false, features = ["relay"] }
iroh-metrics = { version = "0.31", default-features = false }
iroh-metrics = { version = "0.32", default-features = false }
iroh-relay = { version = "0.33", default-features = false, path = "../iroh-relay" }
n0-future = "0.1.2"
quinn = { package = "iroh-quinn", version = "0.13.0", default-features = false }
Expand All @@ -42,7 +42,7 @@ url = { version = "2.4" }
[target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
hickory-resolver = "=0.25.0-alpha.5"
netwatch = { version = "0.3" }
portmapper = { version = "0.3", default-features = false }
portmapper = { version = "0.4", default-features = false }
surge-ping = "0.8.0"

[dev-dependencies]
Expand Down
3 changes: 2 additions & 1 deletion iroh-relay/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ http-body-util = "0.1.0"
hyper = { version = "1", features = ["server", "client", "http1"] }
hyper-util = "0.1.1"
iroh-base = { version = "0.33.0", path = "../iroh-base", default-features = false, features = ["key", "relay"] }
iroh-metrics = { version = "0.31", default-features = false }
iroh-metrics = { version = "0.32", default-features = false }
n0-future = "0.1.2"
num_enum = "0.7"
pin-project = "1"
Expand Down Expand Up @@ -152,6 +152,7 @@ server = [
"quinn/log",
"quinn/platform-verifier",
"quinn/runtime-tokio",
"iroh-metrics/service",
]
metrics = ["iroh-metrics/metrics"]
test-utils = []
Expand Down
Loading
Loading