actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2025-06-29 02:10:36 +02:00
Code Issues Releases Wiki Activity

upgrade actix-web to 0.6

Browse Source
This commit is contained in:
Nikolay Kim
2018-05-08 11:08:43 -07:00
parent 27de52b5d5
commit bbeb262a5c
55 changed files with 689 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
websocket-chat/src/client.rs
View File

@ -1,26 +1,27 @@
#[macro_use] extern crate actix;
extern crate bytes;
#[macro_use]
extern crate actix;
extern crate byteorder;
extern crate bytes;
extern crate futures;
extern crate tokio_io;
extern crate tokio_core;
extern crate serde;
extern crate serde_json;
#[macro_use] extern crate serde_derive;
extern crate tokio_core;
extern crate tokio_io;
#[macro_use]
extern crate serde_derive;
use std::{io, net, process, thread};
use actix::prelude::*;
use futures::Future;
use std::str::FromStr;
use std::time::Duration;
use futures::Future;
use tokio_io::AsyncRead;
use tokio_io::io::WriteHalf;
use tokio_io::codec::FramedRead;
use std::{io, net, process, thread};
use tokio_core::net::TcpStream;
use actix::prelude::*;
use tokio_io::codec::FramedRead;
use tokio_io::io::WriteHalf;
use tokio_io::AsyncRead;
mod codec;
fn main() {
let sys = actix::System::new("chat-client");
@ -31,22 +32,28 @@ fn main() {
.and_then(|stream| {
let addr: Addr<Syn, _> = ChatClient::create(|ctx| {
let (r, w) = stream.split();
ChatClient::add_stream(FramedRead::new(r, codec::ClientChatCodec), ctx);
ChatClient{
ChatClient::add_stream(
FramedRead::new(r, codec::ClientChatCodec),
ctx,
);
ChatClient {
framed: actix::io::FramedWrite::new(
w, codec::ClientChatCodec, ctx)}});
w,
codec::ClientChatCodec,
ctx,
),
}
});
// start console loop
thread::spawn(move|| {
loop {
let mut cmd = String::new();
if io::stdin().read_line(&mut cmd).is_err() {
println!("error");
return
}
addr.do_send(ClientCommand(cmd));
thread::spawn(move || loop {
let mut cmd = String::new();
if io::stdin().read_line(&mut cmd).is_err() {
println!("error");
return;
}
addr.do_send(ClientCommand(cmd));
});
futures::future::ok(())
@ -54,14 +61,13 @@ fn main() {
.map_err(|e| {
println!("Can not connect to server: {}", e);
process::exit(1)
})
}),
);
println!("Running chat client");
sys.run();
}
struct ChatClient {
framed: actix::io::FramedWrite<WriteHalf<TcpStream>, codec::ClientChatCodec>,
}
@ -103,7 +109,7 @@ impl Handler<ClientCommand> for ChatClient {
fn handle(&mut self, msg: ClientCommand, _: &mut Context<Self>) {
let m = msg.0.trim();
if m.is_empty() {
return
return;
}
// we check for /sss type of messages
@ -112,18 +118,20 @@ impl Handler<ClientCommand> for ChatClient {
match v[0] {
"/list" => {
self.framed.write(codec::ChatRequest::List);
},
}
"/join" => {
if v.len() == 2 {
self.framed.write(codec::ChatRequest::Join(v[1].to_owned()));
self.framed
.write(codec::ChatRequest::Join(v[1].to_owned()));
} else {
println!("!!! room name is required");
}
},
}
_ => println!("!!! unknown command"),
}
} else {
self.framed.write(codec::ChatRequest::Message(m.to_owned()));
self.framed
.write(codec::ChatRequest::Message(m.to_owned()));
}
}
}
@ -131,7 +139,6 @@ impl Handler<ClientCommand> for ChatClient {
/// Server communication
impl StreamHandler<codec::ChatResponse, io::Error> for ChatClient {
fn handle(&mut self, msg: codec::ChatResponse, _: &mut Context<Self>) {
match msg {
codec::ChatResponse::Message(ref msg) => {