mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-21 09:14:34 +00:00
revise the ws test to use a more reliable server
This commit is contained in:
parent
ad155358f3
commit
3de588ccef
2 changed files with 43 additions and 18 deletions
|
|
@ -118,4 +118,4 @@ dbg-ecupdate = [] # for issuing manual commands to initiate an EC update (vs UX)
|
||||||
test-rekey = []
|
test-rekey = []
|
||||||
nettest = [] # batch network tests
|
nettest = [] # batch network tests
|
||||||
tls = ["rustls", "webpki-roots", "ring", "tungstenite", "url"]
|
tls = ["rustls", "webpki-roots", "ring", "tungstenite", "url"]
|
||||||
default = [] # "debugprint"
|
default = ["tls"] # "debugprint"
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,8 @@ use std::str::FromStr;
|
||||||
#[cfg(feature="ditherpunk")]
|
#[cfg(feature="ditherpunk")]
|
||||||
use gam::DecodePng;
|
use gam::DecodePng;
|
||||||
use std::convert::TryInto;
|
use std::convert::TryInto;
|
||||||
|
#[cfg(feature="tls")]
|
||||||
|
use tungstenite::{WebSocket, stream::MaybeTlsStream};
|
||||||
|
|
||||||
pub struct NetCmd {
|
pub struct NetCmd {
|
||||||
callback_id: Option<u32>,
|
callback_id: Option<u32>,
|
||||||
|
|
@ -26,6 +28,8 @@ pub struct NetCmd {
|
||||||
dns: Dns,
|
dns: Dns,
|
||||||
#[cfg(any(target_os = "none", target_os = "xous"))]
|
#[cfg(any(target_os = "none", target_os = "xous"))]
|
||||||
ping: Option<net::Ping>,
|
ping: Option<net::Ping>,
|
||||||
|
#[cfg(feature="tls")]
|
||||||
|
ws: Option<WebSocket<MaybeTlsStream<TcpStream>>>,
|
||||||
}
|
}
|
||||||
impl NetCmd {
|
impl NetCmd {
|
||||||
pub fn new(xns: &xous_names::XousNames) -> Self {
|
pub fn new(xns: &xous_names::XousNames) -> Self {
|
||||||
|
|
@ -35,6 +39,7 @@ impl NetCmd {
|
||||||
dns: dns::Dns::new(&xns).unwrap(),
|
dns: dns::Dns::new(&xns).unwrap(),
|
||||||
#[cfg(any(target_os = "none", target_os = "xous"))]
|
#[cfg(any(target_os = "none", target_os = "xous"))]
|
||||||
ping: None,
|
ping: None,
|
||||||
|
ws: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -394,22 +399,27 @@ impl<'a> ShellCmdApi<'a> for NetCmd {
|
||||||
}
|
}
|
||||||
#[cfg(feature="tls")]
|
#[cfg(feature="tls")]
|
||||||
"ws" => {
|
"ws" => {
|
||||||
let (mut socket, response) =
|
if self.ws.is_none() {
|
||||||
tungstenite::connect(url::Url::parse("wss://javascript.info/article/websocket/demo/hello").unwrap()).expect("Can't connect");
|
let (socket, response) =
|
||||||
|
tungstenite::connect(url::Url::parse("wss://awake.noskills.club/ws").unwrap()).expect("Can't connect");
|
||||||
|
|
||||||
log::info!("Connected to the server");
|
log::info!("Connected to the server");
|
||||||
log::info!("Response HTTP code: {}", response.status());
|
log::info!("Response HTTP code: {}", response.status());
|
||||||
log::info!("Response contains the following headers:");
|
log::info!("Response contains the following headers:");
|
||||||
for (ref header, _value) in response.headers() {
|
for (ref header, _value) in response.headers() {
|
||||||
log::info!("* {}", header);
|
log::info!("* {}", header);
|
||||||
|
}
|
||||||
|
self.ws = Some(socket);
|
||||||
}
|
}
|
||||||
if let Some(msg) = tokens.next() {
|
let mut err = false;
|
||||||
socket.write_message(tungstenite::Message::Text(msg.into())).unwrap();
|
if let Some(socket) = &mut self.ws {
|
||||||
|
let mut val = String::<1024>::new();
|
||||||
} else {
|
join_tokens(&mut val, &mut tokens);
|
||||||
socket.write_message(tungstenite::Message::Text("Hello WebSocket".into())).unwrap();
|
if val.len() > 0 {
|
||||||
}
|
socket.write_message(tungstenite::Message::Text(val.as_str().unwrap().into())).unwrap();
|
||||||
loop {
|
} else {
|
||||||
|
socket.write_message(tungstenite::Message::Text("Hello WebSocket".into())).unwrap();
|
||||||
|
}
|
||||||
match socket.read_message() {
|
match socket.read_message() {
|
||||||
Ok(msg) => {
|
Ok(msg) => {
|
||||||
log::info!("Received: {}", msg);
|
log::info!("Received: {}", msg);
|
||||||
|
|
@ -417,12 +427,15 @@ impl<'a> ShellCmdApi<'a> for NetCmd {
|
||||||
},
|
},
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::info!("got ws error: {:?}, quitting", e);
|
log::info!("got ws error: {:?}, quitting", e);
|
||||||
break;
|
err = true;
|
||||||
|
socket.close(None).ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
socket.close(None).ok();
|
if err {
|
||||||
write!(ret, "\nWeb socket session closed.").ok();
|
self.ws.take();
|
||||||
|
write!(ret, "\nWeb socket session closed.").ok();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#[cfg(feature="tls")]
|
#[cfg(feature="tls")]
|
||||||
"tls" => {
|
"tls" => {
|
||||||
|
|
@ -787,3 +800,15 @@ fn heap_usage() -> usize {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature ="tls")]
|
||||||
|
fn join_tokens<'a>(buf: &mut String<1024>, tokens: impl Iterator<Item = &'a str>) {
|
||||||
|
use core::fmt::Write;
|
||||||
|
for (i, tok) in tokens.enumerate() {
|
||||||
|
if i == 0 {
|
||||||
|
write!(buf, "{}", tok).unwrap();
|
||||||
|
} else {
|
||||||
|
write!(buf, " {}", tok).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue