diff --git a/Cargo.lock b/Cargo.lock
index b464bb3..0a48c3b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -88,16 +88,6 @@ dependencies = [
"generic-array",
]
-[[package]]
-name = "aead"
-version = "0.6.0-rc.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b657e772794c6b04730ea897b66a058ccd866c16d1967da05eeeecec39043fe"
-dependencies = [
- "crypto-common 0.2.1",
- "inout 0.2.2",
-]
-
[[package]]
name = "aes"
version = "0.8.4"
@@ -105,58 +95,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
dependencies = [
"cfg-if",
- "cipher 0.4.4",
+ "cipher",
"cpufeatures 0.2.17",
]
-[[package]]
-name = "aes"
-version = "0.9.0-rc.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04097e08a47d9ad181c2e1f4a5fabc9ae06ce8839a333ba9a949bcb0d31fd2a3"
-dependencies = [
- "cipher 0.5.1",
- "cpubits",
- "cpufeatures 0.2.17",
- "zeroize",
-]
-
[[package]]
name = "aes-gcm"
version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
dependencies = [
- "aead 0.5.2",
- "aes 0.8.4",
- "cipher 0.4.4",
- "ctr 0.9.2",
- "ghash 0.5.1",
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
"subtle",
]
-[[package]]
-name = "aes-gcm"
-version = "0.11.0-rc.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22c0c90bbe8d4f77c3ca9ddabe41a1f8382d6fc1f7cea89459d0f320371f972"
-dependencies = [
- "aead 0.6.0-rc.10",
- "aes 0.9.0-rc.4",
- "cipher 0.5.1",
- "ctr 0.10.0-rc.4",
- "ghash 0.6.0",
- "subtle",
- "zeroize",
-]
-
[[package]]
name = "aes-kw"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c"
dependencies = [
- "aes 0.8.4",
+ "aes",
]
[[package]]
@@ -417,19 +380,6 @@ dependencies = [
"libloading 0.8.9",
]
-[[package]]
-name = "async-compat"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ba85bc55464dcbf728b56d97e119d673f4cf9062be330a9a26f3acf504a590"
-dependencies = [
- "futures-core",
- "futures-io",
- "once_cell",
- "pin-project-lite",
- "tokio",
-]
-
[[package]]
name = "async-compression"
version = "0.4.41"
@@ -580,7 +530,7 @@ dependencies = [
"p256",
"p384",
"rand 0.8.5",
- "reqwest 0.12.28",
+ "reqwest",
"serde",
"serde_json",
"sha2 0.10.9",
@@ -590,18 +540,6 @@ dependencies = [
"url",
]
-[[package]]
-name = "attohttpc"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e2cdb6d5ed835199484bb92bb8b3edd526effe995c61732580439c1a67e2e9"
-dependencies = [
- "base64 0.22.1",
- "http 1.4.0",
- "log",
- "url",
-]
-
[[package]]
name = "autocfg"
version = "1.5.0"
@@ -663,9 +601,9 @@ dependencies = [
[[package]]
name = "aws-lc-sys"
-version = "0.39.0"
+version = "0.39.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa7e52a4c5c547c741610a2c6f123f3881e409b714cd27e6798ef020c514f0a"
+checksum = "83a25cf98105baa966497416dbd42565ce3a8cf8dbfd59803ec9ad46f3126399"
dependencies = [
"cc",
"cmake",
@@ -763,12 +701,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
-[[package]]
-name = "base16ct"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd307490d624467aa6f74b0eabb77633d1f758a7b25f12bceb0b22e08d9726f6"
-
[[package]]
name = "base256emoji"
version = "1.0.2"
@@ -883,7 +815,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"shlex",
"syn 2.0.117",
]
@@ -944,16 +876,16 @@ dependencies = [
[[package]]
name = "blake3"
-version = "1.8.3"
+version = "1.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d"
+checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e"
dependencies = [
"arrayref",
"arrayvec",
"cc",
"cfg-if",
"constant_time_eq",
- "cpufeatures 0.2.17",
+ "cpufeatures 0.3.0",
]
[[package]]
@@ -977,17 +909,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96eb4cdd6cf1b31d671e9efe75c5d1ec614776856cefbe109ca373554a6d514f"
dependencies = [
- "hybrid-array 0.4.8",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
-dependencies = [
- "hybrid-array 0.4.8",
- "zeroize",
+ "hybrid-array 0.4.9",
]
[[package]]
@@ -1249,7 +1171,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
dependencies = [
- "cipher 0.4.4",
+ "cipher",
]
[[package]]
@@ -1327,32 +1249,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
dependencies = [
"cfg-if",
- "cipher 0.4.4",
+ "cipher",
"cpufeatures 0.2.17",
]
-[[package]]
-name = "chacha20"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
-dependencies = [
- "cfg-if",
- "cipher 0.5.1",
- "cpufeatures 0.3.0",
- "zeroize",
-]
-
[[package]]
name = "chacha20poly1305"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
dependencies = [
- "aead 0.5.2",
- "chacha20 0.9.1",
- "cipher 0.4.4",
- "poly1305 0.8.0",
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
"zeroize",
]
@@ -1427,19 +1337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
dependencies = [
"crypto-common 0.1.7",
- "inout 0.1.4",
- "zeroize",
-]
-
-[[package]]
-name = "cipher"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e34d8227fe1ba289043aeb13792056ff80fd6de1a9f49137a5f499de8e8c78ea"
-dependencies = [
- "block-buffer 0.12.0",
- "crypto-common 0.2.1",
- "inout 0.2.2",
+ "inout",
"zeroize",
]
@@ -1512,12 +1410,6 @@ dependencies = [
"cc",
]
-[[package]]
-name = "cmov"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0758edba32d61d1fd9f4d69491b47604b91ee2f7e6b33de7e54ca4ebe55dc3"
-
[[package]]
name = "cobs"
version = "0.3.0"
@@ -1768,12 +1660,6 @@ dependencies = [
"libm",
]
-[[package]]
-name = "cpubits"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef0c543070d296ea414df2dd7625d1b24866ce206709d8a4a424f28377f5861"
-
[[package]]
name = "cpufeatures"
version = "0.2.17"
@@ -1912,7 +1798,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710"
dependencies = [
- "hybrid-array 0.4.8",
+ "hybrid-array 0.4.9",
]
[[package]]
@@ -1945,25 +1831,7 @@ version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
dependencies = [
- "cipher 0.4.4",
-]
-
-[[package]]
-name = "ctr"
-version = "0.10.0-rc.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fee683dd898fbd052617b4514bc31f98bc32081a83b69ec46adef3b1ef4ae36f"
-dependencies = [
- "cipher 0.5.1",
-]
-
-[[package]]
-name = "ctutils"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1005a6d4446f5120ef475ad3d2af2b30c49c2c9c6904258e3bb30219bebed5e4"
-dependencies = [
- "cmov",
+ "cipher",
]
[[package]]
@@ -1981,6 +1849,7 @@ dependencies = [
"cfg-if",
"cpufeatures 0.2.17",
"curve25519-dalek-derive",
+ "digest 0.10.7",
"fiat-crypto 0.2.9",
"rustc_version",
"subtle",
@@ -2219,15 +2088,6 @@ dependencies = [
"unicode-xid",
]
-[[package]]
-name = "des"
-version = "0.9.0-rc.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3214053e68a813b9c06ef61075c844f3a1cdeb307d8998ea8555c063caa52fa9"
-dependencies = [
- "cipher 0.5.1",
-]
-
[[package]]
name = "diatomic-waker"
version = "0.2.3"
@@ -2416,12 +2276,6 @@ dependencies = [
"wio",
]
-[[package]]
-name = "dyn-clone"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
-
[[package]]
name = "ecdsa"
version = "0.16.9"
@@ -2436,6 +2290,16 @@ dependencies = [
"spki 0.7.3",
]
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8 0.10.2",
+ "signature 2.2.0",
+]
+
[[package]]
name = "ed25519"
version = "3.0.0-rc.4"
@@ -2447,6 +2311,20 @@ dependencies = [
"signature 3.0.0-rc.10",
]
+[[package]]
+name = "ed25519-dalek"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
+dependencies = [
+ "curve25519-dalek 4.1.3",
+ "ed25519 2.2.3",
+ "serde",
+ "sha2 0.10.9",
+ "subtle",
+ "zeroize",
+]
+
[[package]]
name = "ed25519-dalek"
version = "3.0.0-pre.1"
@@ -2454,7 +2332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad207ed88a133091f83224265eac21109930db09bedcad05d5252f2af2de20a1"
dependencies = [
"curve25519-dalek 5.0.0-pre.1",
- "ed25519",
+ "ed25519 3.0.0-rc.4",
"rand_core 0.9.5",
"serde",
"sha2 0.11.0-rc.2",
@@ -2475,7 +2353,7 @@ version = "0.13.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
dependencies = [
- "base16ct 0.2.0",
+ "base16ct",
"base64ct",
"crypto-bigint",
"digest 0.10.7",
@@ -2486,7 +2364,7 @@ dependencies = [
"pem-rfc7468 0.7.0",
"pkcs8 0.10.2",
"rand_core 0.6.4",
- "sec1 0.7.3",
+ "sec1",
"serde_json",
"serdect",
"subtle",
@@ -3264,16 +3142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
dependencies = [
"opaque-debug",
- "polyval 0.6.2",
-]
-
-[[package]]
-name = "ghash"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eecf2d5dc9b66b732b97707a0210906b1d30523eb773193ab777c0c84b3e8d5"
-dependencies = [
- "polyval 0.7.1",
+ "polyval",
]
[[package]]
@@ -4281,15 +4150,6 @@ dependencies = [
"digest 0.10.7",
]
-[[package]]
-name = "home"
-version = "0.5.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
-dependencies = [
- "windows-sys 0.61.2",
-]
-
[[package]]
name = "html5ever"
version = "0.39.0"
@@ -4393,12 +4253,11 @@ dependencies = [
[[package]]
name = "hybrid-array"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8655f91cd07f2b9d0c24137bd650fe69617773435ee5ec83022377777ce65ef1"
+checksum = "1a79f2aff40c18ab8615ddc5caa9eb5b96314aef18fe5823090f204ad988e813"
dependencies = [
"typenum",
- "zeroize",
]
[[package]]
@@ -4577,7 +4436,7 @@ dependencies = [
"icu_properties 1.5.1",
"icu_provider 1.5.0",
"icu_provider_adapters",
- "icu_segmenter",
+ "icu_segmenter 1.5.0",
"icu_timezone",
"tinystr 0.7.6",
"unicode-bidi",
@@ -4761,6 +4620,21 @@ version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52b1a7fbdbf3958f1be8354cb59ac73f165b7b7082d447ff2090355c9a069120"
+[[package]]
+name = "icu_locale"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60"
+dependencies = [
+ "icu_collections 2.1.1",
+ "icu_locale_core",
+ "icu_locale_data",
+ "icu_provider 2.1.1",
+ "potential_utf",
+ "tinystr 0.8.2",
+ "zerovec 0.11.5",
+]
+
[[package]]
name = "icu_locale_core"
version = "2.1.1"
@@ -4769,11 +4643,18 @@ checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
dependencies = [
"displaydoc",
"litemap 0.8.1",
+ "serde",
"tinystr 0.8.2",
"writeable 0.6.2",
"zerovec 0.11.5",
]
+[[package]]
+name = "icu_locale_data"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c5f1d16b4c3a2642d3a719f18f6b06070ab0aef246a6418130c955ae08aa831"
+
[[package]]
name = "icu_locid"
version = "1.5.0"
@@ -4951,6 +4832,8 @@ checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
dependencies = [
"displaydoc",
"icu_locale_core",
+ "serde",
+ "stable_deref_trait",
"writeable 0.6.2",
"yoke 0.8.1",
"zerofrom",
@@ -4993,17 +4876,39 @@ dependencies = [
"icu_collections 1.5.0",
"icu_locid",
"icu_provider 1.5.0",
- "icu_segmenter_data",
+ "icu_segmenter_data 1.5.1",
"utf8_iter",
"zerovec 0.10.4",
]
+[[package]]
+name = "icu_segmenter"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a807a7488f3f758629ae86d99d9d30dce24da2fb2945d74c80a4f4a62c71db73"
+dependencies = [
+ "core_maths",
+ "icu_collections 2.1.1",
+ "icu_locale",
+ "icu_provider 2.1.1",
+ "icu_segmenter_data 2.1.1",
+ "potential_utf",
+ "utf8_iter",
+ "zerovec 0.11.5",
+]
+
[[package]]
name = "icu_segmenter_data"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1e52775179941363cc594e49ce99284d13d6948928d8e72c755f55e98caa1eb"
+[[package]]
+name = "icu_segmenter_data"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ebbb7321d9e21d25f5660366cb6c08201d0175898a3a6f7a41ee9685af21c80"
+
[[package]]
name = "icu_timezone"
version = "1.5.0"
@@ -5063,27 +4968,6 @@ dependencies = [
"icu_properties 2.1.2",
]
-[[package]]
-name = "igd-next"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516893339c97f6011282d5825ac94fc1c7aad5cad26bdc2d0cee068c0bf97f97"
-dependencies = [
- "async-trait",
- "attohttpc",
- "bytes",
- "futures",
- "http 1.4.0",
- "http-body-util",
- "hyper 1.8.1",
- "hyper-util",
- "log",
- "rand 0.9.2",
- "tokio",
- "url",
- "xmltree",
-]
-
[[package]]
name = "image"
version = "0.25.10"
@@ -5168,15 +5052,6 @@ dependencies = [
"generic-array",
]
-[[package]]
-name = "inout"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7"
-dependencies = [
- "hybrid-array 0.4.8",
-]
-
[[package]]
name = "interpolate_name"
version = "0.2.4"
@@ -5199,7 +5074,7 @@ dependencies = [
"mio",
"postcard",
"rand 0.9.2",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde_core",
"tempfile",
"thiserror 2.0.18",
@@ -5228,9 +5103,9 @@ checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
[[package]]
name = "iri-string"
-version = "0.7.11"
+version = "0.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8e7418f59cc01c88316161279a7f665217ae316b388e58a0d10e29f54f1e5eb"
+checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20"
dependencies = [
"memchr",
"serde",
@@ -5238,46 +5113,45 @@ dependencies = [
[[package]]
name = "iroh"
-version = "0.96.1"
+version = "0.97.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5236da4d5681f317ec393c8fe2b7e3d360d31c6bb40383991d0b7429ca5ad117"
+checksum = "feb56e7e4b0ec7fba7efa6a236b016a52b5d927d50244aceb9e20566159b1a32"
dependencies = [
"backon",
"bytes",
"cfg_aliases",
"data-encoding",
"derive_more",
- "ed25519-dalek",
+ "ed25519-dalek 3.0.0-pre.1",
"futures-util",
"getrandom 0.3.4",
"hickory-resolver",
"http 1.4.0",
- "igd-next",
+ "ipnet",
"iroh-base",
"iroh-metrics",
- "iroh-quinn",
- "iroh-quinn-proto",
- "iroh-quinn-udp",
"iroh-relay",
"n0-error",
"n0-future",
"n0-watcher",
- "netdev",
"netwatch",
+ "noq",
+ "noq-proto",
+ "noq-udp",
"papaya",
"pin-project",
"pkarr",
"pkcs8 0.11.0-rc.11",
- "portmapper",
+ "portable-atomic",
"rand 0.9.2",
- "reqwest 0.12.28",
- "rustc-hash 2.1.1",
+ "reqwest",
+ "rustc-hash 2.1.2",
"rustls",
"rustls-pki-types",
"rustls-webpki",
"serde",
"smallvec",
- "strum 0.27.2",
+ "strum 0.28.0",
"swarm-discovery",
"sync_wrapper",
"time",
@@ -5292,15 +5166,15 @@ dependencies = [
[[package]]
name = "iroh-base"
-version = "0.96.1"
+version = "0.97.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20c99d836a1c99e037e98d1bf3ef209c3a4df97555a00ce9510eb78eccdf5567"
+checksum = "55a354e3396b62c14717ee807dfee9a7f43f6dad47e4ac0fd1d49f1ffad14ef0"
dependencies = [
"curve25519-dalek 5.0.0-pre.1",
"data-encoding",
"derive_more",
"digest 0.11.0-rc.10",
- "ed25519-dalek",
+ "ed25519-dalek 3.0.0-pre.1",
"n0-error",
"rand_core 0.9.5",
"serde",
@@ -5340,10 +5214,12 @@ dependencies = [
[[package]]
name = "iroh-persist"
-version = "0.1.5"
-source = "git+https://github.com/webbeef/iroh-persist.git?branch=iroh-0.96#67839547424ae4ea527e85f8851a1410b2f948ad"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "222e4c81746dd5d98bb3de94233a37014e53714ef72149c6a0b68f08475a9901"
dependencies = [
"dirs",
+ "ed25519-dalek 2.2.0",
"iroh",
"n0-error",
"rand 0.9.2",
@@ -5353,71 +5229,11 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "iroh-quinn"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034ed21f34c657a123d39525d948c885aacba59508805e4dd67d71f022e7151b"
-dependencies = [
- "bytes",
- "cfg_aliases",
- "iroh-quinn-proto",
- "iroh-quinn-udp",
- "pin-project-lite",
- "rustc-hash 2.1.1",
- "rustls",
- "socket2 0.6.3",
- "thiserror 2.0.18",
- "tokio",
- "tokio-stream",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "iroh-quinn-proto"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de99ad8adc878ee0e68509ad256152ce23b8bbe45f5539d04e179630aca40a9"
-dependencies = [
- "bytes",
- "derive_more",
- "enum-assoc",
- "fastbloom",
- "getrandom 0.3.4",
- "identity-hash",
- "lru-slab",
- "rand 0.9.2",
- "ring",
- "rustc-hash 2.1.1",
- "rustls",
- "rustls-pki-types",
- "slab",
- "sorted-index-buffer",
- "thiserror 2.0.18",
- "tinyvec",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "iroh-quinn-udp"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f981dadd5a072a9e0efcd24bdcc388e570073f7e51b33505ceb1ef4668c80c86"
-dependencies = [
- "cfg_aliases",
- "libc",
- "socket2 0.6.3",
- "tracing",
- "windows-sys 0.61.2",
-]
-
[[package]]
name = "iroh-relay"
-version = "0.96.1"
+version = "0.97.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd2b63e654b9dec799a73372cdc79b529ca6c7248c0c8de7da78a02e3a46f03c"
+checksum = "d786b260cadfe82ae0b6a9e372e8c78949096a06c857d1c3521355cefced0f55"
dependencies = [
"blake3",
"bytes",
@@ -5432,22 +5248,22 @@ dependencies = [
"hyper-util",
"iroh-base",
"iroh-metrics",
- "iroh-quinn",
- "iroh-quinn-proto",
"lru 0.16.3",
"n0-error",
"n0-future",
+ "noq",
+ "noq-proto",
"num_enum",
"pin-project",
"pkarr",
"postcard",
"rand 0.9.2",
- "reqwest 0.12.28",
+ "reqwest",
"rustls",
"rustls-pki-types",
"serde",
"serde_bytes",
- "strum 0.27.2",
+ "strum 0.28.0",
"tokio",
"tokio-rustls",
"tokio-util",
@@ -5643,10 +5459,12 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.91"
+version = "0.3.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
+checksum = "cc4c90f45aa2e6eacbe8645f77fdea542ac97a494bcd117a67df9ff4d611f995"
dependencies = [
+ "cfg-if",
+ "futures-util",
"once_cell",
"wasm-bindgen",
]
@@ -6467,7 +6285,7 @@ dependencies = [
"libc",
"mac-addr",
"netlink-packet-core",
- "netlink-packet-route 0.29.0",
+ "netlink-packet-route",
"netlink-sys",
"objc2-core-foundation",
"objc2-system-configuration",
@@ -6485,18 +6303,6 @@ dependencies = [
"paste",
]
-[[package]]
-name = "netlink-packet-route"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ce3636fa715e988114552619582b530481fd5ef176a1e5c1bf024077c2c9445"
-dependencies = [
- "bitflags 2.11.0",
- "libc",
- "log",
- "netlink-packet-core",
-]
-
[[package]]
name = "netlink-packet-route"
version = "0.29.0"
@@ -6538,15 +6344,14 @@ dependencies = [
[[package]]
name = "netwatch"
-version = "0.14.0"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "454b8c0759b2097581f25ed5180b4a1d14c324fde6d0734932a288e044d06232"
+checksum = "3b1b27babe89ef9f2237bc6c028bea24fa84163a1b6f8f17ff93573ebd7d861f"
dependencies = [
"atomic-waker",
"bytes",
"cfg_aliases",
"derive_more",
- "iroh-quinn-udp",
"js-sys",
"libc",
"n0-error",
@@ -6554,9 +6359,10 @@ dependencies = [
"n0-watcher",
"netdev",
"netlink-packet-core",
- "netlink-packet-route 0.28.0",
+ "netlink-packet-route",
"netlink-proto",
"netlink-sys",
+ "noq-udp",
"objc2-core-foundation",
"objc2-system-configuration",
"pin-project-lite",
@@ -6636,6 +6442,67 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
+[[package]]
+name = "noq"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df966fb44ac763bc86da97fa6c811c54ae82ef656575949f93c6dae0c9f09bf"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "noq-proto",
+ "noq-udp",
+ "pin-project-lite",
+ "rustc-hash 2.1.2",
+ "rustls",
+ "socket2 0.6.3",
+ "thiserror 2.0.18",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "noq-proto"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c61b72abd670eebc05b5cf720e077b04a3ef3354bc7bc19f1c3524cb424db7b"
+dependencies = [
+ "aes-gcm",
+ "bytes",
+ "derive_more",
+ "enum-assoc",
+ "fastbloom",
+ "getrandom 0.3.4",
+ "identity-hash",
+ "lru-slab",
+ "rand 0.9.2",
+ "ring",
+ "rustc-hash 2.1.2",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "sorted-index-buffer",
+ "thiserror 2.0.18",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "noq-udp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb9be4fedd6b98f3ba82ccd3506f4d0219fb723c3f97c67e12fe1494aa020e44"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "socket2 0.6.3",
+ "tracing",
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "ntimestamp"
version = "1.0.0"
@@ -7183,9 +7050,9 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c196e0276c471c843dd5777e7543a36a298a4be942a2a688d8111cd43390dedb"
dependencies = [
- "aead 0.5.2",
- "cipher 0.4.4",
- "ctr 0.9.2",
+ "aead",
+ "cipher",
+ "ctr",
"subtle",
]
@@ -7361,7 +7228,7 @@ version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2"
dependencies = [
- "base16ct 0.2.0",
+ "base16ct",
"ecdsa",
"elliptic-curve",
"primeorder",
@@ -7396,9 +7263,9 @@ dependencies = [
[[package]]
name = "papaya"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f"
+checksum = "997ee03cd38c01469a7046643714f0ad28880bcb9e6679ff0666e24817ca19b7"
dependencies = [
"equivalent",
"seize",
@@ -7651,29 +7518,17 @@ version = "5.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7bfb9143bbba379f246211eb68074d78db9cc048e4c5701f3b0e6cb1ec67ca2"
dependencies = [
- "async-compat",
"base32",
"bytes",
"cfg_aliases",
"document-features",
- "dyn-clone",
- "ed25519-dalek",
- "futures-buffered",
- "futures-lite",
+ "ed25519-dalek 3.0.0-pre.1",
"getrandom 0.4.2",
- "log",
- "lru 0.16.3",
"ntimestamp",
- "reqwest 0.13.2",
"self_cell",
"serde",
- "sha1_smol",
"simple-dns",
"thiserror 2.0.18",
- "tokio",
- "tracing",
- "url",
- "wasm-bindgen-futures",
]
[[package]]
@@ -7826,18 +7681,7 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
dependencies = [
"cpufeatures 0.2.17",
"opaque-debug",
- "universal-hash 0.5.1",
-]
-
-[[package]]
-name = "poly1305"
-version = "0.9.0-rc.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19feddcbdf17fad33f40041c7f9e768faf19455f32a6d52ba1b8b65ffc7b1cae"
-dependencies = [
- "cpufeatures 0.3.0",
- "universal-hash 0.6.1",
- "zeroize",
+ "universal-hash",
]
[[package]]
@@ -7849,18 +7693,7 @@ dependencies = [
"cfg-if",
"cpufeatures 0.2.17",
"opaque-debug",
- "universal-hash 0.5.1",
-]
-
-[[package]]
-name = "polyval"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfc63250416fea14f5749b90725916a6c903f599d51cb635aa7a52bfd03eede"
-dependencies = [
- "cpubits",
- "cpufeatures 0.3.0",
- "universal-hash 0.6.1",
+ "universal-hash",
]
[[package]]
@@ -7881,36 +7714,6 @@ dependencies = [
"portable-atomic",
]
-[[package]]
-name = "portmapper"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d2a8825353ace3285138da3378b1e21860d60351942f7aa3b99b13b41f80318"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "derive_more",
- "futures-lite",
- "futures-util",
- "hyper-util",
- "igd-next",
- "iroh-metrics",
- "libc",
- "n0-error",
- "netwatch",
- "num_enum",
- "rand 0.9.2",
- "serde",
- "smallvec",
- "socket2 0.6.3",
- "time",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tracing",
- "url",
-]
-
[[package]]
name = "postcard"
version = "1.1.3"
@@ -7942,6 +7745,8 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
dependencies = [
+ "serde_core",
+ "writeable 0.6.2",
"zerovec 0.11.5",
]
@@ -8158,7 +7963,7 @@ dependencies = [
"pin-project-lite",
"quinn-proto",
"quinn-udp",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"rustls",
"socket2 0.6.3",
"thiserror 2.0.18",
@@ -8173,13 +7978,12 @@ version = "0.11.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
dependencies = [
- "aws-lc-rs",
"bytes",
"getrandom 0.3.4",
"lru-slab",
"rand 0.9.2",
"ring",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"rustls",
"rustls-pki-types",
"slab",
@@ -8561,41 +8365,6 @@ dependencies = [
"webpki-roots",
]
-[[package]]
-name = "reqwest"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "futures-core",
- "http 1.4.0",
- "http-body 1.0.1",
- "http-body-util",
- "hyper 1.8.1",
- "hyper-rustls",
- "hyper-util",
- "js-sys",
- "log",
- "percent-encoding",
- "pin-project-lite",
- "quinn",
- "rustls",
- "rustls-pki-types",
- "rustls-platform-verifier",
- "sync_wrapper",
- "tokio",
- "tokio-rustls",
- "tower",
- "tower-http",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
[[package]]
name = "resolv-conf"
version = "0.7.6"
@@ -8721,9 +8490,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
[[package]]
name = "rustc_version"
@@ -8950,7 +8719,7 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
dependencies = [
- "base16ct 0.2.0",
+ "base16ct",
"der 0.7.10",
"generic-array",
"pkcs8 0.10.2",
@@ -8959,16 +8728,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "sec1"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46b9a5ab87780a3189a1d704766579517a04ad59de653b7aad7d38e8a15f7dc"
-dependencies = [
- "base16ct 1.0.0",
- "hybrid-array 0.4.8",
-]
-
[[package]]
name = "security-framework"
version = "3.7.0"
@@ -9015,7 +8774,7 @@ dependencies = [
"phf",
"phf_codegen",
"precomputed-hash",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"servo_arc",
"smallvec",
"to_shmem",
@@ -9162,7 +8921,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177"
dependencies = [
- "base16ct 0.2.0",
+ "base16ct",
"serde",
]
@@ -9189,7 +8948,7 @@ dependencies = [
"log",
"mozangle",
"parking_lot",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"rustls",
"serde",
"servo",
@@ -9246,7 +9005,7 @@ dependencies = [
"backtrace",
"libc",
"log",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"tikv-jemalloc-sys",
"tikv-jemallocator",
"windows-sys 0.61.2",
@@ -9263,7 +9022,7 @@ dependencies = [
"mach2",
"nix",
"rustc-demangle",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde_json",
"servo-background-hang-monitor-api",
"servo-base",
@@ -9341,7 +9100,7 @@ dependencies = [
"log",
"peniko",
"pollster",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"servo-base",
"servo-canvas-traits",
"servo-config",
@@ -9417,7 +9176,7 @@ dependencies = [
"petname",
"postcard",
"rand 0.9.2",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde",
"serde_json",
"servo-background-hang-monitor",
@@ -9463,7 +9222,7 @@ dependencies = [
"ipc-channel",
"log",
"malloc_size_of_derive",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde",
"servo-base",
"servo-canvas-traits",
@@ -9507,7 +9266,7 @@ dependencies = [
"log",
"malloc_size_of_derive",
"rand 0.9.2",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde",
"serde_json",
"servo-base",
@@ -9561,7 +9320,7 @@ dependencies = [
"keyboard-types 0.8.3",
"log",
"malloc_size_of_derive",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde",
"servo-base",
"servo-config",
@@ -9606,7 +9365,7 @@ dependencies = [
"objc2-core-text",
"parking_lot",
"read-fonts",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde",
"servo-allocator",
"servo-base",
@@ -9704,7 +9463,7 @@ dependencies = [
"euclid",
"html5ever",
"icu_locid",
- "icu_segmenter",
+ "icu_segmenter 1.5.0",
"itertools 0.14.0",
"kurbo 0.12.0",
"log",
@@ -9713,7 +9472,7 @@ dependencies = [
"parking_lot",
"quickcheck",
"rayon",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"selectors",
"servo-base",
"servo-config",
@@ -9759,7 +9518,7 @@ dependencies = [
"libc",
"malloc_size_of_derive",
"parking_lot",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"selectors",
"serde",
"servo-background-hang-monitor-api",
@@ -9974,7 +9733,7 @@ dependencies = [
"ipc-channel",
"log",
"malloc_size_of_derive",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde",
"servo-config",
"servo-malloc-size-of",
@@ -10053,9 +9812,9 @@ dependencies = [
"parking_lot",
"quick_cache",
"regex",
- "reqwest 0.12.28",
+ "reqwest",
"resvg",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"rustls",
"rustls-pki-types",
"rustls-platform-verifier",
@@ -10109,7 +9868,7 @@ dependencies = [
"parking_lot",
"percent-encoding",
"rand 0.9.2",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"rustls-pki-types",
"serde",
"serde_json",
@@ -10145,7 +9904,7 @@ dependencies = [
"ipc-channel",
"log",
"rayon",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"servo-allocator",
"servo-base",
"servo-canvas-traits",
@@ -10189,7 +9948,7 @@ dependencies = [
"malloc_size_of_derive",
"parking_lot",
"raw-window-handle",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde",
"serde_bytes",
"servo-base",
@@ -10262,8 +10021,8 @@ name = "servo-script"
version = "0.0.6"
dependencies = [
"accountable-refcell",
- "aes 0.8.4",
- "aes-gcm 0.10.3",
+ "aes",
+ "aes-gcm",
"aes-kw",
"app_units",
"argon2",
@@ -10279,12 +10038,12 @@ dependencies = [
"chacha20poly1305",
"chardetng",
"chrono",
- "cipher 0.4.4",
+ "cipher",
"content-security-policy",
"cookie 0.18.1",
"crossbeam-channel",
"cssparser",
- "ctr 0.9.2",
+ "ctr",
"data-url",
"der 0.7.10",
"digest 0.10.7",
@@ -10330,8 +10089,8 @@ dependencies = [
"rand 0.9.2",
"regex",
"rsa",
- "rustc-hash 2.1.1",
- "sec1 0.7.3",
+ "rustc-hash 2.1.2",
+ "sec1",
"selectors",
"serde",
"serde_json",
@@ -10444,7 +10203,7 @@ dependencies = [
"euclid",
"keyboard-types 0.8.3",
"malloc_size_of_derive",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde",
"servo-base",
"servo-bluetooth-traits",
@@ -10479,7 +10238,7 @@ dependencies = [
"malloc_size_of_derive",
"postcard",
"rusqlite",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"sea-query",
"sea-query-rusqlite",
"serde",
@@ -10554,7 +10313,7 @@ dependencies = [
"itertools 0.14.0",
"log",
"parking_lot",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"servo-base",
"servo-canvas-traits",
"servo-paint-api",
@@ -10572,7 +10331,7 @@ dependencies = [
"arrayvec",
"euclid",
"log",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"servo-base",
"servo-config",
"servo-paint-api",
@@ -10964,45 +10723,40 @@ dependencies = [
[[package]]
name = "ssh-cipher"
-version = "0.3.0-rc.6"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1cbedb8b39b0c806c55067e26d3af78ad6ba8e787e93ecac569dbbe7b9922f"
+checksum = "caac132742f0d33c3af65bfcde7f6aa8f62f0e991d80db99149eb9d44708784f"
dependencies = [
- "aes 0.9.0-rc.4",
- "aes-gcm 0.11.0-rc.3",
- "chacha20 0.10.0",
- "cipher 0.5.1",
- "des",
- "poly1305 0.9.0-rc.6",
+ "cipher",
"ssh-encoding",
- "zeroize",
]
[[package]]
name = "ssh-encoding"
-version = "0.3.0-rc.6"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd12dc43f9e7756430151976aad33df83d3983a4fdc11f93c0778a721c707"
+checksum = "eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15"
dependencies = [
"base64ct",
- "digest 0.11.0-rc.10",
- "pem-rfc7468 1.0.0",
- "subtle",
- "zeroize",
+ "pem-rfc7468 0.7.0",
+ "sha2 0.10.9",
]
[[package]]
name = "ssh-key"
-version = "0.7.0-rc.3"
+version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7307406fcbbeb6933b5c8cc84ec0fefee80fec53ba5b88b96674c0a75495090a"
+checksum = "3b86f5297f0f04d08cabaa0f6bff7cb6aec4d9c3b49d87990d63da9d9156a8c3"
dependencies = [
- "ed25519-dalek",
- "home",
- "rand_core 0.9.5",
- "sec1 0.8.0",
- "sha2 0.11.0-rc.2",
- "signature 3.0.0-rc.10",
+ "ed25519-dalek 2.2.0",
+ "p256",
+ "p384",
+ "p521",
+ "rand_core 0.6.4",
+ "rsa",
+ "sec1",
+ "sha2 0.10.9",
+ "signature 2.2.0",
"ssh-cipher",
"ssh-encoding",
"subtle",
@@ -11091,6 +10845,9 @@ name = "strum"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd"
+dependencies = [
+ "strum_macros 0.28.0",
+]
[[package]]
name = "strum_macros"
@@ -11130,7 +10887,7 @@ dependencies = [
"derive_more",
"encoding_rs",
"euclid",
- "icu_segmenter",
+ "icu_segmenter 2.1.2",
"indexmap",
"itertools 0.14.0",
"itoa",
@@ -11146,7 +10903,7 @@ dependencies = [
"precomputed-hash",
"rayon",
"rayon-core",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"selectors",
"serde",
"servo_arc",
@@ -11697,6 +11454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
dependencies = [
"displaydoc",
+ "serde_core",
"zerovec 0.11.5",
]
@@ -11932,7 +11690,7 @@ dependencies = [
"indexmap",
"toml_datetime 1.1.0+spec-1.1.0",
"toml_parser",
- "winnow 1.0.0",
+ "winnow 1.0.1",
]
[[package]]
@@ -11941,7 +11699,7 @@ version = "1.1.0+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011"
dependencies = [
- "winnow 1.0.0",
+ "winnow 1.0.1",
]
[[package]]
@@ -12290,16 +12048,6 @@ dependencies = [
"subtle",
]
-[[package]]
-name = "universal-hash"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4987bdc12753382e0bec4a65c50738ffaabc998b9cdd1f952fb5f39b0048a96"
-dependencies = [
- "crypto-common 0.2.1",
- "ctutils",
-]
-
[[package]]
name = "unsigned-varint"
version = "0.8.0"
@@ -12638,9 +12386,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen"
-version = "0.2.114"
+version = "0.2.115"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
+checksum = "6523d69017b7633e396a89c5efab138161ed5aafcbc8d3e5c5a42ae38f50495a"
dependencies = [
"cfg-if",
"once_cell",
@@ -12651,23 +12399,19 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.64"
+version = "0.4.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
+checksum = "2d1faf851e778dfa54db7cd438b70758eba9755cb47403f3496edd7c8fc212f0"
dependencies = [
- "cfg-if",
- "futures-util",
"js-sys",
- "once_cell",
"wasm-bindgen",
- "web-sys",
]
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.114"
+version = "0.2.115"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
+checksum = "4e3a6c758eb2f701ed3d052ff5737f5bfe6614326ea7f3bbac7156192dc32e67"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -12675,9 +12419,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.114"
+version = "0.2.115"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
+checksum = "921de2737904886b52bcbb237301552d05969a6f9c40d261eb0533c8b055fedf"
dependencies = [
"bumpalo",
"proc-macro2",
@@ -12688,9 +12432,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.114"
+version = "0.2.115"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
+checksum = "a93e946af942b58934c604527337bad9ae33ba1d5c6900bbb41c2c07c2364a93"
dependencies = [
"unicode-ident",
]
@@ -12853,9 +12597,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.91"
+version = "0.3.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
+checksum = "84cde8507f4d7cfcb1185b8cb5890c494ffea65edbe1ba82cfd63661c805ed94"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -12893,7 +12637,7 @@ dependencies = [
"bytes",
"cookie 0.16.2",
"http 0.2.12",
- "icu_segmenter",
+ "icu_segmenter 1.5.0",
"log",
"serde",
"serde_derive",
@@ -12948,7 +12692,7 @@ dependencies = [
"plane-split",
"rayon",
"ron",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde",
"smallvec",
"svg_fmt",
@@ -13759,9 +13503,9 @@ checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
[[package]]
name = "winnow"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
+checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5"
dependencies = [
"memchr",
]
@@ -13896,7 +13640,7 @@ dependencies = [
"malloc_size_of_derive",
"objc",
"rayon",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde",
"smallvec",
"tracy-rs",
@@ -14071,15 +13815,6 @@ dependencies = [
"markup5ever",
]
-[[package]]
-name = "xmltree"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb"
-dependencies = [
- "xml-rs",
-]
-
[[package]]
name = "xmlwriter"
version = "0.1.0"
@@ -14170,18 +13905,18 @@ dependencies = [
[[package]]
name = "zerocopy"
-version = "0.8.47"
+version = "0.8.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.8.47"
+version = "0.8.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
dependencies = [
"proc-macro2",
"quote",
@@ -14268,6 +14003,7 @@ version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
dependencies = [
+ "serde",
"yoke 0.8.1",
"zerofrom",
"zerovec-derive 0.11.2",
diff --git a/Cargo.toml b/Cargo.toml
index 4f737d7..813b548 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -110,6 +110,8 @@ image = { version = "0.25", default-features = false, features = ["avif", "rayon
imsz = "0.4"
indexmap = { version = "2.11.4", features = ["std"] }
ipc-channel = "0.21"
+iroh = { version = "0.97", default-features = false, features = ["address-lookup-mdns"] }
+iroh-persist = "0.1.6"
itertools = "0.14"
js = { package = "mozjs", version = "=0.15.5", default-features = false, features = ["libz-sys", "intl"] }
jstraceable_derive = { package = "servo-jstraceable-derive", version = "0.0.6", path = "source/components/jstraceable_derive" }
diff --git a/crates/beaver_p2p/Cargo.toml b/crates/beaver_p2p/Cargo.toml
index e6b77e7..349edc6 100644
--- a/crates/beaver_p2p/Cargo.toml
+++ b/crates/beaver_p2p/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2024"
[dependencies]
env_logger = "0.11"
-iroh = { version = "0.96", default-features = false, features = ["address-lookup-mdns"] }
-iroh-persist = { git = "https://github.com/webbeef/iroh-persist.git", branch = "iroh-0.96" }
+iroh = { workspace = true }
+iroh-persist = { workspace = true }
log = "0.4"
n0-error = "0.1"
n0-future = "0.3"
diff --git a/crates/beaver_p2p/src/lib.rs b/crates/beaver_p2p/src/lib.rs
index f9d8a76..befccae 100644
--- a/crates/beaver_p2p/src/lib.rs
+++ b/crates/beaver_p2p/src/lib.rs
@@ -11,9 +11,11 @@ use std::sync::mpsc::Sender;
use iroh::address_lookup::UserData;
use iroh::address_lookup::mdns::MdnsAddressLookup;
-use iroh::endpoint::{ClosedStream, ConnectError, Connection, ConnectionError, WriteError};
+use iroh::endpoint::{
+ ClosedStream, ConnectError, Connection, ConnectionError, WriteError, presets,
+};
use iroh::protocol::Router;
-use iroh::{Endpoint, EndpointAddr, EndpointId, RelayMode, SecretKey};
+use iroh::{Endpoint, EndpointAddr, EndpointId, SecretKey};
use log::{error, info};
use n0_future::StreamExt;
pub use packet::PacketError;
@@ -98,7 +100,7 @@ impl PairingManager {
let state = Arc::new(Mutex::new(State::new(sender.clone())));
let user_data: UserData = name.to_owned().try_into().unwrap();
- let endpoint = Endpoint::empty_builder(RelayMode::Disabled)
+ let endpoint = Endpoint::builder(presets::N0DisableRelay)
.secret_key(secret_key)
.user_data_for_address_lookup(user_data)
.hooks(pairing_hook::PairingHook::new(Arc::clone(&state)))
@@ -107,7 +109,7 @@ impl PairingManager {
.unwrap();
let mdns = MdnsAddressLookup::builder().build(endpoint.id()).unwrap();
- endpoint.address_lookup().add(mdns.clone());
+ endpoint.address_lookup().unwrap().add(mdns.clone());
let disco_state = Arc::clone(&state);
let mdns_handle = tokio::spawn(async move {
diff --git a/crates/title.html b/crates/title.html
new file mode 100644
index 0000000..9a3b92f
--- /dev/null
+++ b/crates/title.html
@@ -0,0 +1,12 @@
+
+
+
+ CSP ============================================================================ LOOOOOONNNNNNNNNNGGGGGGG TTTTTTTTTTIIIIIIIIIIITTTTTTTLLLLLLLLLEEEEEEE
+
+
+
+
+ CSP
+
+
+
diff --git a/forkme.lock b/forkme.lock
index db0ed5c..56f7d62 100644
--- a/forkme.lock
+++ b/forkme.lock
@@ -1 +1 @@
-db719abcedab225b8853175833980f16af82c7a7
+399c8ebe312b8775517663dbecff43789918ab86
diff --git a/patches/Cargo.lock.patch b/patches/Cargo.lock.patch
index c4767cc..6dbb923 100644
--- a/patches/Cargo.lock.patch
+++ b/patches/Cargo.lock.patch
@@ -814,15 +814,15 @@
name = "servo"
version = "0.0.6"
dependencies = [
-@@ -7648,6 +8155,7 @@
+@@ -7649,6 +8156,7 @@
"rand 0.9.2",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"serde",
+ "serde_json",
"servo-background-hang-monitor",
"servo-background-hang-monitor-api",
"servo-base",
-@@ -7674,6 +8182,8 @@
+@@ -7675,6 +8183,8 @@
"servo-webxr-api",
"stylo",
"stylo_traits",
@@ -831,7 +831,7 @@
"tracing",
]
-@@ -8262,9 +8772,11 @@
+@@ -8263,9 +8773,11 @@
name = "servo-net"
version = "0.0.6"
dependencies = [
@@ -843,15 +843,15 @@
"base64 0.22.1",
"bytes",
"chrono",
-@@ -8295,6 +8807,7 @@
+@@ -8296,6 +8808,7 @@
"parking_lot",
"quick_cache",
"regex",
+ "reqwest",
"resvg",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
"rustls",
-@@ -8301,8 +8814,10 @@
+@@ -8302,8 +8815,10 @@
"rustls-pki-types",
"rustls-platform-verifier",
"serde",
@@ -862,7 +862,7 @@
"servo-devtools-traits",
"servo-embedder-traits",
"servo-hyper-serde",
-@@ -8315,6 +8830,7 @@
+@@ -8316,6 +8831,7 @@
"servo-url",
"servo_arc",
"sha2",
@@ -870,15 +870,15 @@
"time",
"tokio",
"tokio-rustls",
-@@ -8350,6 +8866,7 @@
- "rustc-hash 2.1.1",
+@@ -8351,6 +8867,7 @@
+ "rustc-hash 2.1.2",
"rustls-pki-types",
"serde",
+ "serde_json",
"servo-base",
"servo-config",
"servo-embedder-traits",
-@@ -8360,8 +8877,10 @@
+@@ -8361,8 +8878,10 @@
"servo-profile-traits",
"servo-url",
"servo_arc",
@@ -889,7 +889,7 @@
"url",
"uuid",
"webrender_api",
-@@ -8920,6 +9439,7 @@
+@@ -8921,6 +9440,7 @@
"bpaf",
"cc",
"cfg-if",
@@ -897,7 +897,7 @@
"crossbeam-channel",
"dirs",
"dpi",
-@@ -8934,6 +9454,7 @@
+@@ -8935,6 +9455,7 @@
"headers 0.4.1",
"hilog",
"hitrace",
@@ -905,7 +905,7 @@
"image",
"ipc-channel",
"jni 0.21.1",
-@@ -8954,11 +9475,13 @@
+@@ -8955,11 +9476,13 @@
"ohos-window-manager-sys",
"raw-window-handle",
"rustls",
@@ -919,7 +919,7 @@
"sig",
"surfman",
"tokio",
-@@ -9524,6 +10047,9 @@
+@@ -9525,6 +10048,9 @@
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
@@ -929,7 +929,7 @@
[[package]]
name = "synstructure"
-@@ -9558,6 +10084,27 @@
+@@ -9559,6 +10085,27 @@
]
[[package]]
@@ -957,7 +957,7 @@
name = "system-deps"
version = "6.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -9596,6 +10143,12 @@
+@@ -9597,6 +10144,12 @@
]
[[package]]
@@ -970,7 +970,7 @@
name = "tar"
version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -9903,6 +10456,16 @@
+@@ -9904,6 +10457,16 @@
]
[[package]]
@@ -987,7 +987,7 @@
name = "tokio-rustls"
version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -10024,11 +10587,30 @@
+@@ -10025,11 +10588,30 @@
"futures-util",
"pin-project-lite",
"sync_wrapper",
@@ -1018,7 +1018,7 @@
name = "tower-layer"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -10307,6 +10889,12 @@
+@@ -10308,6 +10890,12 @@
]
[[package]]
@@ -1031,7 +1031,7 @@
name = "untrusted"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -10326,6 +10914,12 @@
+@@ -10327,6 +10915,12 @@
]
[[package]]
@@ -1044,7 +1044,7 @@
name = "urlpattern"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -11094,6 +11688,12 @@
+@@ -11095,6 +11689,12 @@
]
[[package]]
@@ -1057,7 +1057,7 @@
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -11315,6 +11915,17 @@
+@@ -11316,6 +11916,17 @@
]
[[package]]
@@ -1075,7 +1075,7 @@
name = "windows-result"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -11380,6 +11991,15 @@
+@@ -11381,6 +11992,15 @@
[[package]]
name = "windows-sys"
@@ -1091,7 +1091,7 @@
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-@@ -11431,6 +12051,21 @@
+@@ -11432,6 +12052,21 @@
[[package]]
name = "windows-targets"
@@ -1113,7 +1113,7 @@
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-@@ -11488,6 +12123,12 @@
+@@ -11489,6 +12124,12 @@
[[package]]
name = "windows_aarch64_gnullvm"
@@ -1126,7 +1126,7 @@
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-@@ -11506,6 +12147,12 @@
+@@ -11507,6 +12148,12 @@
[[package]]
name = "windows_aarch64_msvc"
@@ -1139,7 +1139,7 @@
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-@@ -11524,6 +12171,12 @@
+@@ -11525,6 +12172,12 @@
[[package]]
name = "windows_i686_gnu"
@@ -1152,7 +1152,7 @@
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-@@ -11554,6 +12207,12 @@
+@@ -11555,6 +12208,12 @@
[[package]]
name = "windows_i686_msvc"
@@ -1165,7 +1165,7 @@
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-@@ -11572,6 +12231,12 @@
+@@ -11573,6 +12232,12 @@
[[package]]
name = "windows_x86_64_gnu"
@@ -1178,7 +1178,7 @@
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-@@ -11590,6 +12255,12 @@
+@@ -11591,6 +12256,12 @@
[[package]]
name = "windows_x86_64_gnullvm"
@@ -1191,7 +1191,7 @@
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-@@ -11608,6 +12279,12 @@
+@@ -11609,6 +12280,12 @@
[[package]]
name = "windows_x86_64_msvc"
@@ -1204,7 +1204,7 @@
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-@@ -11680,6 +12357,16 @@
+@@ -11681,6 +12358,16 @@
]
[[package]]
diff --git a/patches/components/constellation/Cargo.toml.patch b/patches/components/constellation/Cargo.toml.patch
index e7e987d..a23690d 100644
--- a/patches/components/constellation/Cargo.toml.patch
+++ b/patches/components/constellation/Cargo.toml.patch
@@ -12,8 +12,8 @@
euclid = { workspace = true }
fonts = { workspace = true }
ipc-channel = { workspace = true }
-+iroh = "0.96"
-+iroh-persist = { git = "https://github.com/webbeef/iroh-persist.git", branch = "iroh-0.96" }
++iroh = { workspace = true }
++iroh-persist = { workspace = true }
keyboard-types = { workspace = true }
layout_api = { workspace = true }
log = { workspace = true }
diff --git a/patches/components/constellation/pairing.rs.patch b/patches/components/constellation/pairing.rs.patch
index 7f4ef4f..76dfe3f 100644
--- a/patches/components/constellation/pairing.rs.patch
+++ b/patches/components/constellation/pairing.rs.patch
@@ -15,7 +15,7 @@
+
+use beaver_p2p::{PairingManager, PeerEvent};
+use iroh::EndpointId;
-+use iroh::address_lookup::DiscoveryEvent;
++use iroh::address_lookup::mdns::DiscoveryEvent;
+use log::{debug, error, info, warn};
+use serde::{Deserialize, Serialize};
+use servo_base::generic_channel::GenericCallback;
diff --git a/patches/components/net/resource_thread.rs.patch b/patches/components/net/resource_thread.rs.patch
index 0e4dea1..26379d3 100644
--- a/patches/components/net/resource_thread.rs.patch
+++ b/patches/components/net/resource_thread.rs.patch
@@ -66,7 +66,7 @@
};
(Arc::new(http_state), Arc::new(private_http_state))
-@@ -592,17 +603,18 @@
+@@ -609,17 +620,18 @@
},
// Ignore this message as we handle it only in the reporter chan
CoreResourceMsg::CollectMemoryReport(_) => {},
diff --git a/patches/components/shared/net/lib.rs.patch b/patches/components/shared/net/lib.rs.patch
index a9a6b66..edaf596 100644
--- a/patches/components/shared/net/lib.rs.patch
+++ b/patches/components/shared/net/lib.rs.patch
@@ -26,7 +26,7 @@
}
/// A loading context, for context-specific sniffing, as defined in
-@@ -596,6 +601,64 @@
+@@ -634,6 +639,64 @@
Prefetch,
}
@@ -91,7 +91,7 @@
#[derive(Debug, Deserialize, Serialize)]
pub enum CoreResourceMsg {
Fetch(RequestBuilder, FetchChannels),
-@@ -655,6 +718,10 @@
+@@ -705,6 +768,10 @@
/// and exit
Exit(GenericOneshotSender<()>),
CollectMemoryReport(ReportsChan),