feat: allow fetch to be initialized with user-provided client

modules/llrt_http/src/fetch.rs

@@ -1,10 +1,15 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+use std::convert::Infallible;
 use std::{collections::HashSet, time::Instant};
 
 use bytes::Bytes;
+use http_body_util::combinators::BoxBody;
 use http_body_util::Full;
 use hyper::{header::HeaderName, Method, Request, Uri};
+use hyper_rustls::HttpsConnector;
+use hyper_util::client::legacy::connect::{Connect, HttpConnector};
+use hyper_util::client::legacy::Client;
 use llrt_abort::AbortSignal;
 use llrt_utils::{
     bytes::ObjectBytes, encoding::bytes_from_b64, mc_oneshot, result::ResultExt, VERSION,
@@ -23,13 +28,18 @@ use super::{
 
 const MAX_REDIRECT_COUNT: u32 = 20;
 
-pub(crate) fn init(ctx: &Ctx<'_>, globals: &Object) -> Result<()> {
-    //init eagerly
-    let client = HTTP_CLIENT.as_ref().or_throw(ctx)?;
-
+pub(crate) fn init<C>(
+    client: Client<C, BoxBody<Bytes, Infallible>>,
+    ctx: &Ctx<'_>,
+    globals: &Object,
+) -> Result<()>
+where
+    C: Clone + Send + Sync + Connect + 'static,
+{
     globals.set(
         "fetch",
         Func::from(Async(move |ctx, resource, args| {
+            let client = client.clone();
             let start = Instant::now();
             let options = get_fetch_options(&ctx, resource, args);
 
@@ -162,7 +172,7 @@ fn build_request(
     body: Option<&BodyBytes>,
     prev_status: &u16,
     initial_uri: &Uri,
-) -> Result<Request<Full<Bytes>>> {
+) -> Result<Request<BoxBody<Bytes, Infallible>>> {
     let same_origin = is_same_origin(uri, initial_uri);
 
     let change_method = should_change_method(*prev_status, method);
@@ -200,8 +210,10 @@ fn build_request(
         req = req.header("accept", "*/*");
     }
 
-    req.body(body.map(|b| b.body.clone()).unwrap_or_default())
-        .or_throw(ctx)
+    req.body(BoxBody::new(
+        body.map(|b| b.body.clone()).unwrap_or_default(),
+    ))
+    .or_throw(ctx)
 }
 
 fn is_same_origin(uri: &Uri, initial_uri: &Uri) -> bool {

modules/llrt_http/src/lib.rs

@@ -1,8 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 use std::{io, sync::OnceLock, time::Duration};
+use std::convert::Infallible;
 
 use bytes::Bytes;
+use http_body_util::combinators::BoxBody;
 use http_body_util::Full;
 use hyper_rustls::HttpsConnector;
 use hyper_util::{
@@ -16,6 +18,7 @@ use rustls::{
     crypto::ring, pki_types::CertificateDer, ClientConfig, RootCertStore, SupportedProtocolVersion,
 };
 use webpki_roots::TLS_SERVER_ROOTS;
+use llrt_utils::result::ResultExt;
 
 pub use self::security::{get_allow_list, get_deny_list, set_allow_list, set_deny_list};
 use self::{file::File, headers::Headers, request::Request, response::Response};
@@ -146,7 +149,8 @@ pub static HTTP_CLIENT: Lazy<io::Result<Client<HttpsConnector<HttpConnector>, Fu
 pub fn init(ctx: &Ctx) -> Result<()> {
     let globals = ctx.globals();
 
-    fetch::init(ctx, &globals)?;
+    //init eagerly
+    fetch::init(HTTP_CLIENT.as_ref().or_throw(&ctx)?.clone(), ctx, &globals)?;
 
     Class::<Request>::define(&globals)?;
     Class::<Response>::define(&globals)?;