Mirrors/asciinema
1
0
Fork 0
mirror of https://github.com/asciinema/asciinema.git synced 2025-12-14 18:57:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade deps

Browse Source
This commit is contained in:
Marcin Kulik
2025-05-03 20:29:14 +02:00
parent 10a290f8d6
commit 01b506b782
8 changed files with 1066 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1694
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

34
Cargo.toml
View File

@@ -14,38 +14,38 @@ rust-version = "1.75.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
anyhow = "1.0.75"
nix = { version = "0.27", features = [ "fs", "term", "process", "signal" ] }
anyhow = "1.0.98"
nix = { version = "0.30", features = ["fs", "term", "process", "signal", "poll"] }
termion = "3.0.0"
serde = { version = "1.0.189", features = ["derive"] }
serde_json = "1.0.107"
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140"
clap = { version = "4.5.37", features = ["derive"] }
signal-hook = { version = "0.3.17", default-features = false }
uuid = { version = "1.6.1", features = ["v4"] }
reqwest = { version = "0.12.8", default-features = false, features = ["blocking", "rustls-tls-native-roots", "multipart", "gzip", "json"] }
reqwest = { version = "0.12.15", default-features = false, features = ["blocking", "rustls-tls-native-roots", "multipart", "gzip", "json"] }
rustyline = "13.0.0"
config = { version = "0.14.0", default-features = false, features = ["toml", "ini"] }
which = "6.0.0"
config = { version = "0.15.11", default-features = false, features = ["toml", "ini"] }
which = "6.0.3"
tempfile = "3.9.0"
scraper = { version = "0.19.0", default-features = false }
scraper = { version = "0.23.1", default-features = false }
avt = "0.15.1"
axum = { version = "0.7.7", default-features = false, features = ["http1", "ws"] }
tokio = { version = "1.35.1", features = ["full"] }
futures-util = "0.3.30"
tokio-stream = { version = "0.1.14", features = ["sync"] }
axum = { version = "0.8.4", default-features = false, features = ["http1", "ws"] }
tokio = { version = "1.44.2", features = ["full"] }
futures-util = "0.3.31"
tokio-stream = { version = "0.1.17", features = ["sync"] }
rust-embed = "8.2.0"
mime_guess = "2.0.4"
tower-http = { version = "0.5.1", features = ["trace"] }
tracing = "0.1.40"
tower-http = { version = "0.6.2", features = ["trace"] }
tracing = "0.1.41"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
rgb = "0.8.37"
url = "2.5.0"
tokio-tungstenite = { version = "0.24.0", features = ["rustls-tls-native-roots"] }
rustls = { version = "0.23.15", default-features = false, features = ["aws_lc_rs"] }
tokio-tungstenite = { version = "0.26.2", features = ["rustls-tls-native-roots"] }
rustls = { version = "0.23.26", default-features = false, features = ["aws_lc_rs"] }
sha2 = "0.10.8"
tokio-util = "0.7.10"
chrono = "0.4.38"
hostname = "0.4.0"
hostname = "0.4.1"
[build-dependencies]
clap = { version = "4.5.37", features = ["derive"] }

5
src/forwarder.rs
View File

@@ -1,5 +1,4 @@
use core::future::{self, Future};
use std::borrow::Cow;
use std::pin::Pin;
use std::time::Duration;
@@ -238,12 +237,12 @@ fn ws_result(m: Result<Vec<u8>, BroadcastStreamRecvError>) -> anyhow::Result<Mes
fn close_message() -> Message {
Message::Close(Some(CloseFrame {
code: CloseCode::Normal,
reason: Cow::from("ended"),
reason: "ended".into(),
}))
}
fn ping_stream() -> impl Stream<Item = Message> {
IntervalStream::new(interval(Duration::from_secs(PING_INTERVAL)))
.skip(1)
.map(|_| Message::Ping(vec![]))
.map(|_| Message::Ping(vec![].into()))
}

8
src/io.rs
View File

@@ -1,15 +1,15 @@
use std::io;
use std::os::fd::RawFd;
use std::os::fd::AsFd;
use anyhow::Result;
pub fn set_non_blocking(fd: &RawFd) -> Result<(), io::Error> {
pub fn set_non_blocking<T: AsFd>(fd: &T) -> Result<(), io::Error> {
use nix::fcntl::{fcntl, FcntlArg::*, OFlag};
let flags = fcntl(*fd, F_GETFL)?;
let flags = fcntl(fd, F_GETFL)?;
let mut oflags = OFlag::from_bits_truncate(flags);
oflags |= OFlag::O_NONBLOCK;
fcntl(*fd, F_SETFL(oflags))?;
fcntl(fd, F_SETFL(oflags))?;
Ok(())
}

7
src/player.rs
View File

@@ -145,15 +145,16 @@ fn open_recording(
}
fn read_input<T: Tty>(tty: &mut T, timeout: i64) -> Result<Option<Vec<u8>>> {
let nfds = Some(tty.as_fd().as_raw_fd() + 1);
let tty_fd = tty.as_fd();
let nfds = Some(tty_fd.as_raw_fd() + 1);
let mut rfds = FdSet::new();
rfds.insert(tty);
rfds.insert(tty_fd);
let timeout = TimeSpec::microseconds(timeout);
let mut input: Vec<u8> = Vec::new();
pselect(nfds, &mut rfds, None, None, &timeout, None)?;
if rfds.contains(tty) {
if rfds.contains(tty_fd) {
let mut buf = [0u8; 1024];
while let Ok(n) = tty.read(&mut buf) {

64
src/pty.rs
View File

@@ -5,7 +5,7 @@ use std::fs::File;
use std::io::{self, ErrorKind, Read, Write};
use std::os::fd::AsFd;
use std::os::fd::{BorrowedFd, OwnedFd};
use std::os::unix::io::{AsRawFd, FromRawFd};
use std::os::unix::io::AsRawFd;
use std::time::{Duration, Instant};
use anyhow::bail;
@@ -14,7 +14,7 @@ use nix::libc::EIO;
use nix::sys::select::{select, FdSet};
use nix::sys::signal::{self, kill, Signal};
use nix::sys::wait::{self, WaitPidFlag, WaitStatus};
use nix::unistd::{self, ForkResult};
use nix::unistd;
use nix::{libc, pty};
use signal_hook::consts::{SIGALRM, SIGCHLD, SIGHUP, SIGINT, SIGQUIT, SIGTERM, SIGWINCH};
use signal_hook::SigId;
@@ -46,13 +46,13 @@ pub fn exec<S: AsRef<str>, T: Tty, H: Handler, R: HandlerStarter<H>>(
let mut handler = handler_starter.start(winsize.into(), tty.get_theme());
let result = unsafe { pty::forkpty(Some(&winsize), None) }?;
match result.fork_result {
ForkResult::Parent { child } => {
handle_parent(result.master, child, tty, &mut handler, epoch)
match result {
pty::ForkptyResult::Parent { child, master } => {
handle_parent(master, child, tty, &mut handler, epoch)
.map(|code| (code, handler.stop()))
}
ForkResult::Child => {
pty::ForkptyResult::Child => {
handle_child(command, extra_env)?;
unreachable!();
}
@@ -108,7 +108,7 @@ fn copy<T: Tty, H: Handler>(
let sigalrm_fd = SignalFd::open(SIGALRM)?;
let sigchld_fd = SignalFd::open(SIGCHLD)?;
set_non_blocking(&master_raw_fd)?;
set_non_blocking(&master)?;
loop {
let master_fd = master.as_fd();
@@ -116,25 +116,25 @@ fn copy<T: Tty, H: Handler>(
let mut rfds = FdSet::new();
let mut wfds = FdSet::new();
rfds.insert(&tty_fd);
rfds.insert(&sigwinch_fd);
rfds.insert(&sigint_fd);
rfds.insert(&sigterm_fd);
rfds.insert(&sigquit_fd);
rfds.insert(&sighup_fd);
rfds.insert(&sigalrm_fd);
rfds.insert(&sigchld_fd);
rfds.insert(tty_fd);
rfds.insert(sigwinch_fd.as_fd());
rfds.insert(sigint_fd.as_fd());
rfds.insert(sigterm_fd.as_fd());
rfds.insert(sigquit_fd.as_fd());
rfds.insert(sighup_fd.as_fd());
rfds.insert(sigalrm_fd.as_fd());
rfds.insert(sigchld_fd.as_fd());
if !master_closed {
rfds.insert(&master_fd);
rfds.insert(master_fd);
if !input.is_empty() {
wfds.insert(&master_fd);
wfds.insert(master_fd);
}
}
if !output.is_empty() {
wfds.insert(&tty_fd);
wfds.insert(tty_fd);
}
if let Err(e) = select(None, &mut rfds, &mut wfds, None, None) {
@@ -145,17 +145,17 @@ fn copy<T: Tty, H: Handler>(
bail!(e);
}
let master_read = rfds.contains(&master_fd);
let master_write = wfds.contains(&master_fd);
let tty_read = rfds.contains(&tty_fd);
let tty_write = wfds.contains(&tty_fd);
let sigwinch_read = rfds.contains(&sigwinch_fd);
let sigint_read = rfds.contains(&sigint_fd);
let sigterm_read = rfds.contains(&sigterm_fd);
let sigquit_read = rfds.contains(&sigquit_fd);
let sighup_read = rfds.contains(&sighup_fd);
let sigalrm_read = rfds.contains(&sigalrm_fd);
let sigchld_read = rfds.contains(&sigchld_fd);
let master_read = rfds.contains(master_fd);
let master_write = wfds.contains(master_fd);
let tty_read = rfds.contains(tty_fd);
let tty_write = wfds.contains(tty_fd);
let sigwinch_read = rfds.contains(sigwinch_fd.as_fd());
let sigint_read = rfds.contains(sigint_fd.as_fd());
let sigterm_read = rfds.contains(sigterm_fd.as_fd());
let sigquit_read = rfds.contains(sigquit_fd.as_fd());
let sighup_read = rfds.contains(sighup_fd.as_fd());
let sigalrm_read = rfds.contains(sigalrm_fd.as_fd());
let sigchld_read = rfds.contains(sigchld_fd.as_fd());
if master_read {
while let Some(n) = read_non_blocking(&mut master, &mut buf)? {
@@ -347,12 +347,10 @@ impl SignalFd {
let (rx, tx) = unistd::pipe()?;
set_non_blocking(&rx)?;
set_non_blocking(&tx)?;
let rx = unsafe { OwnedFd::from_raw_fd(rx) };
let tx = unsafe { OwnedFd::from_raw_fd(tx) };
let sigid = unsafe {
signal_hook::low_level::register(signal, move || {
let _ = unistd::write(tx.as_raw_fd(), &[0]);
let _ = unistd::write(&tx, &[0]);
})
}?;
@@ -362,7 +360,7 @@ impl SignalFd {
fn flush(&self) {
let mut buf = [0; 256];
while let Ok(n) = unistd::read(self.rx.as_raw_fd(), &mut buf) {
while let Ok(n) = unistd::read(&self.rx, &mut buf) {
if n == 0 {
break;
};

11
src/server.rs
View File

@@ -1,4 +1,3 @@
use std::borrow::Cow;
use std::future;
use std::io;
use std::net::SocketAddr;
@@ -9,6 +8,7 @@ use axum::extract::State;
use axum::http::{header, StatusCode, Uri};
use axum::response::IntoResponse;
use axum::routing::get;
use axum::serve::ListenerExt;
use axum::Router;
use futures_util::{sink, StreamExt};
use rust_embed::RustEmbed;
@@ -50,12 +50,15 @@ pub async fn serve(
listener.local_addr().unwrap()
);
let listener = listener.tap_io(|tcp_stream| {
let _ = tcp_stream.set_nodelay(true);
});
axum::serve(
listener,
app.into_make_service_with_connect_info::<SocketAddr>(),
)
.with_graceful_shutdown(signal)
.tcp_nodelay(true)
.await
}
@@ -123,13 +126,13 @@ async fn close_socket(mut socket: WebSocket) {
fn close_message(code: CloseCode, reason: &'static str) -> Message {
Message::Close(Some(CloseFrame {
code,
reason: Cow::from(reason),
reason: reason.into(),
}))
}
fn ws_result(m: Result<Vec<u8>, BroadcastStreamRecvError>) -> Result<Message, axum::Error> {
match m {
Ok(bytes) => Ok(Message::Binary(bytes)),
Ok(bytes) => Ok(Message::Binary(bytes.into())),
Err(e) => Err(axum::Error::new(e)),
}
}

16
src/tty.rs
View File

@@ -1,6 +1,6 @@
use std::fs;
use std::io;
use std::os::fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, OwnedFd};
use std::os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd};
use anyhow::Result;
use nix::{
@@ -67,7 +67,7 @@ impl DevTty {
.open("/dev/tty")?
.into_raw_mode()?;
crate::io::set_non_blocking(&file.as_raw_fd())?;
crate::io::set_non_blocking(&file)?;
Ok(Self { file })
}
@@ -78,23 +78,23 @@ impl DevTty {
let mut query = &query[..];
let mut response = Vec::new();
let mut buf = [0u8; 1024];
let fd = self.as_fd().as_raw_fd();
let fd = self.as_fd();
loop {
let mut timeout = TimeVal::new(0, 100_000);
let mut rfds = FdSet::new();
let mut wfds = FdSet::new();
rfds.insert(self);
rfds.insert(fd);
if !query.is_empty() {
wfds.insert(self);
wfds.insert(fd);
}
match select(None, &mut rfds, &mut wfds, None, &mut timeout) {
Ok(0) => break,
Ok(_) => {
if rfds.contains(self) {
if rfds.contains(fd) {
let n = unistd::read(fd, &mut buf)?;
response.extend_from_slice(&buf[..n]);
let mut reversed = response.iter().rev();
@@ -124,7 +124,7 @@ impl DevTty {
}
}
if wfds.contains(self) {
if wfds.contains(fd) {
let n = unistd::write(fd, query)?;
query = &query[n..];
}
@@ -239,8 +239,6 @@ pub struct NullTty {
impl NullTty {
pub fn open() -> Result<Self> {
let (rx, tx) = unistd::pipe()?;
let rx = unsafe { OwnedFd::from_raw_fd(rx) };
let tx = unsafe { OwnedFd::from_raw_fd(tx) };
Ok(Self { tx, _rx: rx })
}