aboutsummaryrefslogtreecommitdiff
path: root/server/src/routes
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/routes')
-rw-r--r--server/src/routes/mod.rs3
-rw-r--r--server/src/routes/stream.rs86
-rw-r--r--server/src/routes/ui/player.rs40
3 files changed, 54 insertions, 75 deletions
diff --git a/server/src/routes/mod.rs b/server/src/routes/mod.rs
index 86a55ac..6fe5018 100644
--- a/server/src/routes/mod.rs
+++ b/server/src/routes/mod.rs
@@ -7,7 +7,6 @@ use crate::{database::Database, federation::Federation, routes::ui::error::MyRes
use api::{r_api_account_login, r_api_node_raw, r_api_root, r_api_version};
use base64::Engine;
use jellybase::CONF;
-use jellyremuxer::RemuxerContext;
use log::warn;
use rand::random;
use rocket::{
@@ -47,7 +46,6 @@ macro_rules! uri {
}
pub fn build_rocket(
- remuxer: RemuxerContext,
database: Database,
federation: Federation,
) -> Rocket<Build> {
@@ -70,7 +68,6 @@ pub fn build_rocket(
),
..Default::default()
})
- .manage(remuxer)
.manage(database)
.manage(federation)
.attach(AdHoc::on_response("set server header", |_req, res| {
diff --git a/server/src/routes/stream.rs b/server/src/routes/stream.rs
index e920341..6b268e4 100644
--- a/server/src/routes/stream.rs
+++ b/server/src/routes/stream.rs
@@ -7,9 +7,8 @@ use super::ui::{account::session::Session, error::MyError};
use crate::{database::Database, federation::Federation};
use anyhow::{anyhow, Result};
use jellybase::CONF;
-use jellycommon::MediaSource;
-use jellyremuxer::RemuxerContext;
-use log::{debug, info, warn};
+use jellycommon::{stream::StreamSpec, MediaSource};
+use log::{info, warn};
use rocket::{
get,
http::{ContentType, Header, Status},
@@ -17,56 +16,43 @@ use rocket::{
response::{self, Redirect, Responder},
Either, Request, Response, State,
};
-use std::{
- ops::{Deref, Range},
- time::Duration,
-};
-use tokio::io::{duplex, DuplexStream};
-use tokio_util::io::SyncIoBridge;
+use std::{ops::Range, time::Duration};
+use tokio::io::DuplexStream;
-#[get("/n/<id>/stream?<tracks>&<webm>")]
+#[get("/n/<id>/stream?<spec>")]
pub async fn r_stream(
_sess: Session,
- id: String,
- webm: Option<bool>,
- tracks: String,
- remuxer: &State<RemuxerContext>,
federation: &State<Federation>,
db: &State<Database>,
+ id: String,
range: Option<RequestRange>,
+ spec: StreamSpec,
) -> Result<Either<StreamResponse, Redirect>, MyError> {
let node = db.node.get(&id)?.ok_or(anyhow!("node does not exist"))?;
let source = node
.private
.source
+ .as_ref()
.ok_or(anyhow!("item does not contain media"))?;
- let tracks = tracks
- .split(',')
- .map(|e| e.parse().map_err(|_| anyhow!("invalid number")))
- .collect::<Result<Vec<_>, _>>()?;
+ if let MediaSource::Remote { host, remote_id } = source {
+ let (username, password, _) = CONF
+ .remote_credentials
+ .get(host)
+ .ok_or(anyhow!("no credentials on the server-side"))?;
- let source_tracks = match source {
- MediaSource::Local { tracks } => tracks,
- MediaSource::Remote { host, remote_id } => {
- let (username, password, _) = CONF
- .remote_credentials
- .get(&host)
- .ok_or(anyhow!("no credentials on the server-side"))?;
+ let instance = federation.get_instance(&host)?.to_owned();
+ let session = instance
+ .login(
+ username.to_owned(),
+ password.to_owned(),
+ Duration::from_secs(60),
+ )
+ .await?;
- let instance = federation.get_instance(&host)?.to_owned();
- let session = instance
- .login(
- username.to_owned(),
- password.to_owned(),
- Duration::from_secs(60),
- )
- .await?;
-
- let uri = session.stream(&remote_id, &tracks, webm.unwrap_or(false));
- return Ok(Either::Right(Redirect::found(uri)));
- }
- };
+ let uri = session.stream(&remote_id, &spec);
+ return Ok(Either::Right(Redirect::found(uri)));
+ }
info!(
"stream request (range={})",
@@ -76,10 +62,6 @@ pub async fn r_stream(
.unwrap_or(format!("none"))
);
- let (a, b) = duplex(4096);
- let remuxer = remuxer.deref().clone();
- let b = SyncIoBridge::new(b);
-
let urange = match &range {
Some(r) => {
let r = r.0.get(0).unwrap_or(&(None..None));
@@ -88,21 +70,13 @@ pub async fn r_stream(
None => 0..(isize::MAX as usize),
};
- tokio::task::spawn_blocking(move || {
- if let Err(e) = remuxer.generate_into(
- b,
- urange,
- CONF.library_path.clone(),
- node.public,
- source_tracks,
- tracks,
- webm.unwrap_or(false),
- ) {
- warn!("stream stopped: {e}")
+ match jellystream::stream(node, spec, urange).await {
+ Ok(stream) => Ok(Either::Left(StreamResponse { stream, range })),
+ Err(e) => {
+ warn!("stream error: {e}");
+ Err(MyError(e))
}
- });
- debug!("starting stream");
- Ok(Either::Left(StreamResponse { stream: a, range }))
+ }
}
pub struct StreamResponse {
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs
index 005e513..fa9657f 100644
--- a/server/src/routes/ui/player.rs
+++ b/server/src/routes/ui/player.rs
@@ -17,15 +17,18 @@ use crate::{
uri,
};
use anyhow::anyhow;
-use jellycommon::{Node, SourceTrackKind};
+use jellycommon::{
+ stream::{StreamFormat, StreamSpec},
+ Node, SourceTrackKind, TrackID,
+};
use markup::DynRender;
use rocket::{get, FromForm, State, UriDisplayQuery};
#[derive(FromForm, Default, Clone, Debug, UriDisplayQuery)]
pub struct PlayerConfig {
- pub a: Option<u64>,
- pub v: Option<u64>,
- pub s: Option<u64>,
+ pub a: Option<TrackID>,
+ pub v: Option<TrackID>,
+ pub s: Option<TrackID>,
pub webm: bool,
}
@@ -37,24 +40,29 @@ pub fn r_player(
conf: PlayerConfig,
) -> MyResult<DynLayoutPage<'_>> {
let item = db.node.get(&id)?.ok_or(anyhow!("node does not exist"))?;
- let tracks = None
- .into_iter()
- .chain(conf.v.into_iter())
- .chain(conf.a.into_iter())
- .chain(conf.s.into_iter())
- .map(|e| format!("{e}"))
- .collect::<Vec<_>>()
- .join(",");
- let conf = player_conf(item.clone(), !tracks.is_empty())?;
+ let spec = StreamSpec {
+ tracks: None
+ .into_iter()
+ .chain(conf.v.into_iter())
+ .chain(conf.a.into_iter())
+ .chain(conf.s.into_iter())
+ .collect::<Vec<_>>(),
+ format: StreamFormat::Webm,
+ ..Default::default()
+ };
+
+ let playing = !spec.tracks.is_empty();
+
+ let conf = player_conf(item.clone(), playing)?;
Ok(LayoutPage {
title: item.public.title.to_owned(),
class: Some("player"),
content: markup::new! {
- @if tracks.is_empty() {
- img.backdrop[src=uri!(r_item_assets(&id, AssetRole::Backdrop, Some(2048))).to_string()];
+ @if playing {
+ video[src=uri!(r_stream(&id, &spec)), controls, preload="auto"]{}
} else {
- video[src=uri!(r_stream(&id, &tracks, Some(true))), controls, preload="auto"]{}
+ img.backdrop[src=uri!(r_item_assets(&id, AssetRole::Backdrop, Some(2048))).to_string()];
}
@conf
},
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-10-08 13:15:18 +0000