bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Improve intercom and reduce meaningless error logging

Browse Source
This commit is contained in:
NG (Graham)
2026-08-09 18:02:45 -04:00
parent 961190a467
commit 52dc0519fb
7 changed files with 222 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
rc_auth/src/robocraft/intercom/lobby.rs
View File

@@ -5,12 +5,45 @@ use actix_web::{rt, web::{Payload, Data, Json, Path}, Error, HttpRequest, HttpRe
#[get("/intercom/userless/.oj_lobby")]
pub async fn lobby_state_ws(req: HttpRequest, stream: Payload, auth: Data<super::IntercomAuth>, reg: Data<super::Users>) -> Result<HttpResponse, Error> {
auth.validate(&req, "state/.oj_lobby")?;
let (res, mut session, _stream) = actix_ws::handle(&req, stream)?;
let (res, mut session, stream) = actix_ws::handle(&req, stream)?;
/*let mut stream = stream
let mut stream = stream
.aggregate_continuations()
.max_continuation_size(2_usize.pow(20)); // aggregate continuation frames up to 1MiB
*/
let mut session_rx = session.clone();
// start receiver task but don't wait for it
rt::spawn(async move {
while let Some(msg_result) = stream.recv().await {
match msg_result {
Ok(msg) => {
match msg {
actix_ws::AggregatedMessage::Text(s) => {
// TODO allow responses
log::debug!("Received `{}` ({}) from lobby websocket receiver", s, s.len());
},
actix_ws::AggregatedMessage::Binary(_) => {},
actix_ws::AggregatedMessage::Ping(p) => {
log::debug!("Received {}B ping from lobby websocket", p.len());
session_rx.pong(&p).await.unwrap_or_default();
},
actix_ws::AggregatedMessage::Pong(_) => {},
actix_ws::AggregatedMessage::Close(reason) => {
if let Some(reason) = reason {
log::info!("Closed lobby websocket receiver with reason {:?}", reason);
} else {
log::warn!("Closed lobby websocket receiver without reason");
}
break;
},
}
},
Err(e) => {
log::error!("Received lobby websocket error: {}", e);
},
}
}
});
let (tx, mut rx) = tokio::sync::mpsc::channel(16);
reg.register_lobby_state_service(tx).await;
@@ -19,6 +52,7 @@ pub async fn lobby_state_ws(req: HttpRequest, stream: Payload, auth: Data<super:
// start task but don't wait for it
rt::spawn(async move {
let mut is_ok = false;
session.ping(b"openjam").await.unwrap_or_default();
while let Some(op) = rx.recv().await {
match op {
super::IntercomOp::Message(msg) => {

48
rc_auth/src/robocraft/intercom/services.rs
View File

@@ -5,20 +5,58 @@ use actix_web::{rt, web::{Payload, Data, Path, Json}, Error, HttpRequest, HttpRe
#[get("/intercom/.oj_services/{name}")]
pub async fn services_ws(req: HttpRequest, stream: Payload, auth: Data<super::IntercomAuth>, reg: Data<super::Users>, name: Path<String>) -> Result<HttpResponse, Error> {
auth.validate(&req, &format!(".oj_services/{}", urlencoding::encode(&name)))?;
let (res, mut session, _stream) = actix_ws::handle(&req, stream)?;
let (res, mut session, stream) = actix_ws::handle(&req, stream)?;
/*let mut stream = stream
let mut stream = stream
.aggregate_continuations()
.max_continuation_size(2_usize.pow(20)); // aggregate continuation frames up to 1MiB
*/
let (tx, mut rx) = tokio::sync::mpsc::channel(16);
reg.register_web_service(name.clone(), tx).await;
reg.register_web_service(name.clone(), tx.clone()).await;
log::debug!("Registered web services intercom websocket for user {}", name);
// start task but don't wait for it
let name_rx: String = name.clone();
let mut session_rx = session.clone();
// start receiver task but don't wait for it
rt::spawn(async move {
while let Some(msg_result) = stream.recv().await {
match msg_result {
Ok(msg) => {
match msg {
actix_ws::AggregatedMessage::Text(s) => {
// TODO allow responses
log::debug!("Received `{}` ({}) from services websocket receiver for user {}", s, s.len(), name_rx);
},
actix_ws::AggregatedMessage::Binary(_) => {},
actix_ws::AggregatedMessage::Ping(p) => {
log::debug!("Received {}B ping from services websocket for user {}: {}", p.len(), name_rx, String::from_utf8_lossy(&p));
session_rx.pong(&p).await.unwrap_or_default();
},
actix_ws::AggregatedMessage::Pong(p) => {
log::debug!("Received {}B pong from services websocket for user {}: {}", p.len(), name_rx, String::from_utf8_lossy(&p));
},
actix_ws::AggregatedMessage::Close(reason) => {
if let Some(reason) = reason {
log::info!("Closed services websocket receiver for user {} with reason {:?}", name_rx, reason);
} else {
log::warn!("Closed services websocket receiver for user {} without reason", name_rx);
}
break;
},
}
},
Err(e) => {
log::warn!("Received services websocket error for user {}: {}", name_rx, e);
},
}
}
tx.send(crate::robocraft::intercom::IntercomOp::Info(crate::robocraft::intercom::IntercomInfo::Close)).await.unwrap_or_default();
});
// start sender task but don't wait for it
rt::spawn(async move {
let mut is_ok = false;
session.ping(b"openjam").await.unwrap_or_default();
while let Some(op) = rx.recv().await {
match op {
super::IntercomOp::Message(msg) => {