andras/vault-link
andras/vault-link
Watch
1
0
Fork
You've already forked vault-link
 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 26

Remove path repetition

Browse source
This commit is contained in:
Andras Schmelczer 2026-09-19 19:58:57 +01:00
commit 2a7a19fdf0
1 changed files with 65 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sync-server/src/server/endpoints/websocket.rs
View file

@ -9,7 +9,6 @@ use crate::{
},
},
errors::{SyncServerError, client_error, server_error},
utils::normalize_vault_id::normalize_vault_id,
};
use axum::{
extract::{
@ -20,29 +19,21 @@ use axum::{
};
use futures::StreamExt;
use log::{debug, info};
use serde::Deserialize;
use std::time::Duration;
use tokio::sync::broadcast::error::RecvError;
#[derive(Deserialize)]
pub struct WebSocketPathParams {
#[serde(deserialize_with = "normalize_vault_id")]
vault_id: VaultId,
}
use super::VaultPath;
#[axum::debug_handler]
pub async fn websocket_handler(
ws: WebSocketUpgrade,
Path(path): Path<WebSocketPathParams>,
Path(VaultPath(vault_id)): Path<VaultPath>,
State(state): State<AppState>,
) -> Result<Response, SyncServerError> {
debug!(
"Upgrading WebSocket connection for vault `{}`",
path.vault_id
);
debug!("Upgrading WebSocket connection for vault `{vault_id}`");
Ok(ws.on_upgrade(move |socket| async move {
if let Err(error) = websocket(state, socket, path.vault_id).await {
if let Err(error) = websocket(state, socket, vault_id).await {
debug!("WebSocket disconnected: {error}");
}
}))