remove unnecessary crate

Author: nabetti1720

Cargo.lock

@@ -12,7 +12,6 @@ name = "llrt_dns_cache"
 path = "src/lib.rs"
 
 [dependencies]
-dns-lookup = "2"
 hyper = { version = "1", features = ["client"] }
 hyper-rustls = { version = "0.27", default-features = false, features = [
   "webpki-roots",

libs/llrt_dns_cache/Cargo.toml

@@ -5,6 +5,7 @@ use std::{
     io,
     net::{Ipv4Addr, Ipv6Addr, SocketAddr},
     pin::Pin,
+    result::Result as StdResult,
     str::FromStr,
     sync::Arc,
     task::{self, Poll},
@@ -15,7 +16,7 @@ use std::{
 use hyper_util::client::legacy::connect::{dns::Name, HttpConnector};
 use llrt_utils::object::ObjectExt;
 use quick_cache::sync::Cache;
-use rquickjs::{Ctx, Exception, Result, Value};
+use rquickjs::Value;
 use tokio::sync::Semaphore;
 use tower_service::Service;
 
@@ -143,56 +144,51 @@ impl CachedDnsResolver {
     }
 }
 
-pub fn lookup_host<'js>(
-    ctx: &Ctx<'js>,
+pub async fn lookup_host(
     hostname: &str,
-    options: Option<Value<'js>>,
-) -> Result<(String, i32)> {
+    options: Option<Value<'_>>,
+) -> StdResult<(String, i32), std::io::Error> {
     let mut family = 0;
     if let Some(options) = options {
         family = if let Some(v) = options.as_int() {
             if !matches!(v, 4 | 6) {
-                Err(Exception::throw_message(
-                    ctx,
-                    "If options is an integer, then it must be 4 or 6",
-                ))?;
+                return Err(io::Error::new::<String>(
+                    io::ErrorKind::InvalidInput,
+                    "If options is an integer, then it must be 4 or 6".into(),
+                ));
             }
             v
         } else if let Ok(Some(v)) = options.get_optional::<_, i32>("family") {
             if !matches!(v, 4 | 6 | 0) {
-                Err(Exception::throw_message(
-                    ctx,
-                    "If family record is exist, then it must be 4, 6, or 0",
-                ))?;
+                return Err(io::Error::new::<String>(
+                    io::ErrorKind::InvalidInput,
+                    "If family record is exist, then it must be 4, 6, or 0".into(),
+                ));
             }
             v
         } else {
             0
         }
     }
 
-    match dns_lookup::lookup_host(hostname) {
-        Ok(ips) => {
-            for ip in ips {
-                if matches!(family, 4 | 0) {
-                    if let Ok(ipv4) = Ipv4Addr::from_str(&ip.to_string()) {
-                        return Ok((ipv4.to_string(), 4));
-                    }
-                }
-                if matches!(family, 6 | 0) {
-                    if let Ok(ipv6) = Ipv6Addr::from_str(&ip.to_string()) {
-                        return Ok((ipv6.to_string(), 6));
-                    }
-                }
+    let addrs = tokio::net::lookup_host((hostname, 0)).await?;
+    let addrs = addrs.collect::<Vec<_>>();
+
+    for ip in addrs {
+        if matches!(family, 4 | 0) {
+            if let Ok(ipv4) = Ipv4Addr::from_str(&ip.to_string()) {
+                return Ok((ipv4.to_string(), 4));
             }
-        },
-        Err(err) => {
-            Err(Exception::throw_message(ctx, &err.to_string()))?;
-        },
+        }
+        if matches!(family, 6 | 0) {
+            if let Ok(ipv6) = Ipv6Addr::from_str(&ip.to_string()) {
+                return Ok((ipv6.to_string(), 6));
+            }
+        }
     }
 
-    Err(Exception::throw_message(
-        ctx,
-        "No values ware found matching the criteria",
-    ))?
+    Err(io::Error::new::<String>(
+        io::ErrorKind::NotFound,
+        "No values ware found matching the criteria".into(),
+    ))
 }

libs/llrt_dns_cache/src/lib.rs

@@ -1,5 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+use llrt_context::CtxExtension;
 use llrt_dns_cache::lookup_host;
 use llrt_utils::{
     module::{export_default, ModuleInfo},
@@ -18,16 +19,22 @@ fn lookup<'js>(ctx: Ctx<'js>, hostname: String, args: Rest<Value<'js>>) -> Resul
         .and_then(|v| v.into_function())
         .or_throw_msg(&ctx, "Callback parameter is not a function")?;
 
-    match lookup_host(&ctx, &hostname, args_iter.next()) {
-        Ok((address, family)) => {
-            () = cb.call((Null.into_js(&ctx), address, family))?;
-            Ok::<_, Error>(())
-        },
-        Err(err) => {
-            () = cb.call((Exception::from_message(ctx, &err.to_string()),))?;
-            Ok(())
-        },
-    }
+    ctx.clone().spawn_exit(async move {
+        match lookup_host(&hostname, args_iter.next())
+            .await
+            .or_throw(&ctx)
+        {
+            Ok((address, family)) => {
+                () = cb.call((Null.into_js(&ctx), address, family))?;
+                Ok::<_, Error>(())
+            },
+            Err(err) => {
+                () = cb.call((Exception::from_message(ctx, &err.to_string()),))?;
+                Ok(())
+            },
+        }
+    })?;
+    Ok(())
 }
 
 pub struct DnsModule;