Provide DNS on WASM via dnsHttpResolver

calamity-inc · Nov 2, 2024 · 5ddde48 · 5ddde48
1 parent 19348d5
commit 5ddde48
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/soup/dnsHttpResolver.cpp b/soup/dnsHttpResolver.cpp
@@ -1,7 +1,5 @@
 #include "dnsHttpResolver.hpp"
 
-#if !SOUP_WASM
-
 #include "base64.hpp"
 #include "DelayedCtor.hpp"
 #include "HttpRequest.hpp"
@@ -12,6 +10,9 @@ NAMESPACE_SOUP
 {
 	Optional<std::vector<UniquePtr<dnsRecord>>> dnsHttpResolver::lookup(dnsType qtype, const std::string& name) const
 	{
+#if SOUP_WASM
+		SOUP_ASSERT(false, "Blocking lookup is not supported under WASM");
+#else
 		std::vector<UniquePtr<dnsRecord>> res;
 		if (checkBuiltinResult(res, qtype, name))
 		{
@@ -25,6 +26,7 @@ NAMESPACE_SOUP
 		auto hres = hr.execute(keep_alive_sched);
 
 		return parseResponse(std::move(hres->body));
+#endif
 	}
 
 	struct dnsHttpLookupTask : public dnsLookupTask
@@ -75,5 +77,3 @@ NAMESPACE_SOUP
 		return soup::make_unique<dnsHttpLookupTask>(std::move(server), qtype, name);
 	}
 }
-
-#endif
diff --git a/soup/dnsHttpResolver.hpp b/soup/dnsHttpResolver.hpp
@@ -1,8 +1,5 @@
 #pragma once
 
-#include "base.hpp"
-#if !SOUP_WASM
-
 #include "dnsRawResolver.hpp"
 
 NAMESPACE_SOUP
@@ -16,5 +13,3 @@ NAMESPACE_SOUP
 		[[nodiscard]] UniquePtr<dnsLookupTask> makeLookupTask(dnsType qtype, const std::string& name) const final;
 	};
 }
-
-#endif
diff --git a/soup/netConfig.cpp b/soup/netConfig.cpp
@@ -1,7 +1,10 @@
 #include "netConfig.hpp"
-#if !SOUP_WASM
 
+#if SOUP_WASM
+#include "dnsHttpResolver.hpp"
+#else
 #include "dnsSmartResolver.hpp"
+#endif
 #include "Socket.hpp"
 
 NAMESPACE_SOUP
@@ -17,18 +20,22 @@ NAMESPACE_SOUP
 	{
 		if (!dns_resolver)
 		{
+#if SOUP_WASM
+			dns_resolver = soup::make_unique<dnsHttpResolver>();
+#else
 			// Reasons for not defaulting to dnsOsResolver:
 			// - Android doesn't have libresolv
 			// - Many ISPs provide disingenuous DNS servers, even blocking sites like pastebin.com
 			dns_resolver = soup::make_unique<dnsSmartResolver>();
+#endif
 		}
 		return *dns_resolver;
 	}
 
 	netConfig::netConfig()
+#if !SOUP_WASM
 		: certchain_validator(&Socket::certchain_validator_default)
+#endif
 	{
 	}
 }
-
-#endif
diff --git a/soup/netConfig.hpp b/soup/netConfig.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
 #include "base.hpp"
-#if !SOUP_WASM
-
 #include "type.hpp"
 
 #include "dnsResolver.hpp"
@@ -14,14 +12,16 @@ NAMESPACE_SOUP
 	{
 		[[nodiscard]] static netConfig& get(); // returns the netConfig instance for this thread
 
+#if !SOUP_WASM
 		int connect_timeout_ms = 3000;
+#endif
 		UniquePtr<dnsResolver> dns_resolver;
+#if !SOUP_WASM
 		certchain_validator_t certchain_validator;
+#endif
 
 		[[nodiscard]] dnsResolver& getDnsResolver() SOUP_EXCAL;
 
 		netConfig();
 	};
 }
-
-#endif