Mirrors/asciinema
1
0
Fork 0
mirror of https://github.com/asciinema/asciinema.git synced 2026-05-18 05:04:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make const durations in forwarder actual Duration values

Browse Source
This commit is contained in:
Marcin Kulik
2026-04-16 15:37:26 +02:00
parent 728a1fd65f
commit 47565bab8c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/forwarder.rs
View File

@@ -22,11 +22,11 @@ use crate::api;
use crate::notifier::Notifier; use crate::notifier::Notifier;
use crate::stream::{Event, Subscriber}; use crate::stream::{Event, Subscriber};
const PING_INTERVAL: u64 = 15; const PING_INTERVAL: Duration = Duration::from_secs(15);
const PING_TIMEOUT: u64 = 10; const PING_TIMEOUT: Duration = Duration::from_secs(10);
const SEND_TIMEOUT: u64 = 10; const SEND_TIMEOUT: Duration = Duration::from_secs(10);
const RECONNECT_DELAY_BASE: u64 = 500; const RECONNECT_DELAY_BASE_MS: u64 = 500;
const RECONNECT_DELAY_CAP: u64 = 10_000; const RECONNECT_DELAY_CAP_MS: u64 = 10_000;
pub async fn forward<N: Notifier>( pub async fn forward<N: Notifier>(
url: url::Url, url: url::Url,
@@ -192,7 +192,7 @@ where
ping = pings.next() => { ping = pings.next() => {
send_with_timeout(&mut sink, ping.unwrap()).await??; send_with_timeout(&mut sink, ping.unwrap()).await??;
ping_timeout = Box::pin(time::sleep(Duration::from_secs(PING_TIMEOUT))); ping_timeout = Box::pin(time::sleep(PING_TIMEOUT));
} }
_ = &mut ping_timeout => bail!("ping timeout"), _ = &mut ping_timeout => bail!("ping timeout"),
@@ -223,7 +223,7 @@ async fn send_with_timeout(
sink: &mut SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, Message>, sink: &mut SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, Message>,
message: Message, message: Message,
) -> anyhow::Result<Result<(), tungstenite::Error>> { ) -> anyhow::Result<Result<(), tungstenite::Error>> {
time::timeout(Duration::from_secs(SEND_TIMEOUT), sink.send(message)) time::timeout(SEND_TIMEOUT, sink.send(message))
.await .await
.map_err(|_| anyhow!("send timeout")) .map_err(|_| anyhow!("send timeout"))
} }
@@ -249,7 +249,7 @@ fn handle_close_frame(frame: Option<CloseFrame>) -> anyhow::Result<()> {
fn exponential_delay(attempt: usize) -> u64 { fn exponential_delay(attempt: usize) -> u64 {
let mut rng = rand::rng(); let mut rng = rand::rng();
let attempt = attempt.min(10); let attempt = attempt.min(10);
let exp = (RECONNECT_DELAY_BASE * 2_u64.pow(attempt as u32)).min(RECONNECT_DELAY_CAP); let exp = (RECONNECT_DELAY_BASE_MS * 2_u64.pow(attempt as u32)).min(RECONNECT_DELAY_CAP_MS);
rng.random_range((exp / 2)..exp) rng.random_range((exp / 2)..exp)
} }
@@ -269,7 +269,7 @@ fn close_message() -> Message {
} }
fn ping_stream() -> impl Stream<Item = Message> { fn ping_stream() -> impl Stream<Item = Message> {
IntervalStream::new(time::interval(Duration::from_secs(PING_INTERVAL))) IntervalStream::new(time::interval(PING_INTERVAL))
.skip(1) .skip(1)
.map(|_| Message::Ping(vec![].into())) .map(|_| Message::Ping(vec![].into()))
} }