cleaned up connection initator
This commit is contained in:
parent
71fa54c221
commit
f5d253eb94
|
|
@ -1,14 +1,7 @@
|
||||||
use std::net::SocketAddr;
|
use std::net::SocketAddr;
|
||||||
|
|
||||||
use actix::{
|
use actix::{
|
||||||
Actor,
|
Actor, ActorContext, Addr, AsyncContext, Context, Handler, Message,
|
||||||
ActorContext,
|
|
||||||
Addr,
|
|
||||||
AsyncContext,
|
|
||||||
Context,
|
|
||||||
Handler,
|
|
||||||
Message,
|
|
||||||
Recipient,
|
|
||||||
WeakRecipient,
|
WeakRecipient,
|
||||||
};
|
};
|
||||||
use foundation::{
|
use foundation::{
|
||||||
|
|
@ -25,12 +18,6 @@ use crate::{
|
||||||
prelude::messages::ObservableMessage,
|
prelude::messages::ObservableMessage,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy)]
|
|
||||||
enum ConnectionPhase {
|
|
||||||
Started,
|
|
||||||
Requested,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Message)]
|
#[derive(Message)]
|
||||||
#[rtype(result = "()")]
|
#[rtype(result = "()")]
|
||||||
pub(crate) enum InitiatorOutput {
|
pub(crate) enum InitiatorOutput {
|
||||||
|
|
@ -65,13 +52,11 @@ impl ConnectionInitiator {
|
||||||
&mut self,
|
&mut self,
|
||||||
sender: Addr<Connection>,
|
sender: Addr<Connection>,
|
||||||
ctx: &mut <Self as Actor>::Context,
|
ctx: &mut <Self as Actor>::Context,
|
||||||
address: SocketAddr,
|
_address: SocketAddr,
|
||||||
data: String,
|
data: String,
|
||||||
) {
|
) {
|
||||||
use InitiatorOutput::{ClientRequest, InfoRequest};
|
use InitiatorOutput::{ClientRequest, InfoRequest};
|
||||||
use NetworkSockIn::{Connect, Info};
|
use NetworkSockIn::{Connect, Info};
|
||||||
use NetworkSockOut::{Connecting, GotInfo};
|
|
||||||
use ObservableMessage::Unsubscribe;
|
|
||||||
|
|
||||||
let msg = from_str::<NetworkSockIn>(data.as_str());
|
let msg = from_str::<NetworkSockIn>(data.as_str());
|
||||||
if let Err(e) = msg.as_ref() {
|
if let Err(e) = msg.as_ref() {
|
||||||
|
|
@ -155,8 +140,8 @@ impl Handler<ConnectionOuput> for ConnectionInitiator {
|
||||||
msg: ConnectionOuput,
|
msg: ConnectionOuput,
|
||||||
ctx: &mut Self::Context,
|
ctx: &mut Self::Context,
|
||||||
) -> Self::Result {
|
) -> Self::Result {
|
||||||
use ConnectionOuput::{ConnectionClosed, RecvData};
|
use ConnectionOuput::RecvData;
|
||||||
use ConnectionPhase::Requested;
|
|
||||||
if let RecvData(sender, addr, data) = msg {
|
if let RecvData(sender, addr, data) = msg {
|
||||||
self.handle_request(sender, ctx, addr, data)
|
self.handle_request(sender, ctx, addr, data)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue