actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 14:49:20 +02:00
Code Issues Releases Wiki Activity

add TakeRequest service; update ws test case

Browse Source
This commit is contained in:
Nikolay Kim
2018-10-05 15:39:35 -07:00
parent 7e135b798b
commit c0699a070e
4 changed files with 114 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
tests/test_ws.rs
View File

@ -9,8 +9,9 @@ use std::{io, thread};
use actix::System;
use actix_net::codec::Framed;
use actix_net::framed::IntoFramed;
use actix_net::server::Server;
use actix_net::service::IntoNewService;
use actix_net::service::NewServiceExt;
use actix_web::{test, ws as web_ws};
use bytes::Bytes;
use futures::future::{ok, Either};
@ -18,7 +19,7 @@ use futures::{Future, Sink, Stream};
use actix_http::{h1, ws, ResponseError};
fn ws_handler(req: ws::Message) -> impl Future<Item = ws::Message, Error = io::Error> {
fn ws_service(req: ws::Message) -> impl Future<Item = ws::Message, Error = io::Error> {
match req {
ws::Message::Ping(msg) => ok(ws::Message::Pong(msg)),
ws::Message::Text(text) => ok(ws::Message::Text(text)),
@ -34,46 +35,40 @@ fn test_simple() {
thread::spawn(move || {
Server::new()
.bind("test", addr, move || {
(|io| {
// read http request
let framed = Framed::new(io, h1::Codec::new(false));
framed
.into_future()
.map_err(|_| ())
.and_then(|(req, framed)| {
// validate request
if let Some(h1::InMessage::MessageWithPayload(req)) = req {
match ws::handshake(&req) {
Err(e) => {
// validation failed
let resp = e.error_response();
Either::A(
framed
.send(h1::OutMessage::Response(resp))
.map_err(|_| ())
.map(|_| ()),
)
}
Ok(mut resp) => Either::B(
// send response
IntoFramed::new(|| h1::Codec::new(false))
.and_then(h1::TakeRequest::new().map_err(|_| ()))
.and_then(|(req, framed): (_, Framed<_, _>)| {
// validate request
if let Some(h1::InMessage::MessageWithPayload(req)) = req {
match ws::handshake(&req) {
Err(e) => {
// validation failed
let resp = e.error_response();
Either::A(
framed
.send(h1::OutMessage::Response(
resp.finish(),
)).map_err(|_| ())
.and_then(|framed| {
// start websocket service
let framed =
framed.into_framed(ws::Codec::new());
ws::Transport::with(framed, ws_handler)
.map_err(|_| ())
}),
),
.send(h1::OutMessage::Response(resp))
.map_err(|_| ())
.map(|_| ()),
)
}
} else {
panic!()
Ok(mut resp) => Either::B(
// send response
framed
.send(h1::OutMessage::Response(resp.finish()))
.map_err(|_| ())
.and_then(|framed| {
// start websocket service
let framed =
framed.into_framed(ws::Codec::new());
ws::Transport::with(framed, ws_service)
.map_err(|_| ())
}),
),
}
})
}).into_new_service()
} else {
panic!()
}
})
}).unwrap()
.run();
});