2017-11-08 14:51:51 +01:00
|
|
|
// Copyright 2017 Parity Technologies (UK) Ltd.
|
|
|
|
//
|
2018-03-07 16:20:55 +01:00
|
|
|
// Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
// copy of this software and associated documentation files (the "Software"),
|
|
|
|
// to deal in the Software without restriction, including without limitation
|
|
|
|
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
// and/or sell copies of the Software, and to permit persons to whom the
|
2017-11-08 14:51:51 +01:00
|
|
|
// Software is furnished to do so, subject to the following conditions:
|
|
|
|
//
|
2018-03-07 16:20:55 +01:00
|
|
|
// The above copyright notice and this permission notice shall be included in
|
2017-11-08 14:51:51 +01:00
|
|
|
// all copies or substantial portions of the Software.
|
|
|
|
//
|
2018-03-07 16:20:55 +01:00
|
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
|
|
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
2017-11-08 14:51:51 +01:00
|
|
|
// DEALINGS IN THE SOFTWARE.
|
|
|
|
|
|
|
|
//! This crate provides the `RwStreamSink` type. It wraps around a `Stream + Sink` that produces
|
2019-09-16 11:08:44 +02:00
|
|
|
//! and accepts byte arrays, and implements `PollRead` and `PollWrite`.
|
2017-12-06 16:24:15 +01:00
|
|
|
//!
|
|
|
|
//! Each call to `write()` will send one packet on the sink. Calls to `read()` will read from
|
|
|
|
//! incoming packets.
|
|
|
|
//!
|
2017-12-07 12:59:46 +01:00
|
|
|
//! > **Note**: Although this crate is hosted in the libp2p repo, it is purely a utility crate and
|
|
|
|
//! > not at all specific to libp2p.
|
2017-11-08 14:51:51 +01:00
|
|
|
|
2019-11-01 16:53:11 +01:00
|
|
|
use futures::prelude::*;
|
2019-10-08 11:50:12 +02:00
|
|
|
use std::{cmp, io, pin::Pin, task::Context, task::Poll};
|
2017-11-08 14:51:51 +01:00
|
|
|
|
|
|
|
/// Wraps around a `Stream + Sink` whose items are buffers. Implements `AsyncRead` and `AsyncWrite`.
|
2019-09-16 11:08:44 +02:00
|
|
|
///
|
|
|
|
/// The `B` generic is the type of buffers that the `Sink` accepts. The `I` generic is the type of
|
|
|
|
/// buffer that the `Stream` generates.
|
|
|
|
pub struct RwStreamSink<S> {
|
2017-11-08 14:51:51 +01:00
|
|
|
inner: S,
|
2019-09-16 11:08:44 +02:00
|
|
|
current_item: Option<Vec<u8>>,
|
2017-11-08 14:51:51 +01:00
|
|
|
}
|
|
|
|
|
2019-09-16 11:08:44 +02:00
|
|
|
impl<S> RwStreamSink<S> {
|
2017-11-08 14:51:51 +01:00
|
|
|
/// Wraps around `inner`.
|
|
|
|
pub fn new(inner: S) -> RwStreamSink<S> {
|
2019-01-30 15:41:54 +01:00
|
|
|
RwStreamSink { inner, current_item: None }
|
2017-11-08 14:51:51 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-16 11:08:44 +02:00
|
|
|
impl<S> AsyncRead for RwStreamSink<S>
|
2018-03-07 16:20:55 +01:00
|
|
|
where
|
2019-09-16 11:08:44 +02:00
|
|
|
S: TryStream<Ok = Vec<u8>, Error = io::Error> + Unpin,
|
2017-11-08 14:51:51 +01:00
|
|
|
{
|
2019-09-16 11:08:44 +02:00
|
|
|
fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context, buf: &mut [u8]) -> Poll<Result<usize, io::Error>> {
|
2019-03-01 12:08:49 +01:00
|
|
|
// Grab the item to copy from.
|
2019-09-16 11:08:44 +02:00
|
|
|
let current_item = loop {
|
2019-03-01 12:08:49 +01:00
|
|
|
if let Some(ref mut i) = self.current_item {
|
2019-09-16 11:08:44 +02:00
|
|
|
if !i.is_empty() {
|
2019-03-01 12:08:49 +01:00
|
|
|
break i;
|
2018-11-23 13:54:17 +01:00
|
|
|
}
|
2017-11-08 14:51:51 +01:00
|
|
|
}
|
|
|
|
|
2019-09-16 11:08:44 +02:00
|
|
|
self.current_item = Some(match TryStream::try_poll_next(Pin::new(&mut self.inner), cx) {
|
|
|
|
Poll::Ready(Some(Ok(i))) => i,
|
|
|
|
Poll::Ready(Some(Err(err))) => return Poll::Ready(Err(err)),
|
|
|
|
Poll::Ready(None) => return Poll::Ready(Ok(0)), // EOF
|
|
|
|
Poll::Pending => return Poll::Pending,
|
2019-03-01 12:08:49 +01:00
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// Copy it!
|
2019-09-16 11:08:44 +02:00
|
|
|
debug_assert!(!current_item.is_empty());
|
|
|
|
let to_copy = cmp::min(buf.len(), current_item.len());
|
|
|
|
buf[..to_copy].copy_from_slice(¤t_item[..to_copy]);
|
|
|
|
for _ in 0..to_copy { current_item.remove(0); }
|
|
|
|
Poll::Ready(Ok(to_copy))
|
2017-11-08 14:51:51 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-16 11:08:44 +02:00
|
|
|
impl<S> AsyncWrite for RwStreamSink<S>
|
2018-03-07 16:20:55 +01:00
|
|
|
where
|
2019-09-16 11:08:44 +02:00
|
|
|
S: Stream + Sink<Vec<u8>, Error = io::Error> + Unpin,
|
2017-11-08 14:51:51 +01:00
|
|
|
{
|
2019-09-16 11:08:44 +02:00
|
|
|
fn poll_write(mut self: Pin<&mut Self>, cx: &mut Context, buf: &[u8]) -> Poll<Result<usize, io::Error>> {
|
|
|
|
match Sink::poll_ready(Pin::new(&mut self.inner), cx) {
|
|
|
|
Poll::Pending => return Poll::Pending,
|
|
|
|
Poll::Ready(Ok(())) => {}
|
|
|
|
Poll::Ready(Err(err)) => return Poll::Ready(Err(err))
|
|
|
|
}
|
|
|
|
|
2017-11-08 14:51:51 +01:00
|
|
|
let len = buf.len();
|
2019-09-16 11:08:44 +02:00
|
|
|
match Sink::start_send(Pin::new(&mut self.inner), buf.into()) {
|
|
|
|
Ok(()) => Poll::Ready(Ok(len)),
|
|
|
|
Err(err) => Poll::Ready(Err(err))
|
2017-11-08 14:51:51 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-16 11:08:44 +02:00
|
|
|
fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
|
|
|
|
Sink::poll_flush(Pin::new(&mut self.inner), cx)
|
2017-11-08 14:51:51 +01:00
|
|
|
}
|
|
|
|
|
2019-09-16 11:08:44 +02:00
|
|
|
fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Result<(), io::Error>> {
|
|
|
|
Sink::poll_close(Pin::new(&mut self.inner), cx)
|
2017-11-08 14:51:51 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-16 11:08:44 +02:00
|
|
|
impl<S> Unpin for RwStreamSink<S> {
|
|
|
|
}
|
|
|
|
|
2017-11-08 14:51:51 +01:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2018-11-26 13:36:47 +01:00
|
|
|
use crate::RwStreamSink;
|
2019-09-16 11:08:44 +02:00
|
|
|
use futures::{prelude::*, stream, channel::mpsc::channel};
|
2017-11-08 14:51:51 +01:00
|
|
|
use std::io::Read;
|
|
|
|
|
|
|
|
// This struct merges a stream and a sink and is quite useful for tests.
|
|
|
|
struct Wrapper<St, Si>(St, Si);
|
2018-03-07 16:20:55 +01:00
|
|
|
impl<St, Si> Stream for Wrapper<St, Si>
|
|
|
|
where
|
|
|
|
St: Stream,
|
|
|
|
{
|
2017-11-08 14:51:51 +01:00
|
|
|
type Item = St::Item;
|
|
|
|
type Error = St::Error;
|
|
|
|
fn poll(&mut self) -> Poll<Option<Self::Item>, Self::Error> {
|
|
|
|
self.0.poll()
|
|
|
|
}
|
|
|
|
}
|
2018-03-07 16:20:55 +01:00
|
|
|
impl<St, Si> Sink for Wrapper<St, Si>
|
|
|
|
where
|
|
|
|
Si: Sink,
|
|
|
|
{
|
2017-11-08 14:51:51 +01:00
|
|
|
type SinkItem = Si::SinkItem;
|
|
|
|
type SinkError = Si::SinkError;
|
2018-03-07 16:20:55 +01:00
|
|
|
fn start_send(
|
|
|
|
&mut self,
|
|
|
|
item: Self::SinkItem,
|
|
|
|
) -> StartSend<Self::SinkItem, Self::SinkError> {
|
2017-11-08 14:51:51 +01:00
|
|
|
self.1.start_send(item)
|
|
|
|
}
|
|
|
|
fn poll_complete(&mut self) -> Poll<(), Self::SinkError> {
|
|
|
|
self.1.poll_complete()
|
|
|
|
}
|
2018-09-17 15:01:37 +02:00
|
|
|
fn close(&mut self) -> Poll<(), Self::SinkError> {
|
|
|
|
self.1.close()
|
|
|
|
}
|
2017-11-08 14:51:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn basic_reading() {
|
|
|
|
let (tx1, _) = channel::<Vec<u8>>(10);
|
|
|
|
let (tx2, rx2) = channel(10);
|
|
|
|
|
|
|
|
let mut wrapper = RwStreamSink::new(Wrapper(rx2.map_err(|_| panic!()), tx1));
|
|
|
|
|
|
|
|
tx2.send(Bytes::from("hel"))
|
|
|
|
.and_then(|tx| tx.send(Bytes::from("lo wor")))
|
|
|
|
.and_then(|tx| tx.send(Bytes::from("ld")))
|
2018-03-07 16:20:55 +01:00
|
|
|
.wait()
|
|
|
|
.unwrap();
|
2017-11-08 14:51:51 +01:00
|
|
|
|
2019-03-01 12:08:49 +01:00
|
|
|
let mut data = Vec::new();
|
|
|
|
wrapper.read_to_end(&mut data).unwrap();
|
|
|
|
assert_eq!(data, b"hello world");
|
2017-11-08 14:51:51 +01:00
|
|
|
}
|
2018-11-26 13:36:47 +01:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn skip_empty_stream_items() {
|
|
|
|
let data: Vec<&[u8]> = vec![b"", b"foo", b"", b"bar", b"", b"baz", b""];
|
|
|
|
let mut rws = RwStreamSink::new(stream::iter_ok::<_, std::io::Error>(data));
|
|
|
|
let mut buf = [0; 9];
|
2019-03-01 12:08:49 +01:00
|
|
|
assert_eq!(3, rws.read(&mut buf).unwrap());
|
|
|
|
assert_eq!(3, rws.read(&mut buf[3..]).unwrap());
|
|
|
|
assert_eq!(3, rws.read(&mut buf[6..]).unwrap());
|
|
|
|
assert_eq!(0, rws.read(&mut buf).unwrap());
|
|
|
|
assert_eq!(b"foobarbaz", &buf[..]);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn partial_read() {
|
|
|
|
let data: Vec<&[u8]> = vec![b"hell", b"o world"];
|
|
|
|
let mut rws = RwStreamSink::new(stream::iter_ok::<_, std::io::Error>(data));
|
|
|
|
let mut buf = [0; 3];
|
|
|
|
assert_eq!(3, rws.read(&mut buf).unwrap());
|
|
|
|
assert_eq!(b"hel", &buf[..3]);
|
|
|
|
assert_eq!(0, rws.read(&mut buf[..0]).unwrap());
|
|
|
|
assert_eq!(1, rws.read(&mut buf).unwrap());
|
|
|
|
assert_eq!(b"l", &buf[..1]);
|
|
|
|
assert_eq!(3, rws.read(&mut buf).unwrap());
|
|
|
|
assert_eq!(b"o w", &buf[..3]);
|
|
|
|
assert_eq!(0, rws.read(&mut buf[..0]).unwrap());
|
|
|
|
assert_eq!(3, rws.read(&mut buf).unwrap());
|
|
|
|
assert_eq!(b"orl", &buf[..3]);
|
|
|
|
assert_eq!(1, rws.read(&mut buf).unwrap());
|
|
|
|
assert_eq!(b"d", &buf[..1]);
|
|
|
|
assert_eq!(0, rws.read(&mut buf).unwrap());
|
2018-11-26 13:36:47 +01:00
|
|
|
}
|
2017-11-08 14:51:51 +01:00
|
|
|
}
|