feat(pubky): use resolve_endpoint from pkarr

Cargo.toml

@@ -16,6 +16,3 @@ serde = { version = "^1.0.209", features = ["derive"] }
 [profile.release]
 lto = true
 opt-level = 'z'
-
-[patch.crates-io]
-hyper-util = { git = "https://github.com/hyperium/hyper-util.git" }

pubky/pkg/test/http.js

@@ -6,10 +6,20 @@ const TLD = '8pinxxgqs41n4aididenw5apqp1urfmzdztr8jt4abrkdn435ewo';
 
 // TODO: test HTTPs too somehow.
 
-test.skip("basic fetch", async (t) => {
+test("basic fetch", async (t) => {
   let client = PubkyClient.testnet();
 
-  let response = await client.fetch(`http://${TLD}/`, new Uint8Array([]));
+  // Normal TLD
+  {
+
+    let response = await client.fetch(`http://relay.pkarr.org/`);
+
+    t.equal(response.status, 200);
+  }
+
+
+  // Pubky
+  let response = await client.fetch(`http://${TLD}/`);
 
   t.equal(response.status, 200);
 })

pubky/src/native.rs

@@ -8,7 +8,7 @@ use crate::PubkyClient;
 mod api;
 mod internals;
 
-use internals::resolver::PkarrResolver;
+use internals::PkarrResolver;
 
 static DEFAULT_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"),);
 
@@ -55,7 +55,7 @@ impl PubkyClientBuilder {
         // TODO: convert to Result<PubkyClient>
 
         let pkarr = pkarr::Client::new(self.pkarr_settings).unwrap();
-        let dns_resolver: PkarrResolver = pkarr.clone().into();
+        let dns_resolver: PkarrResolver = (&pkarr).into();
 
         PubkyClient {
             http: reqwest::Client::builder()

pubky/src/native/api/http.rs

@@ -28,7 +28,7 @@ mod tests {
     use crate::*;
 
     #[tokio::test]
-    async fn http_get() {
+    async fn http_get_pubky() {
         let testnet = Testnet::new(10);
 
         let homeserver = Homeserver::start_test(&testnet).await.unwrap();
@@ -45,4 +45,21 @@ mod tests {
 
         assert_eq!(response.status(), 200)
     }
+
+    #[tokio::test]
+    async fn http_get_icann() {
+        let testnet = Testnet::new(10);
+
+        let client = PubkyClient::builder().testnet(&testnet).build();
+
+        let url = format!("http://example.com/");
+
+        let response = client
+            .request(Default::default(), url)
+            .send()
+            .await
+            .unwrap();
+
+        assert_eq!(response.status(), 200);
+    }
 }

pubky/src/native/api.rs → pubky/src/native/api/mod.rs

@@ -1,5 +1,3 @@
-//! Public API modules
-
 pub mod http;
 pub mod recovery_file;
 

pubky/src/native/internals.rs

@@ -3,13 +3,43 @@ use url::Url;
 
 use crate::PubkyClient;
 
-mod endpoints;
-pub mod resolver;
+use std::net::ToSocketAddrs;
+
+use pkarr::{Client, EndpointResolver, PublicKey};
+use reqwest::dns::{Addrs, Resolve};
+
+pub struct PkarrResolver(Client);
+
+impl Resolve for PkarrResolver {
+    fn resolve(&self, name: reqwest::dns::Name) -> reqwest::dns::Resolving {
+        let client = self.0.clone();
+
+        Box::pin(async move {
+            let name = name.as_str();
+
+            if PublicKey::try_from(name).is_ok() {
+                let endpoint = client.resolve_endpoint(name).await?;
+
+                let addrs: Addrs = Box::new(endpoint.to_socket_addrs().into_iter());
+                return Ok(addrs);
+            };
+
+            Ok(Box::new(format!("{name}:0").to_socket_addrs().unwrap()))
+        })
+    }
+}
+
+impl From<&pkarr::Client> for PkarrResolver {
+    fn from(pkarr: &pkarr::Client) -> Self {
+        PkarrResolver(pkarr.clone())
+    }
+}
 
 impl PubkyClient {
     // === HTTP ===
 
-    pub(crate) fn inner_request(&self, method: reqwest::Method, url: Url) -> RequestBuilder {
+    /// A wrapper around [reqwest::Client::request], with the same signature between native and wasm.
+    pub(crate) async fn inner_request(&self, method: reqwest::Method, url: Url) -> RequestBuilder {
         self.http.request(method, url)
     }
 }