l2cap: add non-blocking read and write APIs.

Author: Dirbaio

src/android/l2cap_channel.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 use std::{fmt, slice, thread};
 
-use async_channel::{Receiver, Sender};
+use async_channel::{Receiver, Sender, TryRecvError, TrySendError};
 use java_spaghetti::{ByteArray, Global, Local, PrimitiveArray};
 use tracing::{debug, warn};
 
@@ -151,7 +151,27 @@ impl L2capChannelReader {
             .stream
             .recv()
             .await
-            .map_err(|_| Error::new(ErrorKind::ConnectionFailed, None, "L2CAP channel is closed".to_string()))?;
+            .map_err(|_| Error::new(ErrorKind::ConnectionFailed, None, "channel is closed".to_string()))?;
+
+        if packet.len() > buf.len() {
+            return Err(Error::new(
+                ErrorKind::InvalidParameter,
+                None,
+                "Buffer is too small".to_string(),
+            ));
+        }
+
+        buf[..packet.len()].copy_from_slice(&packet);
+
+        Ok(packet.len())
+    }
+
+    #[inline]
+    pub fn try_read(&mut self, buf: &mut [u8]) -> Result<usize> {
+        let packet = self.stream.try_recv().map_err(|e| match e {
+            TryRecvError::Empty => Error::new(ErrorKind::NotReady, None, "no received packet in queue".to_string()),
+            TryRecvError::Closed => Error::new(ErrorKind::ConnectionFailed, None, "channel is closed".to_string()),
+        })?;
 
         if packet.len() > buf.len() {
             return Err(Error::new(
@@ -188,7 +208,14 @@ impl L2capChannelWriter {
         self.stream
             .send(packet.to_vec())
             .await
-            .map_err(|_| Error::new(ErrorKind::ConnectionFailed, None, "L2CAP channel is closed".to_string()))
+            .map_err(|_| Error::new(ErrorKind::ConnectionFailed, None, "channel is closed".to_string()))
+    }
+
+    pub fn try_write(&mut self, packet: &[u8]) -> Result<()> {
+        self.stream.try_send(packet.to_vec()).map_err(|e| match e {
+            TrySendError::Closed(_) => Error::new(ErrorKind::ConnectionFailed, None, "channel is closed".to_string()),
+            TrySendError::Full(_) => Error::new(ErrorKind::NotReady, None, "No buffer space for write".to_string()),
+        })
     }
 
     pub async fn close(&mut self) -> Result<()> {

src/bluer/l2cap_channel.rs

@@ -12,6 +12,10 @@ impl L2capChannelReader {
         todo!()
     }
 
+    pub fn try_read(&mut self, _buf: &mut [u8]) -> Result<usize> {
+        todo!()
+    }
+
     pub async fn close(&mut self) -> Result<()> {
         todo!()
     }
@@ -32,6 +36,10 @@ impl L2capChannelWriter {
         todo!()
     }
 
+    pub fn try_write(&mut self, _packet: &[u8]) -> Result<()> {
+        todo!()
+    }
+
     pub async fn close(&mut self) -> Result<()> {
         todo!()
     }

src/corebluetooth/l2cap_channel.rs

@@ -12,6 +12,10 @@ impl L2capChannelReader {
         todo!()
     }
 
+    pub fn try_read(&mut self, _buf: &mut [u8]) -> Result<usize> {
+        todo!()
+    }
+
     pub async fn close(&mut self) -> Result<()> {
         todo!()
     }
@@ -32,6 +36,10 @@ impl L2capChannelWriter {
         todo!()
     }
 
+    pub fn try_write(&mut self, _packet: &[u8]) -> Result<()> {
+        todo!()
+    }
+
     pub async fn close(&mut self) -> Result<()> {
         todo!()
     }

src/l2cap_channel.rs

@@ -62,6 +62,16 @@ impl L2capChannelReader {
         self.reader.read(buf).await
     }
 
+    /// Try reading a packet from the L2CAP channel.
+    ///
+    /// The packet is written to the start of `buf`, and the packet length is returned.
+    ///
+    /// If no packet is immediately available for reading, this returns an error with kind `NotReady`.
+    #[inline]
+    pub fn try_read(&mut self, buf: &mut [u8]) -> Result<usize> {
+        self.reader.try_read(buf)
+    }
+
     /// Close the L2CAP channel.
     ///
     /// This closes the entire channel, not just the read half.
@@ -76,11 +86,21 @@ impl L2capChannelReader {
 
 impl L2capChannelWriter {
     /// Write a packet to the L2CAP channel.
+    ///
+    /// If the buffer is full, this will wait until there's buffer space for the packet.
     #[inline]
     pub async fn write(&mut self, packet: &[u8]) -> Result<()> {
         self.writer.write(packet).await
     }
 
+    /// Try writing a packet to the L2CAP channel.
+    ///
+    /// If there's no buffer space, this returns an error with kind `NotReady`.
+    #[inline]
+    pub fn try_write(&mut self, packet: &[u8]) -> Result<()> {
+        self.writer.try_write(packet)
+    }
+
     /// Close the L2CAP channel.
     ///
     /// This closes the entire channel, not just the write half.

src/windows/l2cap_channel.rs

@@ -12,6 +12,10 @@ impl L2capChannelReader {
         todo!()
     }
 
+    pub fn try_read(&mut self, _buf: &mut [u8]) -> Result<usize> {
+        todo!()
+    }
+
     pub async fn close(&mut self) -> Result<()> {
         todo!()
     }
@@ -32,6 +36,10 @@ impl L2capChannelWriter {
         todo!()
     }
 
+    pub fn try_write(&mut self, _packet: &[u8]) -> Result<()> {
+        todo!()
+    }
+
     pub async fn close(&mut self) -> Result<()> {
         todo!()
     }