Merge branch 'denoland:main' into main

1 files changed, 32 insertions, 11 deletions

diff --git a/runtime/ops/http.rs b/runtime/ops/http.rs
index cec8b0ef8..6e3157668 100644
--- a/runtime/ops/http.rs
+++ b/runtime/ops/http.rs
@@ -2,9 +2,6 @@
 
 use std::rc::Rc;
 
-use deno_core::error::bad_resource_id;
-use deno_core::error::custom_error;
-use deno_core::error::AnyError;
 use deno_core::op2;
 use deno_core::OpState;
 use deno_core::ResourceId;
@@ -16,12 +13,31 @@ pub const UNSTABLE_FEATURE_NAME: &str = "http";
 
 deno_core::extension!(deno_http_runtime, ops = [op_http_start],);
 
+#[derive(Debug, thiserror::Error)]
+pub enum HttpStartError {
+  #[error("TCP stream is currently in use")]
+  TcpStreamInUse,
+  #[error("TLS stream is currently in use")]
+  TlsStreamInUse,
+  #[error("Unix socket is currently in use")]
+  UnixSocketInUse,
+  #[error(transparent)]
+  ReuniteTcp(#[from] tokio::net::tcp::ReuniteError),
+  #[cfg(unix)]
+  #[error(transparent)]
+  ReuniteUnix(#[from] tokio::net::unix::ReuniteError),
+  #[error("{0}")]
+  Io(#[from] std::io::Error),
+  #[error(transparent)]
+  Other(deno_core::error::AnyError),
+}
+
 #[op2(fast)]
 #[smi]
 fn op_http_start(
   state: &mut OpState,
   #[smi] tcp_stream_rid: ResourceId,
-) -> Result<ResourceId, AnyError> {
+) -> Result<ResourceId, HttpStartError> {
   if let Ok(resource_rc) = state
     .resource_table
     .take::<TcpStreamResource>(tcp_stream_rid)
@@ -30,11 +46,11 @@ fn op_http_start(
     // process of starting a HTTP server on top of this TCP connection, so we just return a Busy error.
     // See also: https://github.com/denoland/deno/pull/16242
     let resource = Rc::try_unwrap(resource_rc)
-      .map_err(|_| custom_error("Busy", "TCP stream is currently in use"))?;
+      .map_err(|_| HttpStartError::TcpStreamInUse)?;
     let (read_half, write_half) = resource.into_inner();
     let tcp_stream = read_half.reunite(write_half)?;
     let addr = tcp_stream.local_addr()?;
-    return http_create_conn_resource(state, tcp_stream, addr, "http");
+    return Ok(http_create_conn_resource(state, tcp_stream, addr, "http"));
   }
 
   if let Ok(resource_rc) = state
@@ -45,11 +61,11 @@ fn op_http_start(
     // process of starting a HTTP server on top of this TLS connection, so we just return a Busy error.
     // See also: https://github.com/denoland/deno/pull/16242
     let resource = Rc::try_unwrap(resource_rc)
-      .map_err(|_| custom_error("Busy", "TLS stream is currently in use"))?;
+      .map_err(|_| HttpStartError::TlsStreamInUse)?;
     let (read_half, write_half) = resource.into_inner();
     let tls_stream = read_half.unsplit(write_half);
     let addr = tls_stream.local_addr()?;
-    return http_create_conn_resource(state, tls_stream, addr, "https");
+    return Ok(http_create_conn_resource(state, tls_stream, addr, "https"));
   }
 
   #[cfg(unix)]
@@ -61,12 +77,17 @@ fn op_http_start(
     // process of starting a HTTP server on top of this UNIX socket, so we just return a Busy error.
     // See also: https://github.com/denoland/deno/pull/16242
     let resource = Rc::try_unwrap(resource_rc)
-      .map_err(|_| custom_error("Busy", "Unix socket is currently in use"))?;
+      .map_err(|_| HttpStartError::UnixSocketInUse)?;
     let (read_half, write_half) = resource.into_inner();
     let unix_stream = read_half.reunite(write_half)?;
     let addr = unix_stream.local_addr()?;
-    return http_create_conn_resource(state, unix_stream, addr, "http+unix");
+    return Ok(http_create_conn_resource(
+      state,
+      unix_stream,
+      addr,
+      "http+unix",
+    ));
   }
 
-  Err(bad_resource_id())
+  Err(HttpStartError::Other(deno_core::error::bad_resource_id()))
 }