summaryrefslogtreecommitdiff
path: root/ext/net
diff options
context:
space:
mode:
Diffstat (limited to 'ext/net')
-rw-r--r--ext/net/01_net.js6
-rw-r--r--ext/net/README.md3
-rw-r--r--ext/net/io.rs121
-rw-r--r--ext/net/lib.rs1
-rw-r--r--ext/net/ops_tls.rs33
5 files changed, 71 insertions, 93 deletions
diff --git a/ext/net/01_net.js b/ext/net/01_net.js
index fa38c8952..0afdbeebc 100644
--- a/ext/net/01_net.js
+++ b/ext/net/01_net.js
@@ -18,16 +18,16 @@
if (buffer.length === 0) {
return 0;
}
- const nread = await core.opAsync("op_net_read_async", rid, buffer);
+ const nread = await core.read(rid, buffer);
return nread === 0 ? null : nread;
}
async function write(rid, data) {
- return await core.opAsync("op_net_write_async", rid, data);
+ return await core.write(rid, data);
}
function shutdown(rid) {
- return core.opAsync("op_net_shutdown", rid);
+ return core.shutdown(rid);
}
function opAccept(rid, transport) {
diff --git a/ext/net/README.md b/ext/net/README.md
index e1c428143..1928fc375 100644
--- a/ext/net/README.md
+++ b/ext/net/README.md
@@ -9,9 +9,6 @@ This crate depends on following extensions:
Following ops are provided:
-- "op_net_read_async"
-- "op_net_write_async"
-- "op_net_shutdown"
- "op_net_accept"
- "op_net_connect"
- "op_net_listen"
diff --git a/ext/net/io.rs b/ext/net/io.rs
index 6cefbde2d..2b7aec446 100644
--- a/ext/net/io.rs
+++ b/ext/net/io.rs
@@ -1,21 +1,15 @@
// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
-use crate::ops_tls::TlsStreamResource;
-use deno_core::error::not_supported;
use deno_core::error::AnyError;
-use deno_core::op_async;
use deno_core::AsyncMutFuture;
use deno_core::AsyncRefCell;
+use deno_core::AsyncResult;
use deno_core::CancelHandle;
use deno_core::CancelTryFuture;
-use deno_core::OpPair;
-use deno_core::OpState;
use deno_core::RcRef;
use deno_core::Resource;
-use deno_core::ResourceId;
use deno_core::ZeroCopyBuf;
use std::borrow::Cow;
-use std::cell::RefCell;
use std::rc::Rc;
use tokio::io::AsyncRead;
use tokio::io::AsyncReadExt;
@@ -26,14 +20,6 @@ use tokio::net::tcp;
#[cfg(unix)]
use tokio::net::unix;
-pub fn init() -> Vec<OpPair> {
- vec![
- ("op_net_read_async", op_async(op_read_async)),
- ("op_net_write_async", op_async(op_write_async)),
- ("op_net_shutdown", op_async(op_shutdown)),
- ]
-}
-
/// A full duplex resource has a read and write ends that are completely
/// independent, like TCP/Unix sockets and TLS streams.
#[derive(Debug)]
@@ -80,21 +66,27 @@ where
}
pub async fn read(
- self: &Rc<Self>,
- buf: &mut [u8],
+ self: Rc<Self>,
+ mut buf: ZeroCopyBuf,
) -> Result<usize, AnyError> {
let mut rd = self.rd_borrow_mut().await;
- let nread = rd.read(buf).try_or_cancel(self.cancel_handle()).await?;
+ let nread = rd
+ .read(&mut buf)
+ .try_or_cancel(self.cancel_handle())
+ .await?;
Ok(nread)
}
- pub async fn write(self: &Rc<Self>, buf: &[u8]) -> Result<usize, AnyError> {
+ pub async fn write(
+ self: Rc<Self>,
+ buf: ZeroCopyBuf,
+ ) -> Result<usize, AnyError> {
let mut wr = self.wr_borrow_mut().await;
- let nwritten = wr.write(buf).await?;
+ let nwritten = wr.write(&buf).await?;
Ok(nwritten)
}
- pub async fn shutdown(self: &Rc<Self>) -> Result<(), AnyError> {
+ pub async fn shutdown(self: Rc<Self>) -> Result<(), AnyError> {
let mut wr = self.wr_borrow_mut().await;
wr.shutdown().await?;
Ok(())
@@ -109,6 +101,18 @@ impl Resource for TcpStreamResource {
"tcpStream".into()
}
+ fn read(self: Rc<Self>, buf: ZeroCopyBuf) -> AsyncResult<usize> {
+ Box::pin(self.read(buf))
+ }
+
+ fn write(self: Rc<Self>, buf: ZeroCopyBuf) -> AsyncResult<usize> {
+ Box::pin(self.write(buf))
+ }
+
+ fn shutdown(self: Rc<Self>) -> AsyncResult<()> {
+ Box::pin(self.shutdown())
+ }
+
fn close(self: Rc<Self>) {
self.cancel_read_ops();
}
@@ -124,15 +128,18 @@ pub struct UnixStreamResource;
#[cfg(not(unix))]
impl UnixStreamResource {
pub async fn read(
- self: &Rc<Self>,
- _buf: &mut [u8],
+ self: Rc<Self>,
+ _buf: ZeroCopyBuf,
) -> Result<usize, AnyError> {
unreachable!()
}
- pub async fn write(self: &Rc<Self>, _buf: &[u8]) -> Result<usize, AnyError> {
+ pub async fn write(
+ self: Rc<Self>,
+ _buf: ZeroCopyBuf,
+ ) -> Result<usize, AnyError> {
unreachable!()
}
- pub async fn shutdown(self: &Rc<Self>) -> Result<(), AnyError> {
+ pub async fn shutdown(self: Rc<Self>) -> Result<(), AnyError> {
unreachable!()
}
pub fn cancel_read_ops(&self) {
@@ -145,61 +152,19 @@ impl Resource for UnixStreamResource {
"unixStream".into()
}
- fn close(self: Rc<Self>) {
- self.cancel_read_ops();
+ fn read(self: Rc<Self>, buf: ZeroCopyBuf) -> AsyncResult<usize> {
+ Box::pin(self.read(buf))
}
-}
-async fn op_read_async(
- state: Rc<RefCell<OpState>>,
- rid: ResourceId,
- mut buf: ZeroCopyBuf,
-) -> Result<u32, AnyError> {
- let resource = state.borrow().resource_table.get_any(rid)?;
- let nread = if let Some(s) = resource.downcast_rc::<TcpStreamResource>() {
- s.read(&mut buf).await?
- } else if let Some(s) = resource.downcast_rc::<TlsStreamResource>() {
- s.read(&mut buf).await?
- } else if let Some(s) = resource.downcast_rc::<UnixStreamResource>() {
- s.read(&mut buf).await?
- } else {
- return Err(not_supported());
- };
- Ok(nread as u32)
-}
+ fn write(self: Rc<Self>, buf: ZeroCopyBuf) -> AsyncResult<usize> {
+ Box::pin(self.write(buf))
+ }
-async fn op_write_async(
- state: Rc<RefCell<OpState>>,
- rid: ResourceId,
- buf: ZeroCopyBuf,
-) -> Result<u32, AnyError> {
- let resource = state.borrow().resource_table.get_any(rid)?;
- let nwritten = if let Some(s) = resource.downcast_rc::<TcpStreamResource>() {
- s.write(&buf).await?
- } else if let Some(s) = resource.downcast_rc::<TlsStreamResource>() {
- s.write(&buf).await?
- } else if let Some(s) = resource.downcast_rc::<UnixStreamResource>() {
- s.write(&buf).await?
- } else {
- return Err(not_supported());
- };
- Ok(nwritten as u32)
-}
+ fn shutdown(self: Rc<Self>) -> AsyncResult<()> {
+ Box::pin(self.shutdown())
+ }
-async fn op_shutdown(
- state: Rc<RefCell<OpState>>,
- rid: ResourceId,
- _: (),
-) -> Result<(), AnyError> {
- let resource = state.borrow().resource_table.get_any(rid)?;
- if let Some(s) = resource.downcast_rc::<TcpStreamResource>() {
- s.shutdown().await?;
- } else if let Some(s) = resource.downcast_rc::<TlsStreamResource>() {
- s.shutdown().await?;
- } else if let Some(s) = resource.downcast_rc::<UnixStreamResource>() {
- s.shutdown().await?;
- } else {
- return Err(not_supported());
- }
- Ok(())
+ fn close(self: Rc<Self>) {
+ self.cancel_read_ops();
+ }
}
diff --git a/ext/net/lib.rs b/ext/net/lib.rs
index ad14c15d8..bbbfb3331 100644
--- a/ext/net/lib.rs
+++ b/ext/net/lib.rs
@@ -82,7 +82,6 @@ pub fn init<P: NetPermissions + 'static>(
unsafely_ignore_certificate_errors: Option<Vec<String>>,
) -> Extension {
let mut ops_to_register = vec![];
- ops_to_register.extend(io::init());
ops_to_register.extend(ops::init::<P>());
ops_to_register.extend(ops_tls::init::<P>());
Extension::builder()
diff --git a/ext/net/ops_tls.rs b/ext/net/ops_tls.rs
index 43652a9fe..87744ed63 100644
--- a/ext/net/ops_tls.rs
+++ b/ext/net/ops_tls.rs
@@ -28,6 +28,7 @@ use deno_core::op_async;
use deno_core::op_sync;
use deno_core::parking_lot::Mutex;
use deno_core::AsyncRefCell;
+use deno_core::AsyncResult;
use deno_core::CancelHandle;
use deno_core::CancelTryFuture;
use deno_core::OpPair;
@@ -35,6 +36,7 @@ use deno_core::OpState;
use deno_core::RcRef;
use deno_core::Resource;
use deno_core::ResourceId;
+use deno_core::ZeroCopyBuf;
use deno_tls::create_client_config;
use deno_tls::load_certs;
use deno_tls::load_private_keys;
@@ -715,24 +717,27 @@ impl TlsStreamResource {
}
pub async fn read(
- self: &Rc<Self>,
- buf: &mut [u8],
+ self: Rc<Self>,
+ mut buf: ZeroCopyBuf,
) -> Result<usize, AnyError> {
- let mut rd = RcRef::map(self, |r| &r.rd).borrow_mut().await;
- let cancel_handle = RcRef::map(self, |r| &r.cancel_handle);
- let nread = rd.read(buf).try_or_cancel(cancel_handle).await?;
+ let mut rd = RcRef::map(&self, |r| &r.rd).borrow_mut().await;
+ let cancel_handle = RcRef::map(&self, |r| &r.cancel_handle);
+ let nread = rd.read(&mut buf).try_or_cancel(cancel_handle).await?;
Ok(nread)
}
- pub async fn write(self: &Rc<Self>, buf: &[u8]) -> Result<usize, AnyError> {
+ pub async fn write(
+ self: Rc<Self>,
+ buf: ZeroCopyBuf,
+ ) -> Result<usize, AnyError> {
self.handshake().await?;
let mut wr = RcRef::map(self, |r| &r.wr).borrow_mut().await;
- let nwritten = wr.write(buf).await?;
+ let nwritten = wr.write(&buf).await?;
wr.flush().await?;
Ok(nwritten)
}
- pub async fn shutdown(self: &Rc<Self>) -> Result<(), AnyError> {
+ pub async fn shutdown(self: Rc<Self>) -> Result<(), AnyError> {
self.handshake().await?;
let mut wr = RcRef::map(self, |r| &r.wr).borrow_mut().await;
wr.shutdown().await?;
@@ -755,6 +760,18 @@ impl Resource for TlsStreamResource {
"tlsStream".into()
}
+ fn read(self: Rc<Self>, buf: ZeroCopyBuf) -> AsyncResult<usize> {
+ Box::pin(self.read(buf))
+ }
+
+ fn write(self: Rc<Self>, buf: ZeroCopyBuf) -> AsyncResult<usize> {
+ Box::pin(self.write(buf))
+ }
+
+ fn shutdown(self: Rc<Self>) -> AsyncResult<()> {
+ Box::pin(self.shutdown())
+ }
+
fn close(self: Rc<Self>) {
self.cancel_handle.cancel();
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 07:16:43 +0000