upgrade and re-export mainline, and remove unnecessary methods in wasm

.github/workflows/wasm.yaml

@@ -18,6 +18,12 @@ jobs:
       with:
         targets: wasm32-unknown-unknown
 
+    - name: Workaround for spurious network errors in curl
+      run: |
+        if rustc +stable --version --verbose | grep -q '^release: 1\.7[01]\.'; then
+          echo CARGO_HTTP_MULTIPLEXING=false >> $GITHUB_ENV
+        fi
+
     - name: Install wasm-pack
       run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 
@@ -38,4 +44,3 @@ jobs:
 
         # Kill the server
         kill $SERVER_PID
-

pkarr/Cargo.toml

@@ -44,7 +44,7 @@ getrandom = { version = "0.2.15", default-features = false }
 tracing = { version = "0.1.41", optional = true }
 
 # feat: dht dependencies
-mainline = { version = "5.2.1", optional = true }
+mainline = { version = "5.3.1", optional = true }
 
 # feat: relay dependencies
 reqwest = { version = "0.12.12", default-features = false, features = ["rustls-tls"], optional = true }
@@ -80,7 +80,7 @@ rstest = "0.24.0"
 pkarr-relay = { path = "../relay" }
 clap = { version = "4.5.29", features = ["derive"] }
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
-mainline = "5.2.1"
+mainline = "5.3.1"
 tokio-rustls = "0.26.1"
 axum = "0.8.1"
 axum-server = { version = "0.7.1", features = ["tls-rustls-no-provider"] }

pkarr/src/client.rs

@@ -156,8 +156,9 @@ impl Client {
     /// then start authoring the new [SignedPacket] based on the most recent as in the following example:
     ///
     ///```rust
-    /// use mainline::Testnet;
     /// use pkarr::{Client, SignedPacket, Keypair};
+    /// // For local testing
+    /// use pkarr::mainline::Testnet;
     ///
     /// #[tokio::main]
     /// async fn run() -> anyhow::Result<()> {

pkarr/src/client/blocking.rs

@@ -47,8 +47,9 @@ impl ClientBlocking {
     /// then start authoring the new [SignedPacket] based on the most recent as in the following example:
     ///
     ///```rust
-    /// use mainline::Testnet;
     /// use pkarr::{Client, SignedPacket, Keypair};
+    /// // For local testing
+    /// use pkarr::mainline::Testnet;
     ///
     /// fn run() -> anyhow::Result<()> {
     ///     let testnet = Testnet::new(3)?;

pkarr/src/client/relays.rs

@@ -109,6 +109,7 @@ impl RelaysClient {
             .expect("infallible")
     }
 
+    #[cfg(not(wasm_browser))]
     /// Cancel an inflight publish request.
     pub fn cancel_publish(&self, public_key: &PublicKey) {
         self.inflight_publish.cancel_request(public_key);
@@ -213,6 +214,7 @@ impl InflightPublishRequests {
         Ok(())
     }
 
+    #[cfg(not(wasm_browser))]
     pub fn cancel_request(&self, public_key: &PublicKey) {
         let mut inflight = self
             .requests

pkarr/src/extra/endpoints/mod.rs

@@ -125,6 +125,7 @@ impl std::fmt::Display for CouldNotResolveEndpoint {
 mod tests {
 
     use crate::dns::rdata::SVCB;
+    use crate::mainline::Testnet;
     use crate::{Client, Keypair};
     use crate::{PublicKey, SignedPacket};
 
@@ -134,8 +135,6 @@ mod tests {
     use std::str::FromStr;
     use std::time::Duration;
 
-    use mainline::Testnet;
-
     fn generate_subtree(
         client: Client,
         depth: u8,

pkarr/src/extra/reqwest.rs

@@ -88,7 +88,7 @@ mod reqwest_builder {
 
         #[tokio::test]
         async fn reqwest_pkarr_domain() {
-            use mainline::Testnet;
+            use crate::mainline::Testnet;
             use std::net::TcpListener;
             use std::sync::Arc;
             use std::time::Duration;

pkarr/src/lib.rs

@@ -40,6 +40,8 @@ pub use keys::{Keypair, PublicKey};
 pub use signed_packet::{SignedPacket, SignedPacketBuilder};
 
 // Rexports
+#[cfg(dht)]
+pub use mainline;
 #[cfg(feature = "signed_packet")]
 pub use pubky_timestamp::Timestamp;
 #[cfg(feature = "signed_packet")]

relay/Cargo.toml

@@ -31,7 +31,7 @@ clap = { version = "4.5.28", features = ["derive"] }
 dirs-next = "2.0.0"
 httpdate = "1.0.3"
 url = "2.5.4"
-mainline = "5.1.0"
+mainline = "5.3.1"
 pkarr = { version = "3.3.1", default-features = false, features = ["dht", "lmdb-cache"] }
 
 [package.metadata.docs.rs]