|
|
|
@ -19,43 +19,43 @@ pub async fn listen( |
|
|
|
info!("Listening for control connections on {}", address);
|
|
|
|
|
|
|
|
while let Ok((raw_stream, addr)) = listener.accept().await {
|
|
|
|
info!("Accepted control connection from {}", addr);
|
|
|
|
|
|
|
|
let ws_stream = tokio_tungstenite::accept_async(raw_stream).await?;
|
|
|
|
info!("WebSocket connection established: {}", addr);
|
|
|
|
|
|
|
|
let (_outgoing, mut incoming) = ws_stream.split();
|
|
|
|
while let Some(result) = incoming.next().await {
|
|
|
|
let message = match result {
|
|
|
|
Ok(message) => message,
|
|
|
|
Err(err) => {
|
|
|
|
warn!("Error reading control message: {}", err);
|
|
|
|
continue
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
let text = match message.to_text() {
|
|
|
|
Ok(text) => text,
|
|
|
|
Err(err) => {
|
|
|
|
warn!("Received non-text control message: {}", err);
|
|
|
|
continue
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
debug!("Received a text message from {}: {}", addr, text);
|
|
|
|
|
|
|
|
// Decode the json control request.
|
|
|
|
let control_request: Request = match serde_json::from_str(&text) {
|
|
|
|
Ok(control_request) => control_request,
|
|
|
|
Err(e) => {
|
|
|
|
warn!("Received invalid JSON message from controller: {}", e);
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
debug!("Received control request: {:?}", control_request);
|
|
|
|
client_tx.send(Message::ControlRequest(control_request))?
|
|
|
|
}
|
|
|
|
info!("Accepted control connection from {}", addr);
|
|
|
|
|
|
|
|
let ws_stream = tokio_tungstenite::accept_async(raw_stream).await?;
|
|
|
|
info!("WebSocket connection established: {}", addr);
|
|
|
|
|
|
|
|
let (_outgoing, mut incoming) = ws_stream.split();
|
|
|
|
while let Some(result) = incoming.next().await {
|
|
|
|
let message = match result {
|
|
|
|
Ok(message) => message,
|
|
|
|
Err(err) => {
|
|
|
|
warn!("Error reading control message: {}", err);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let text = match message.to_text() {
|
|
|
|
Ok(text) => text,
|
|
|
|
Err(err) => {
|
|
|
|
warn!("Received non-text control message: {}", err);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
debug!("Received a text message from {}: {}", addr, text);
|
|
|
|
|
|
|
|
// Decode the json control request.
|
|
|
|
let control_request: Request = match serde_json::from_str(&text) {
|
|
|
|
Ok(control_request) => control_request,
|
|
|
|
Err(e) => {
|
|
|
|
warn!("Received invalid JSON message from controller: {}", e);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
debug!("Received control request: {:?}", control_request);
|
|
|
|
client_tx.send(Message::ControlRequest(control_request))?
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
|