Skip to content

fix(api-status): auto-delete lobby after testing connection #770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2024
Merged

fix(api-status): auto-delete lobby after testing connection #770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 44 additions & 3 deletions svc/api/status/src/route/matchmaker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,51 @@ pub async fn status(
}
};

let port_default = unwrap!(res.lobby.ports.get("default"));
// Test connection, defer error
let lobby_id = res.lobby.lobby_id.clone();
let test_res = tokio::time::timeout(
Duration::from_secs(15),
test_lobby_connection(res.lobby, res.player),
)
.await;

// Shut down lobby regardless of connection status
//
// This way if the connection fails to connect, we still clean up the lobby instead of spamming
// lobbies with unconnected players
msg!([ctx] mm::msg::lobby_stop(lobby_id) {
lobby_id: Some(lobby_id.into()),
})
.await?;

// Unwrap res
match test_res {
Ok(Ok(())) => {}
Ok(Err(err)) => {
return Err(err);
}
Err(_) => {
bail_with!(
INTERNAL_STATUS_CHECK_FAILED,
error = "test lobby connection timed out"
)
}
}
// if let Err(err) = test_res {
// return Err(err);
// }

Ok(serde_json::json!({}))
}

async fn test_lobby_connection(
lobby: Box<models::MatchmakerJoinLobby>,
player: Box<models::MatchmakerJoinPlayer>,
) -> GlobalResult<()> {
let port_default = unwrap!(lobby.ports.get("default"));
let host = unwrap_ref!(port_default.host);
let hostname = &port_default.hostname;
let token = &res.player.token;
let token = &player.token;

// Look up IP for GG nodes
let gg_ips = lookup_dns(hostname).await?;
Expand Down Expand Up @@ -200,7 +241,7 @@ pub async fn status(
)
})?;

Ok(serde_json::json!({}))
Ok(())
}

/// Returns the IP addresses for a given hostname.
Expand Down