klink/sneedstr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Return ["CLOSED"] on failing subscriptions

Browse source
This commit is contained in:
Tony Klink 2024-01-15 09:33:11 -06:00
parent 97b0020a28
commit ec0b068388
Signed by: klink
GPG key ID: 85175567C4D19231
3 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/relay/ws.rs
View file

@ -31,6 +31,12 @@ pub async fn client_connection(ws: WebSocket, context: Context, client_addr: Opt
tokio::select! {
Ok(message) = subscriber.recv() => {
match message.content {
crate::bussy::Command::ClientSubscriptionError(error_message) => {
if let Some(sender) = &client.client_connection {
log::info!("[Relay] sending [\"CLOSED\"] event to client: {}", client.client_id);
if !sender.is_closed() {sender.send(Ok(Message::text(error_message))).unwrap()};
}
},
crate::bussy::Command::PipelineResRelayMessageOk(client_id, relay_message) => {
if client.client_id == client_id {
if let Some(sender) = &client.client_connection {
@ -226,7 +232,30 @@ async fn handle_req(
let subscription = Subscription::new(subscription_id.clone(), filters);
let needs_historical_events = subscription.needs_historical_events();
client.subscribe(subscription.clone()).unwrap();
if let Err(subscription_error) = client.subscribe(subscription.clone()) {
log::error!(
"Error on handle_req. client IP: {:?}, message: {}",
client.ip(),
&subscription_error.message
);
let message = format!(
"[\"CLOSED\", \"{}\", \"{}\"]",
subscription_id, subscription_error.message
);
context
.pubsub
.publish(
channels::MSG_RELAY,
crate::bussy::Message {
source: channels::MSG_RELAY,
content: crate::bussy::Command::ClientSubscriptionError(message),
},
)
.await;
return;
};
if needs_historical_events {
context