diff options
Diffstat (limited to 'client-native-rift/src/main.rs')
| -rw-r--r-- | client-native-rift/src/main.rs | 291 |
1 files changed, 140 insertions, 151 deletions
diff --git a/client-native-rift/src/main.rs b/client-native-rift/src/main.rs index 2e54379..b5fcca9 100644 --- a/client-native-rift/src/main.rs +++ b/client-native-rift/src/main.rs @@ -7,13 +7,7 @@ use bytes::Bytes; use clap::{Parser, Subcommand}; -use client_native_lib::{ - connect, - peer::Peer, - state::{HasPeer, PeerInit}, - webrtc::data_channel::RTCDataChannel, - Config, -}; +use client_native_lib::{ connect, peer::Peer, webrtc::data_channel::RTCDataChannel, Config}; use log::{error, info}; use std::{future::Future, pin::Pin, sync::Arc}; use tokio::{ @@ -49,15 +43,10 @@ pub struct Args { async fn run() { let args = Args::parse(); - connect( - Config { - secret: args.secret.clone(), - signaling_host: args.signaling_host.clone(), - }, - Arc::new(Conn { - args: Arc::new(args), - }), - ) + connect(Config { + secret: args.secret.clone(), + signaling_host: args.signaling_host.clone(), + }) .await; tokio::signal::ctrl_c().await.unwrap(); @@ -99,141 +88,141 @@ impl Action { } } -pub struct Conn { - pub args: Arc<Args>, -} -pub struct PeerState { - args: Arc<Args>, - peer: Arc<Peer>, -} +// pub struct Conn { +// pub args: Arc<Args>, +// } +// pub struct PeerState { +// args: Arc<Args>, +// peer: Arc<Peer>, +// } -impl PeerInit<PeerState> for Conn { - fn add_peer( - &self, - peer: Arc<Peer>, - ) -> Pin<Box<(dyn Future<Output = Arc<PeerState>> + Send + Sync + 'static)>> { - let args = self.args.clone(); - Box::pin(async move { - let p = Arc::new(PeerState { peer, args }); - p.clone().init().await; - p - }) - } -} -impl HasPeer for PeerState { - fn peer(&self) -> &Arc<Peer> { - &self.peer - } -} -impl PeerState { - pub async fn init(self: Arc<Self>) { - let s = self.clone(); - match &self.args.action { - Action::Send { .. } => self.init_send_channel().await, - Action::Receive { .. } => { - self.peer - .peer_connection - .on_data_channel(box move |ch| { - let s = s.clone(); - Box::pin(async move { s.init_receive_channel(ch).await }) - }) - .await; - } - } - } +// impl PeerInit<PeerState> for Conn { +// fn add_peer( +// &self, +// peer: Arc<Peer>, +// ) -> Pin<Box<(dyn Future<Output = Arc<PeerState>> + Send + Sync + 'static)>> { +// let args = self.args.clone(); +// Box::pin(async move { +// let p = Arc::new(PeerState { peer, args }); +// p.clone().init().await; +// p +// }) +// } +// } +// impl HasPeer for PeerState { +// fn peer(&self) -> &Arc<Peer> { +// &self.peer +// } +// } +// impl PeerState { +// pub async fn init(self: Arc<Self>) { +// let s = self.clone(); +// match &self.args.action { +// Action::Send { .. } => self.init_send_channel().await, +// Action::Receive { .. } => { +// self.peer +// .peer_connection +// .on_data_channel(box move |ch| { +// let s = s.clone(); +// Box::pin(async move { s.init_receive_channel(ch).await }) +// }) +// .await; +// } +// } +// } - pub async fn init_receive_channel(self: Arc<Self>, channel: Arc<RTCDataChannel>) { - info!("got a data channel"); - let writer = Arc::new(RwLock::new(None)); - { - let writer = writer.clone(); - channel - .on_open(box move || { - info!("channel opened"); - Box::pin(async move { - *writer.write().await = Some(self.args.action.create_writer().await); - }) - }) - .await; - } - { - let writer = writer.clone(); - channel - .on_close(box move || { - info!("channel closed"); - let writer = writer.clone(); - Box::pin(async move { - *writer.write().await = None; // drop the writer, so it closes the file or whatever - }) - }) - .await; - } - { - let writer = writer.clone(); - channel - .on_message(box move |mesg| { - let writer = writer.clone(); - Box::pin(async move { - writer - .write() - .await - .as_mut() - .unwrap() - .write_all(&mesg.data) - .await - .unwrap(); - }) - }) - .await; - } - channel - .on_error(box move |err| { - info!("channel error: {err:?}"); - Box::pin(async {}) - }) - .await; - } +// pub async fn init_receive_channel(self: Arc<Self>, channel: Arc<RTCDataChannel>) { +// info!("got a data channel"); +// let writer = Arc::new(RwLock::new(None)); +// { +// let writer = writer.clone(); +// channel +// .on_open(box move || { +// info!("channel opened"); +// Box::pin(async move { +// *writer.write().await = Some(self.args.action.create_writer().await); +// }) +// }) +// .await; +// } +// { +// let writer = writer.clone(); +// channel +// .on_close(box move || { +// info!("channel closed"); +// let writer = writer.clone(); +// Box::pin(async move { +// *writer.write().await = None; // drop the writer, so it closes the file or whatever +// }) +// }) +// .await; +// } +// { +// let writer = writer.clone(); +// channel +// .on_message(box move |mesg| { +// let writer = writer.clone(); +// Box::pin(async move { +// writer +// .write() +// .await +// .as_mut() +// .unwrap() +// .write_all(&mesg.data) +// .await +// .unwrap(); +// }) +// }) +// .await; +// } +// channel +// .on_error(box move |err| { +// info!("channel error: {err:?}"); +// Box::pin(async {}) +// }) +// .await; +// } - pub async fn init_send_channel(&self) { - info!("creating data channel"); - let data_channel = self - .peer - .peer_connection - .create_data_channel("file-transfer", None) - .await - .unwrap(); - let weak = Arc::downgrade(&data_channel); - let args = self.args.clone(); - data_channel - .on_open(box move || { - let args = args.clone(); - let data_channel = weak.upgrade().unwrap(); - Box::pin(async move { - let mut reader = args.action.create_reader().await; - info!("starting transmission"); - loop { - let mut buf = [0u8; 4096]; - let size = reader.read(&mut buf).await.unwrap(); - if size == 0 { - break; - } - data_channel - .send(&Bytes::from_iter(buf[0..size].into_iter().map(|e| *e))) - .await - .unwrap(); - } - info!("transmission finished"); - drop(reader); - info!("now closing the channel again…"); - data_channel.close().await.unwrap(); - }) - }) - .await; - data_channel - .on_close(box || Box::pin(async move { info!("data channel closed") })) - .await; - data_channel - .on_error(box |err| Box::pin(async move { error!("data channel error: {err}") })) - .await; - } -} +// pub async fn init_send_channel(&self) { +// info!("creating data channel"); +// let data_channel = self +// .peer +// .peer_connection +// .create_data_channel("file-transfer", None) +// .await +// .unwrap(); +// let weak = Arc::downgrade(&data_channel); +// let args = self.args.clone(); +// data_channel +// .on_open(box move || { +// let args = args.clone(); +// let data_channel = weak.upgrade().unwrap(); +// Box::pin(async move { +// let mut reader = args.action.create_reader().await; +// info!("starting transmission"); +// loop { +// let mut buf = [0u8; 4096]; +// let size = reader.read(&mut buf).await.unwrap(); +// if size == 0 { +// break; +// } +// data_channel +// .send(&Bytes::from_iter(buf[0..size].into_iter().map(|e| *e))) +// .await +// .unwrap(); +// } +// info!("transmission finished"); +// drop(reader); +// info!("now closing the channel again…"); +// data_channel.close().await.unwrap(); +// }) +// }) +// .await; +// data_channel +// .on_close(box || Box::pin(async move { info!("data channel closed") })) +// .await; +// data_channel +// .on_error(box |err| Box::pin(async move { error!("data channel error: {err}") })) +// .await; +// } +// } |