itsi 0.1.11 → 0.1.12

data/crates/itsi_server/src/{body_proxy/itsi_body_proxy.rs → ruby_types/itsi_body_proxy/mod.rs}

@@ -1,4 +1,5 @@
-use super::big_bytes::BigBytes;
+pub mod big_bytes;
+use big_bytes::BigBytes;
 use bytes::Bytes;
 use futures::executor::block_on;
 use http_body_util::{BodyDataStream, BodyExt};
@@ -25,10 +26,10 @@ pub enum ItsiBody {
 }
 
 impl ItsiBody {
-    pub fn into_value(&self) -> Value {
+    pub fn into_value(&self) -> Option<Value> {
         match self {
             ItsiBody::Buffered(bytes) => bytes.as_value(),
-            ItsiBody::Stream(proxy) => proxy.clone().into_value(),
+            ItsiBody::Stream(proxy) => Some(proxy.clone().into_value()),
         }
     }
 }
@@ -98,6 +99,24 @@ impl ItsiBodyProxy {
         Ok(Some(output_string))
     }
 
+    pub fn to_bytes(&self) -> MagnusResult<Vec<u8>> {
+        self.verify_open()?;
+        let mut stream = self.incoming.lock();
+        let mut buf = self.buf.lock();
+
+        while let Some(chunk) = block_on(stream.next()) {
+            let chunk = chunk.map_err(|err| {
+                magnus::Error::new(
+                    magnus::exception::exception(),
+                    format!("Error reading body {:?}", err),
+                )
+            })?;
+            buf.extend_from_slice(&chunk);
+        }
+
+        Ok(buf.clone())
+    }
+
     /// Equivalent to calling gets and yielding it, until we reach EOF
     pub fn each(ruby: &Ruby, rbself: &Self) -> MagnusResult<()> {
         let proc = ruby.block_proc()?;

data/crates/itsi_server/src/ruby_types/itsi_grpc_request.rs

@@ -0,0 +1,147 @@
+use derive_more::Debug;
+use http::{request::Parts, Response, StatusCode};
+use http_body_util::{combinators::BoxBody, BodyExt, Empty};
+use itsi_error::from::CLIENT_CONNECTION_CLOSED;
+use itsi_rb_helpers::{print_rb_backtrace, HeapValue};
+use itsi_tracing::debug;
+use magnus::{
+    block::Proc,
+    error::{ErrorType, Result as MagnusResult},
+    Error,
+};
+use magnus::{
+    value::{LazyId, ReprValue},
+    Ruby, Value,
+};
+use std::{sync::Arc, time::Instant};
+use tokio::sync::mpsc::{self};
+use tracing::error;
+
+use super::itsi_grpc_stream::ItsiGrpcStream;
+use crate::server::{
+    byte_frame::ByteFrame,
+    itsi_service::RequestContext,
+    request_job::RequestJob,
+    types::{HttpRequest, HttpResponse},
+};
+
+static ID_MESSAGE: LazyId = LazyId::new("message");
+
+#[derive(Debug)]
+#[magnus::wrap(class = "Itsi::GrpcRequest", free_immediately, size)]
+pub struct ItsiGrpcRequest {
+    pub parts: Parts,
+    pub start: Instant,
+    #[debug(skip)]
+    pub context: RequestContext,
+    #[debug(skip)]
+    pub stream: ItsiGrpcStream,
+}
+
+impl ItsiGrpcRequest {
+    pub fn service_name(&self) -> MagnusResult<String> {
+        let path = self.parts.uri.path();
+        Ok(path.split('/').nth_back(1).unwrap().to_string())
+    }
+
+    pub fn method_name(&self) -> MagnusResult<String> {
+        let path = self.parts.uri.path();
+        Ok(path.split('/').nth_back(0).unwrap().to_string())
+    }
+
+    pub fn stream(&self) -> MagnusResult<ItsiGrpcStream> {
+        Ok(self.stream.clone())
+    }
+
+    pub fn content_type_str(&self) -> &str {
+        self.parts
+            .headers
+            .get("Content-Type")
+            .and_then(|hv| hv.to_str().ok())
+            .unwrap_or("application/x-www-form-urlencoded")
+    }
+
+    pub fn is_json(&self) -> bool {
+        self.content_type_str() == "application/json"
+    }
+
+    pub fn process(self, ruby: &Ruby, app_proc: Arc<HeapValue<Proc>>) -> magnus::error::Result<()> {
+        let response = self.stream.clone();
+        let result = app_proc.call::<_, Value>((self,));
+        if let Err(err) = result {
+            Self::internal_error(ruby, response, err);
+        }
+        Ok(())
+    }
+
+    pub fn internal_error(_ruby: &Ruby, stream: ItsiGrpcStream, err: Error) {
+        if let Some(rb_err) = err.value() {
+            print_rb_backtrace(rb_err);
+            stream.internal_server_error(err.to_string());
+        } else {
+            stream.internal_server_error(err.to_string());
+        }
+    }
+
+    pub(crate) async fn process_request(
+        app: Arc<HeapValue<Proc>>,
+        hyper_request: HttpRequest,
+        context: &RequestContext,
+    ) -> itsi_error::Result<HttpResponse> {
+        let (request, mut receiver) = ItsiGrpcRequest::new(hyper_request, context).await;
+        let shutdown_channel = context.service.shutdown_channel.clone();
+        let response_stream = request.stream.clone();
+        match context
+            .sender
+            .send(RequestJob::ProcessGrpcRequest(request, app))
+            .await
+        {
+            Err(err) => {
+                error!("Error occurred: {}", err);
+                let mut response = Response::new(BoxBody::new(Empty::new()));
+                *response.status_mut() = StatusCode::BAD_REQUEST;
+                Ok(response)
+            }
+            _ => match receiver.recv().await {
+                Some(first_frame) => Ok(response_stream
+                    .build_response(first_frame, receiver, shutdown_channel)
+                    .await),
+                None => Ok(Response::new(BoxBody::new(Empty::new()))),
+            },
+        }
+    }
+    pub fn is_connection_closed_err(ruby: &Ruby, err: &Error) -> bool {
+        match err.error_type() {
+            ErrorType::Jump(_) => false,
+            ErrorType::Error(_, _) => false,
+            ErrorType::Exception(exception) => {
+                exception.is_kind_of(ruby.exception_eof_error())
+                    && err
+                        .value()
+                        .map(|v| {
+                            v.funcall::<_, _, String>(*ID_MESSAGE, ())
+                                .unwrap_or("".to_string())
+                                .eq(CLIENT_CONNECTION_CLOSED)
+                        })
+                        .unwrap_or(false)
+            }
+        }
+    }
+
+    pub(crate) async fn new(
+        request: HttpRequest,
+        context: &RequestContext,
+    ) -> (ItsiGrpcRequest, mpsc::Receiver<ByteFrame>) {
+        let (parts, body) = request.into_parts();
+        let response_channel = mpsc::channel::<ByteFrame>(100);
+        (
+            Self {
+                context: context.clone(),
+                start: Instant::now(),
+                parts,
+                stream: ItsiGrpcStream::new(response_channel.0, body.into_data_stream()),
+            },
+            response_channel.1,
+        )
+    }
+}

data/crates/itsi_server/src/ruby_types/itsi_grpc_response.rs

@@ -0,0 +1,19 @@
+use derive_more::Debug;
+use http::request::Parts;
+use tokio::sync::mpsc::Sender;
+
+use crate::server::byte_frame::ByteFrame;
+
+#[derive(Debug, Clone)]
+#[magnus::wrap(class = "Itsi::GrpcResponse", free_immediately, size)]
+pub struct ItsiGrpcResponse {
+    pub parts: Parts,
+    #[debug(skip)]
+    pub sender: Sender<ByteFrame>,
+}
+
+impl ItsiGrpcResponse {
+    pub fn new(parts: Parts, sender: Sender<ByteFrame>) -> Self {
+        Self { parts, sender }
+    }
+}

data/crates/itsi_server/src/ruby_types/itsi_grpc_stream/mod.rs

@@ -0,0 +1,216 @@
+use std::{collections::HashMap, sync::Arc};
+
+use crate::server::{
+    byte_frame::ByteFrame, serve_strategy::single_mode::RunningPhase, types::HttpResponse,
+};
+use bytes::Bytes;
+use derive_more::Debug;
+use futures::{executor::block_on, stream::unfold};
+use http::{
+    header::{HeaderName, HeaderValue, CONTENT_TYPE},
+    HeaderMap, Response,
+};
+use http_body_util::{combinators::BoxBody, BodyDataStream, BodyExt, Empty, Full, StreamBody};
+use hyper::body::{Frame, Incoming};
+use magnus::error::Result as MagnusResult;
+use parking_lot::Mutex;
+use tokio::sync::{
+    mpsc::{Receiver, Sender},
+    oneshot, watch,
+};
+use tokio_stream::{wrappers::ReceiverStream, StreamExt};
+use tracing::{error, info, warn};
+
+#[derive(Debug, Clone)]
+#[magnus::wrap(class = "Itsi::GrpcStream", free_immediately, size)]
+pub struct ItsiGrpcStream {
+    pub inner: Arc<Mutex<ItsiGrpcStreamInner>>,
+}
+
+#[derive(Debug)]
+pub struct ItsiGrpcStreamInner {
+    pub body: BodyDataStream<Incoming>,
+    pub buf: Vec<u8>,
+    pub response_sender: Sender<ByteFrame>,
+    pub response: Option<HttpResponse>,
+    trailer_tx: oneshot::Sender<HeaderMap>,
+    trailer_rx: Option<oneshot::Receiver<HeaderMap>>,
+}
+
+impl ItsiGrpcStreamInner {
+    pub fn read(&mut self, bytes: usize) -> MagnusResult<Bytes> {
+        let stream = &mut self.body;
+        let buf = &mut self.buf;
+        let mut result = Vec::with_capacity(bytes);
+
+        info!("Entering read with {:?}. Current buf is {:?}", bytes, buf);
+
+        // First, use any data already in the buffer
+        if !buf.is_empty() {
+            let remaining = bytes.min(buf.len());
+            result.extend_from_slice(&buf[..remaining]);
+            buf.drain(..remaining);
+        }
+
+        while result.len() < bytes {
+            if let Some(chunk) = block_on(stream.next()) {
+                let chunk = chunk.map_err(|err| {
+                    magnus::Error::new(
+                        magnus::exception::exception(),
+                        format!("Error reading body {:?}", err),
+                    )
+                })?;
+                let remaining = bytes - result.len();
+                if chunk.len() > remaining {
+                    result.extend_from_slice(&chunk[..remaining]);
+                    buf.extend_from_slice(&chunk[remaining..]);
+                } else {
+                    result.extend_from_slice(&chunk);
+                }
+            } else {
+                break;
+            }
+        }
+
+        Ok(result.into())
+    }
+
+    pub fn write(&mut self, bytes: Bytes) -> MagnusResult<()> {
+        self.response_sender
+            .blocking_send(ByteFrame::Data(bytes))
+            .map_err(|err| {
+                magnus::Error::new(
+                    magnus::exception::exception(),
+                    format!("Error writing body {:?}", err),
+                )
+            })?;
+        Ok(())
+    }
+
+    pub fn flush(&mut self) -> MagnusResult<()> {
+        Ok(())
+    }
+
+    pub fn send_trailers(&mut self, trailers: HashMap<String, String>) -> MagnusResult<()> {
+        let mut header_map = HeaderMap::new();
+        for (key, value) in trailers {
+            if let (Ok(hn), Ok(hv)) = (key.parse::<HeaderName>(), value.parse::<HeaderValue>()) {
+                header_map.insert(hn, hv);
+            }
+        }
+        let trailer_tx = std::mem::replace(&mut self.trailer_tx, oneshot::channel().0);
+        trailer_tx.send(header_map).map_err(|err| {
+            magnus::Error::new(
+                magnus::exception::exception(),
+                format!("Error sending trailers {:?}", err),
+            )
+        })?;
+        self.response_sender
+            .blocking_send(ByteFrame::Empty)
+            .map_err(|err| {
+                magnus::Error::new(
+                    magnus::exception::exception(),
+                    format!("Error flushing {:?}", err),
+                )
+            })?;
+        Ok(())
+    }
+}
+
+impl ItsiGrpcStream {
+    pub fn new(response_sender: Sender<ByteFrame>, body: BodyDataStream<Incoming>) -> Self {
+        let (trailer_tx, trailer_rx) = oneshot::channel::<HeaderMap>();
+        ItsiGrpcStream {
+            inner: Arc::new(Mutex::new(ItsiGrpcStreamInner {
+                body,
+                buf: Vec::new(),
+                response_sender,
+                response: Some(Response::new(BoxBody::new(Empty::new()))),
+                trailer_tx,
+                trailer_rx: Some(trailer_rx),
+            })),
+        }
+    }
+
+    pub fn read(&self, bytes: usize) -> MagnusResult<Bytes> {
+        self.inner.lock().read(bytes)
+    }
+
+    pub fn write(&self, bytes: Bytes) -> MagnusResult<()> {
+        self.inner.lock().write(bytes)
+    }
+
+    pub fn flush(&self) -> MagnusResult<()> {
+        self.inner.lock().flush()
+    }
+
+    pub fn send_trailers(&self, trailers: HashMap<String, String>) -> MagnusResult<()> {
+        self.inner.lock().send_trailers(trailers)
+    }
+
+    pub async fn build_response(
+        &self,
+        first_frame: ByteFrame,
+        receiver: Receiver<ByteFrame>,
+        shutdown_rx: watch::Receiver<RunningPhase>,
+    ) -> HttpResponse {
+        let mut response = self.inner.lock().response.take().unwrap();
+        let rx = self.inner.lock().trailer_rx.take().unwrap();
+        response
+            .headers_mut()
+            .append(CONTENT_TYPE, "application/grpc".parse().unwrap());
+        *response.body_mut() = if matches!(first_frame, ByteFrame::Empty) {
+            BoxBody::new(Empty::new())
+        } else if matches!(first_frame, ByteFrame::End(_)) {
+            BoxBody::new(Full::new(first_frame.into()))
+        } else {
+            let initial_frame = tokio_stream::once(Ok(Frame::data(Bytes::from(first_frame))));
+            let frame_stream = unfold(
+                (ReceiverStream::new(receiver), shutdown_rx),
+                |(mut receiver, mut shutdown_rx)| async move {
+                    if let RunningPhase::ShutdownPending = *shutdown_rx.borrow() {
+                        return None;
+                    }
+                    loop {
+                        tokio::select! {
+                            maybe_bytes = receiver.next() => {
+                              match maybe_bytes {
+                                Some(ByteFrame::Data(bytes)) | Some(ByteFrame::End(bytes)) => {
+                                  return Some((Ok(Frame::data(bytes)), (receiver, shutdown_rx)));
+                                }
+                                _ => {
+                                  return None;
+                                }
+                              }
+                            },
+                            _ = shutdown_rx.changed() => {
+                                match *shutdown_rx.borrow() {
+                                    RunningPhase::ShutdownPending => {
+                                        warn!("Disconnecting streaming client.");
+                                        return None;
+                                    },
+                                    _ => continue,
+                                }
+                            }
+                        }
+                    }
+                },
+            );
+
+            let combined_stream = initial_frame.chain(frame_stream);
+            BoxBody::new(StreamBody::new(combined_stream))
+        }
+        .with_trailers(async move {
+            match rx.await {
+                Ok(trailers) => Some(Ok(trailers)),
+                Err(_err) => None,
+            }
+        })
+        .boxed();
+        response
+    }
+
+    pub fn internal_server_error(&self, message: String) {
+        error!(message);
+    }
+}