Skip to content

fix(gateway): improve client registration error messages #485

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
kvinwang merged 1 commit into from
Jan 29, 2026
Merged

fix(gateway): improve client registration error messages #485

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
22 changes: 15 additions & 7 deletions gateway/src/main_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,15 @@ impl ProxyState {
id: &str,
app_id: &str,
public_key: &str,
) -> Option<InstanceInfo> {
if id.is_empty() || public_key.is_empty() || app_id.is_empty() {
return None;
) -> Result<InstanceInfo> {
if id.is_empty() {
bail!("instance_id is empty (no_instance_id is set?)");
}
if app_id.is_empty() {
bail!("app_id is empty");
}
if public_key.is_empty() {
bail!("public_key is empty");
}
if let Some(existing) = self.state.instances.get_mut(id) {
if existing.public_key != public_key {
Expand All @@ -348,12 +354,14 @@ impl ProxyState {
}
let existing = existing.clone();
if self.valid_ip(existing.ip) {
return Some(existing);
return Ok(existing);
}
info!("ip {} is invalid, removing", existing.ip);
self.state.allocated_addresses.remove(&existing.ip);
}
let ip = self.alloc_ip()?;
let ip = self
.alloc_ip()
.context("IP pool exhausted, no available addresses in client_ip_range")?;
let host_info = InstanceInfo {
id: id.to_string(),
app_id: app_id.to_string(),
Expand All @@ -364,7 +372,7 @@ impl ProxyState {
connections: Default::default(),
};
self.add_instance(host_info.clone());
Some(host_info)
Ok(host_info)
}

fn add_instance(&mut self, info: InstanceInfo) {
Expand Down Expand Up @@ -755,7 +763,7 @@ impl GatewayRpc for RpcHandler {
}
let client_info = state
.new_client_by_id(&instance_id, &app_id, &request.client_public_key)
.context("failed to allocate IP address for client")?;
.context("failed to register client")?;
if let Err(err) = state.reconfigure() {
error!("failed to reconfigure: {}", err);
}
Expand Down