Sending a picture to the client. Streaming works on the server but not yet on the relay
_
parent
eaca19f6ba
commit
587849bcfa
|
|
@ -11,6 +11,6 @@ edition = "2018"
|
||||||
|
|
||||||
futures = "0.3.7"
|
futures = "0.3.7"
|
||||||
hyper = "0.13.8"
|
hyper = "0.13.8"
|
||||||
reqwest = "0.10.8"
|
reqwest = { version = "0.10.8", features = ["stream"] }
|
||||||
tokio = { version = "0.2", features = ["full"] }
|
tokio = { version = "0.2", features = ["full"] }
|
||||||
ulid = "0.4.1"
|
ulid = "0.4.1"
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ enum Message {
|
||||||
//HttpRequestRequest (String),
|
//HttpRequestRequest (String),
|
||||||
HttpRequestResponse (String),
|
HttpRequestResponse (String),
|
||||||
// HttpResponseRequest (String),
|
// HttpResponseRequest (String),
|
||||||
HttpResponseResponse (String),
|
HttpResponseResponse (Vec <u8>),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive (Default)]
|
#[derive (Default)]
|
||||||
|
|
@ -93,7 +93,7 @@ async fn handle_http_response (
|
||||||
-> Response <Body>
|
-> Response <Body>
|
||||||
{
|
{
|
||||||
println! ("Step 6");
|
println! ("Step 6");
|
||||||
let payload = String::from (std::str::from_utf8 (&hyper::body::to_bytes (req.into_body ()).await.unwrap ()).unwrap ());
|
let payload = hyper::body::to_bytes (req.into_body ()).await.unwrap ().to_vec ();
|
||||||
|
|
||||||
{
|
{
|
||||||
let mut watchers = state.watchers.lock ().await;
|
let mut watchers = state.watchers.lock ().await;
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,39 @@
|
||||||
use std::{
|
use std::{
|
||||||
|
convert::Infallible,
|
||||||
error::Error,
|
error::Error,
|
||||||
sync::Arc,
|
sync::Arc,
|
||||||
|
time::Duration,
|
||||||
};
|
};
|
||||||
|
|
||||||
use hyper::{
|
use hyper::{
|
||||||
StatusCode,
|
StatusCode,
|
||||||
Uri,
|
Uri,
|
||||||
};
|
};
|
||||||
use reqwest::Client;
|
use reqwest::{
|
||||||
use tokio::fs::File;
|
Body,
|
||||||
|
Client,
|
||||||
|
};
|
||||||
|
use tokio::{
|
||||||
|
fs::File,
|
||||||
|
io::AsyncReadExt,
|
||||||
|
sync::mpsc::{
|
||||||
|
channel,
|
||||||
|
Receiver,
|
||||||
|
},
|
||||||
|
time::delay_for,
|
||||||
|
};
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main () -> Result <(), Box <dyn Error>> {
|
async fn main () -> Result <(), Box <dyn Error>> {
|
||||||
let client = Arc::new (Client::new ());
|
let client = Arc::new (Client::new ());
|
||||||
|
|
||||||
let path = "/home/user/pictures/bzqcChY.jpg";
|
let mut backoff_delay = 0;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
|
if backoff_delay > 0 {
|
||||||
|
delay_for (Duration::from_millis (backoff_delay)).await;
|
||||||
|
}
|
||||||
|
|
||||||
let _uri = Uri::builder ()
|
let _uri = Uri::builder ()
|
||||||
.scheme ("http")
|
.scheme ("http")
|
||||||
.authority ("127.0.0.1:4000")
|
.authority ("127.0.0.1:4000")
|
||||||
|
|
@ -29,9 +46,13 @@ async fn main () -> Result <(), Box <dyn Error>> {
|
||||||
let req_resp = match req_req.send ().await {
|
let req_resp = match req_req.send ().await {
|
||||||
Err (e) => {
|
Err (e) => {
|
||||||
println! ("Err: {:?}", e);
|
println! ("Err: {:?}", e);
|
||||||
|
backoff_delay = backoff_delay * 2 + 500;
|
||||||
continue;
|
continue;
|
||||||
},
|
},
|
||||||
Ok (r) => r,
|
Ok (r) => {
|
||||||
|
backoff_delay = 0;
|
||||||
|
r
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
if req_resp.status () != StatusCode::OK {
|
if req_resp.status () != StatusCode::OK {
|
||||||
|
|
@ -57,7 +78,29 @@ async fn main () -> Result <(), Box <dyn Error>> {
|
||||||
.path_and_query ("/listen/alien_wildlands")
|
.path_and_query ("/listen/alien_wildlands")
|
||||||
.build ().unwrap ();
|
.build ().unwrap ();
|
||||||
|
|
||||||
let resp_req = client.post (&format! ("http://127.0.0.1:4000/http_response/{}", body)).body (payload);
|
let (tx, rx) = channel (2);
|
||||||
|
//let rx: Receiver <Vec <u8>> = rx;
|
||||||
|
|
||||||
|
tokio::spawn (async move {
|
||||||
|
let path = "/home/user/pictures/bzqcChY.jpg";
|
||||||
|
let mut f = File::open (path).await.unwrap ();
|
||||||
|
let mut tx = tx;
|
||||||
|
|
||||||
|
loop {
|
||||||
|
let mut buffer = vec! [0u8; 256];
|
||||||
|
let bytes_read = f.read (&mut buffer).await.unwrap ();
|
||||||
|
|
||||||
|
buffer.truncate (bytes_read);
|
||||||
|
|
||||||
|
if bytes_read == 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
tx.send (Ok::<_, Infallible> (buffer)).await;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let resp_req = client.post (&format! ("http://127.0.0.1:4000/http_response/{}", body)).body (Body::wrap_stream (rx));
|
||||||
|
|
||||||
println! ("Step 6");
|
println! ("Step 6");
|
||||||
match resp_req.send ().await {
|
match resp_req.send ().await {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue