From 5a712ded22b202e4617aa2c3f67306c640d05a65 Mon Sep 17 00:00:00 2001 From: Ruben De Smet Date: Tue, 29 Dec 2020 16:29:19 +0100 Subject: [PATCH 1/5] Bytes 1.0 and prost 0.7 --- libsignal-service-actix/Cargo.toml | 2 +- libsignal-service/Cargo.toml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libsignal-service-actix/Cargo.toml b/libsignal-service-actix/Cargo.toml index aff78af24..12786a881 100644 --- a/libsignal-service-actix/Cargo.toml +++ b/libsignal-service-actix/Cargo.toml @@ -17,7 +17,7 @@ actix-rt = "1.1" mpart-async = "0.4.2" serde_json = "1.0" futures = "0.3" -bytes = "0.5" +bytes = "1" rustls = "0.18" url = "2.1" serde = "1.0" diff --git a/libsignal-service/Cargo.toml b/libsignal-service/Cargo.toml index 00186e6f5..48dc973f8 100644 --- a/libsignal-service/Cargo.toml +++ b/libsignal-service/Cargo.toml @@ -11,12 +11,12 @@ libsignal-protocol = { git = "https://github.com/Michael-F-Bryan/libsignal-proto async-trait = "0.1.30" url = { version = "2.1.1", features = ["serde"] } base64 = "0.13" -bytes = "0.5" +bytes = "1" futures = "0.3" pin-project = "1.0" thiserror = "1.0" serde = {version = "1.0", features=["derive"]} -prost = "0.6" +prost = "0.7" http = "0.2.1" log = "0.4.8" @@ -29,7 +29,7 @@ block-modes = "0.7.0" rand = "0.8.0" [build-dependencies] -prost-build = "0.6" +prost-build = "0.7" [dev-dependencies] anyhow = "1.0" From fdb3fc86f3d71d56bc732e925dd650227ec16743 Mon Sep 17 00:00:00 2001 From: Ruben De Smet Date: Sun, 3 Jan 2021 18:21:19 +0100 Subject: [PATCH 2/5] Tokio 1.0 and Actix 0.11 --- libsignal-service-actix/Cargo.toml | 8 ++++---- libsignal-service/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libsignal-service-actix/Cargo.toml b/libsignal-service-actix/Cargo.toml index 12786a881..492313207 100644 --- a/libsignal-service-actix/Cargo.toml +++ b/libsignal-service-actix/Cargo.toml @@ -11,9 +11,9 @@ libsignal-service = { path = "../libsignal-service" } libsignal-protocol = { git = "https://github.com/Michael-F-Bryan/libsignal-protocol-rs" } awc = { version = "2.0.0", features=["rustls"] } -actix = "0.10.0" -actix-http = "2.1.0" -actix-rt = "1.1" +actix = "0.11.0-beta.1" +actix-http = "2.2.0" +actix-rt = "2.0.0-beta.1" mpart-async = "0.4.2" serde_json = "1.0" futures = "0.3" @@ -36,4 +36,4 @@ opener = "0.4" qrcode = "0.12" rand = "0.8" structopt = "0.3" -tokio = { version = "0.2", features=["macros"] } +tokio = { version = "1", features=["macros"] } diff --git a/libsignal-service/Cargo.toml b/libsignal-service/Cargo.toml index 48dc973f8..1067ad8f3 100644 --- a/libsignal-service/Cargo.toml +++ b/libsignal-service/Cargo.toml @@ -17,7 +17,7 @@ pin-project = "1.0" thiserror = "1.0" serde = {version = "1.0", features=["derive"]} prost = "0.7" -http = "0.2.1" +http = "0.2.2" log = "0.4.8" sha2 = "0.9.0" From 8e275d9ba6e62d9a9b226ce80c45769dcda81f1d Mon Sep 17 00:00:00 2001 From: Ruben De Smet Date: Fri, 8 Jan 2021 10:45:13 +0100 Subject: [PATCH 3/5] awc 3.0, actix-http 3.0, rustls 0.19 --- libsignal-service-actix/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libsignal-service-actix/Cargo.toml b/libsignal-service-actix/Cargo.toml index 492313207..c86660495 100644 --- a/libsignal-service-actix/Cargo.toml +++ b/libsignal-service-actix/Cargo.toml @@ -10,15 +10,15 @@ edition = "2018" libsignal-service = { path = "../libsignal-service" } libsignal-protocol = { git = "https://github.com/Michael-F-Bryan/libsignal-protocol-rs" } -awc = { version = "2.0.0", features=["rustls"] } +awc = { version = "3.0.0-beta.1", features=["rustls"] } actix = "0.11.0-beta.1" -actix-http = "2.2.0" +actix-http = "3.0.0-beta.1" actix-rt = "2.0.0-beta.1" mpart-async = "0.4.2" serde_json = "1.0" futures = "0.3" bytes = "1" -rustls = "0.18" +rustls = "0.19" url = "2.1" serde = "1.0" log = "0.4.8" From 2ebe0d768816660a8bdb76e194f36e883c5f390b Mon Sep 17 00:00:00 2001 From: Ruben De Smet Date: Fri, 8 Jan 2021 11:17:17 +0100 Subject: [PATCH 4/5] Fix Interval usage --- libsignal-service-actix/src/websocket.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libsignal-service-actix/src/websocket.rs b/libsignal-service-actix/src/websocket.rs index 4ec02b5d9..1208f8728 100644 --- a/libsignal-service-actix/src/websocket.rs +++ b/libsignal-service-actix/src/websocket.rs @@ -67,12 +67,13 @@ where let mut ka_interval = actix::clock::interval_at( actix::clock::Instant::now(), push_service::KEEPALIVE_TIMEOUT_SECONDS, - ) - .fuse(); + ); loop { + let tick = ka_interval.tick().fuse(); + futures::pin_mut!(tick); futures::select! { - _ = ka_interval.next() => { + _ = tick => { log::trace!("Triggering keep-alive"); if let Err(e) = incoming_sink.send(WebSocketStreamItem::KeepAliveRequest).await { log::info!("Websocket sink has closed: {:?}.", e); From 9a17c451c17e3eb7ee931530408801d78585bee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Sun, 24 Jan 2021 13:12:28 +0100 Subject: [PATCH 5/5] Upgrade mpart-async to 0.5 --- libsignal-service-actix/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libsignal-service-actix/Cargo.toml b/libsignal-service-actix/Cargo.toml index c86660495..eb89fbe4e 100644 --- a/libsignal-service-actix/Cargo.toml +++ b/libsignal-service-actix/Cargo.toml @@ -14,14 +14,14 @@ awc = { version = "3.0.0-beta.1", features=["rustls"] } actix = "0.11.0-beta.1" actix-http = "3.0.0-beta.1" actix-rt = "2.0.0-beta.1" -mpart-async = "0.4.2" +mpart-async = "0.5.0" serde_json = "1.0" futures = "0.3" bytes = "1" rustls = "0.19" url = "2.1" serde = "1.0" -log = "0.4.8" +log = "0.4" rand = "0.8" failure = "0.1.5"