Page MenuHomePhabricator
Files F3505116

D10533.id35372.diff
No OneTemporary
Actions

D10533.id35372.diff
View Options

diff --git a/shared/backup_client/src/lib.rs b/shared/backup_client/src/lib.rs
--- a/shared/backup_client/src/lib.rs
+++ b/shared/backup_client/src/lib.rs
@@ -13,6 +13,7 @@
Body,
};
use sha2::{Digest, Sha256};
+use tokio_tungstenite::tungstenite::Message;
use tokio_tungstenite::{
connect_async,
tungstenite::{
@@ -142,17 +143,10 @@
});
let rx = rx.filter_map(|msg| async {
- let bytes = match msg {
- Ok(Binary(bytes)) => bytes,
- // Handled by tungstenite
- Ok(Ping(_)) => return None,
- Ok(_) => return Some(Err(WSError::InvalidWSMessage)),
- Err(err) => return Some(Err(err.into())),
- };
-
- let response = match bincode::deserialize(&bytes) {
- Ok(response) => response,
- Err(err) => return Some(Err(err.into())),
+ let response = match get_log_ws_response(msg) {
+ Some(Ok(response)) => response,
+ Some(Err(err)) => return Some(Err(err)),
+ None => return None,
};
match response {
@@ -168,6 +162,52 @@
Ok((tx, rx))
}
+ pub async fn download_logs(
+ &self,
+ user_identity: &UserIdentity,
+ backup_id: &str,
+ ) -> Result<
+ (
+ impl Sink<DownloadLogsRequest, Error = WSError>,
+ impl Stream<Item = Result<LogWSResponse, WSError>>,
+ ),
+ Error,
+ > {
+ let request = self.create_ws_request(user_identity, backup_id)?;
+ let (stream, response) = connect_async(request).await?;
+
+ if response.status().is_client_error() {
+ return Err(Error::WSInitError(TungsteniteError::Http(response)));
+ }
+
+ let (tx, rx) = stream.split();
+
+ let tx = tx.with(|request: DownloadLogsRequest| async {
+ let request = LogWSRequest::DownloadLogs(request);
+ let request = bincode::serialize(&request)?;
+ Ok(Binary(request))
+ });
+
+ let rx = rx.filter_map(|msg| async {
+ let response = match get_log_ws_response(msg) {
+ Some(Ok(response)) => response,
+ Some(Err(err)) => return Some(Err(err)),
+ None => return None,
+ };
+
+ match response {
+ LogWSResponse::LogDownloadFinished { .. }
+ | LogWSResponse::LogDownload { .. } => Some(Ok(response)),
+ LogWSResponse::LogUploaded { .. } => {
+ return Some(Err(WSError::InvalidBackupMessage))
+ }
+ LogWSResponse::ServerError => return Some(Err(WSError::ServerError)),
+ }
+ });
+
+ Ok((tx, rx))
+ }
+
fn create_ws_request(
&self,
user_identity: &UserIdentity,
@@ -246,3 +286,20 @@
InvalidBackupMessage,
ServerError,
}
+
+fn get_log_ws_response(
+ msg: Result<Message, TungsteniteError>,
+) -> Option<Result<LogWSResponse, WSError>> {
+ let bytes = match msg {
+ Ok(Binary(bytes)) => bytes,
+ // Handled by tungstenite
+ Ok(Ping(_)) => return None,
+ Ok(_) => return Some(Err(WSError::InvalidWSMessage)),
+ Err(err) => return Some(Err(err.into())),
+ };
+
+ match bincode::deserialize(&bytes) {
+ Ok(response) => Some(Ok(response)),
+ Err(err) => Some(Err(err.into())),
+ }
+}

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 12:16 PM (20 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2687646
Default Alt Text
D10533.id35372.diff (3 KB)

Event Timeline