Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a17ff322ad | ||
|
|
707ef85e5d | ||
|
|
ec4c53497f | ||
|
|
46ba3d5490 | ||
| f2d42751fd | |||
| bc34b6bc41 | |||
| 3ee7235b51 | |||
| 1f85d9c435 | |||
| 773e9c1ee7 | |||
| 0242376a65 | |||
|
|
64f292c7b1 | ||
| 73b6d7483e | |||
|
|
64b59ba72d |
63
.github/workflows/deb-publish.yml
vendored
Normal file
63
.github/workflows/deb-publish.yml
vendored
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
name: Build and Publish Deb Package
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- 'v*.*.*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-deb:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Enable universe and install dependencies
|
||||||
|
run: |
|
||||||
|
sudo add-apt-repository universe -y
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y fuse3 libfuse3-dev pkg-config protobuf-compiler cmake
|
||||||
|
|
||||||
|
- name: Install Rust toolchain
|
||||||
|
uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
|
with:
|
||||||
|
toolchain: stable
|
||||||
|
|
||||||
|
- name: Cache cargo registry
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
~/.cargo/registry
|
||||||
|
~/.cargo/git
|
||||||
|
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-cargo-
|
||||||
|
|
||||||
|
- name: Install cargo-deb
|
||||||
|
run: cargo install cargo-deb --locked
|
||||||
|
|
||||||
|
- name: Extract version from tag
|
||||||
|
id: version
|
||||||
|
run: echo "version=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Build deb package
|
||||||
|
run: |
|
||||||
|
cargo deb -p furumi-mount-linux \
|
||||||
|
--deb-version ${{ steps.version.outputs.version }}
|
||||||
|
|
||||||
|
- name: Locate deb file
|
||||||
|
id: deb
|
||||||
|
run: |
|
||||||
|
DEB=$(ls target/debian/furumi-mount-linux_*.deb | head -1)
|
||||||
|
echo "path=$DEB" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "name=$(basename $DEB)" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Publish to Gitea APT registry
|
||||||
|
run: |
|
||||||
|
TARGET_URL="${{ secrets.PKG_REGISTRY_URL }}/api/packages/${{ secrets.PKG_OWNER }}/debian/pool/noble/main/upload"
|
||||||
|
echo "Uploading to: $TARGET_URL"
|
||||||
|
curl --fail-with-body \
|
||||||
|
--user "${{ secrets.PKG_USER }}:${{ secrets.PKG_TOKEN }}" \
|
||||||
|
--upload-file "${{ steps.deb.outputs.path }}" \
|
||||||
|
"$TARGET_URL"
|
||||||
1933
Cargo.lock
generated
1933
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
14
README.md
14
README.md
@@ -27,13 +27,7 @@ cargo build --release --workspace
|
|||||||
--token mysecrettoken \
|
--token mysecrettoken \
|
||||||
--tls-cert-out /tmp/furumi-ca.pem
|
--tls-cert-out /tmp/furumi-ca.pem
|
||||||
|
|
||||||
# Client (Linux) — automatically uses TLS, trusts server certificate
|
# Client
|
||||||
./target/release/furumi-mount-linux \
|
|
||||||
--server server-ip:50051 \
|
|
||||||
--token mysecrettoken \
|
|
||||||
--mount /mnt/remote
|
|
||||||
|
|
||||||
# Client (macOS)
|
|
||||||
./target/release/furumi-mount-macos \
|
./target/release/furumi-mount-macos \
|
||||||
--server server-ip:50051 \
|
--server server-ip:50051 \
|
||||||
--token mysecrettoken \
|
--token mysecrettoken \
|
||||||
@@ -44,6 +38,12 @@ ls /mnt/remote
|
|||||||
mpv /mnt/remote/video.mkv
|
mpv /mnt/remote/video.mkv
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Linux FUSE3
|
||||||
|
Linux client uses FUSE. Install with:
|
||||||
|
```
|
||||||
|
sudo add-apt-repository universe
|
||||||
|
sudo apt install libfuse3-dev
|
||||||
|
```
|
||||||
## Encryption
|
## Encryption
|
||||||
|
|
||||||
TLS is enabled by default. The server auto-generates a self-signed certificate on each start — no manual cert management required. The client automatically trusts the server's certificate for encryption.
|
TLS is enabled by default. The server auto-generates a self-signed certificate on each start — no manual cert management required. The client automatically trusts the server's certificate for encryption.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "furumi-client-core"
|
name = "furumi-client-core"
|
||||||
version = "0.2.1"
|
version = "0.3.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "furumi-common"
|
name = "furumi-common"
|
||||||
version = "0.2.1"
|
version = "0.3.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "furumi-mount-linux"
|
name = "furumi-mount-linux"
|
||||||
version = "0.2.1"
|
version = "0.3.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
@@ -15,3 +15,16 @@ tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
|
|||||||
tokio = { version = "1.50.0", features = ["full"] }
|
tokio = { version = "1.50.0", features = ["full"] }
|
||||||
tokio-stream = "0.1.18"
|
tokio-stream = "0.1.18"
|
||||||
ctrlc = "3.5.2"
|
ctrlc = "3.5.2"
|
||||||
|
|
||||||
|
[package.metadata.deb]
|
||||||
|
maintainer = "Furumi"
|
||||||
|
copyright = "Furumi contributors"
|
||||||
|
extended-description = "Furumi-ng: mount remote filesystem via encrypted gRPC + FUSE"
|
||||||
|
depends = "fuse3"
|
||||||
|
section = "utils"
|
||||||
|
priority = "optional"
|
||||||
|
maintainer-scripts = "debian/"
|
||||||
|
assets = [
|
||||||
|
{ source = "target/release/furumi-mount-linux", dest = "usr/bin/furumi-mount-linux", mode = "755" },
|
||||||
|
{ source = "debian/furumi-mount.service", dest = "usr/lib/systemd/user/furumi-mount.service", mode = "644" },
|
||||||
|
]
|
||||||
|
|||||||
15
furumi-mount-linux/debian/furumi-mount.service
Normal file
15
furumi-mount-linux/debian/furumi-mount.service
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Furumi remote filesystem mount
|
||||||
|
After=network-online.target
|
||||||
|
Wants=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
EnvironmentFile=%h/.config/furumi/config
|
||||||
|
ExecStart=/usr/bin/furumi-mount-linux
|
||||||
|
ExecStopPost=fusermount3 -uz ${FURUMI_MOUNT}
|
||||||
|
Restart=on-failure
|
||||||
|
RestartSec=5
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=default.target
|
||||||
36
furumi-mount-linux/debian/postinst
Normal file
36
furumi-mount-linux/debian/postinst
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [ "$1" = "configure" ]; then
|
||||||
|
if [ -n "$SUDO_USER" ] && [ "$SUDO_USER" != "root" ]; then
|
||||||
|
REAL_USER="$SUDO_USER"
|
||||||
|
REAL_HOME=$(getent passwd "$SUDO_USER" | cut -d: -f6)
|
||||||
|
|
||||||
|
CONFIG_DIR="$REAL_HOME/.config/furumi"
|
||||||
|
CONFIG_FILE="$CONFIG_DIR/config"
|
||||||
|
|
||||||
|
if [ ! -f "$CONFIG_FILE" ]; then
|
||||||
|
mkdir -p "$CONFIG_DIR"
|
||||||
|
cat > "$CONFIG_FILE" << 'EOF'
|
||||||
|
# Furumi mount configuration
|
||||||
|
# Edit the values below, then enable and start the service:
|
||||||
|
#
|
||||||
|
# systemctl --user enable --now furumi-mount.service
|
||||||
|
#
|
||||||
|
# To apply changes after editing this file:
|
||||||
|
#
|
||||||
|
# systemctl --user restart furumi-mount.service
|
||||||
|
|
||||||
|
FURUMI_SERVER=your-server:50051
|
||||||
|
FURUMI_TOKEN=your-token-here
|
||||||
|
FURUMI_MOUNT=/path/to/mountpoint
|
||||||
|
EOF
|
||||||
|
chown -R "$REAL_USER:$REAL_USER" "$CONFIG_DIR"
|
||||||
|
echo ""
|
||||||
|
echo "furumi-mount: config created at $CONFIG_FILE"
|
||||||
|
echo "furumi-mount: edit the file, then run:"
|
||||||
|
echo " systemctl --user enable --now furumi-mount.service"
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
@@ -57,7 +57,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let client = rt.block_on(async {
|
let client = rt.block_on(async {
|
||||||
FurumiClient::connect(&full_addr, &args.token).await
|
let c = FurumiClient::connect(&full_addr, &args.token).await?;
|
||||||
|
|
||||||
|
// Ping the server to verify connection and authentication token
|
||||||
|
if let Err(e) = c.get_attr("/").await {
|
||||||
|
return Err(format!("Failed to authenticate or connect to server: {}", e).into());
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok::<_, Box<dyn std::error::Error>>(c)
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
let fuse_fs = fs::FurumiFuse::new(client, rt.handle().clone());
|
let fuse_fs = fs::FurumiFuse::new(client, rt.handle().clone());
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "furumi-mount-macos"
|
name = "furumi-mount-macos"
|
||||||
version = "0.2.1"
|
version = "0.3.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -116,7 +116,12 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Unmount
|
// Unmount
|
||||||
let _ = Command::new("umount").arg(mount_point_umount.to_string_lossy().as_ref()).status();
|
let _ = Command::new("diskutil")
|
||||||
|
.arg("unmount")
|
||||||
|
.arg("force")
|
||||||
|
.arg(mount_point_umount.to_string_lossy().as_ref())
|
||||||
|
.status();
|
||||||
|
|
||||||
handle.abort();
|
handle.abort();
|
||||||
println!("Unmounted successfully.");
|
println!("Unmounted successfully.");
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "furumi-server"
|
name = "furumi-server"
|
||||||
version = "0.2.1"
|
version = "0.3.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
@@ -18,15 +18,29 @@ rustls = { version = "0.23.37", features = ["ring"] }
|
|||||||
thiserror = "2.0.18"
|
thiserror = "2.0.18"
|
||||||
tokio = { version = "1.50.0", features = ["full"] }
|
tokio = { version = "1.50.0", features = ["full"] }
|
||||||
tokio-stream = "0.1.18"
|
tokio-stream = "0.1.18"
|
||||||
|
tokio-util = { version = "0.7", features = ["io"] }
|
||||||
tonic = { version = "0.12.3", features = ["tls"] }
|
tonic = { version = "0.12.3", features = ["tls"] }
|
||||||
tracing = "0.1.44"
|
tracing = "0.1.44"
|
||||||
tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
|
tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
|
||||||
async-stream = "0.3.6"
|
async-stream = "0.3.6"
|
||||||
async-trait = "0.1.89"
|
async-trait = "0.1.89"
|
||||||
prometheus = { version = "0.14.0", features = ["process"] }
|
prometheus = { version = "0.14.0", features = ["process"] }
|
||||||
axum = { version = "0.7", features = ["tokio"] }
|
axum = { version = "0.7", features = ["tokio", "macros"] }
|
||||||
once_cell = "1.21.3"
|
once_cell = "1.21.3"
|
||||||
rcgen = { version = "0.14.7", features = ["pem"] }
|
rcgen = { version = "0.14.7", features = ["pem"] }
|
||||||
|
symphonia = { version = "0.5", default-features = false, features = ["mp3", "aac", "flac", "vorbis", "wav", "alac", "adpcm", "pcm", "mpa", "isomp4", "ogg", "aiff", "mkv"] }
|
||||||
|
opus = "0.3"
|
||||||
|
ogg = "0.9"
|
||||||
|
mime_guess = "2.0"
|
||||||
|
tower = { version = "0.4", features = ["util"] }
|
||||||
|
sha2 = "0.10"
|
||||||
|
base64 = "0.22"
|
||||||
|
serde = { version = "1", features = ["derive"] }
|
||||||
|
serde_json = "1"
|
||||||
|
openidconnect = "3.4"
|
||||||
|
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] }
|
||||||
|
hmac = "0.12"
|
||||||
|
rand = "0.8"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tempfile = "3.26.0"
|
tempfile = "3.26.0"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ pub mod vfs;
|
|||||||
pub mod security;
|
pub mod security;
|
||||||
pub mod server;
|
pub mod server;
|
||||||
pub mod metrics;
|
pub mod metrics;
|
||||||
|
pub mod web;
|
||||||
|
|
||||||
use std::net::SocketAddr;
|
use std::net::SocketAddr;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
@@ -33,9 +34,33 @@ struct Args {
|
|||||||
#[arg(long, env = "FURUMI_METRICS_BIND", default_value = "0.0.0.0:9090")]
|
#[arg(long, env = "FURUMI_METRICS_BIND", default_value = "0.0.0.0:9090")]
|
||||||
metrics_bind: String,
|
metrics_bind: String,
|
||||||
|
|
||||||
|
/// IP address and port for the web music player
|
||||||
|
#[arg(long, env = "FURUMI_WEB_BIND", default_value = "0.0.0.0:8080")]
|
||||||
|
web_bind: String,
|
||||||
|
|
||||||
|
/// Disable the web music player UI
|
||||||
|
#[arg(long, default_value_t = false)]
|
||||||
|
no_web: bool,
|
||||||
|
|
||||||
/// Disable TLS encryption (not recommended, use only for debugging)
|
/// Disable TLS encryption (not recommended, use only for debugging)
|
||||||
#[arg(long, default_value_t = false)]
|
#[arg(long, default_value_t = false)]
|
||||||
no_tls: bool,
|
no_tls: bool,
|
||||||
|
|
||||||
|
/// OIDC Issuer URL (e.g. https://auth.example.com/application/o/furumi/)
|
||||||
|
#[arg(long, env = "FURUMI_OIDC_ISSUER_URL")]
|
||||||
|
oidc_issuer_url: Option<String>,
|
||||||
|
|
||||||
|
/// OIDC Client ID
|
||||||
|
#[arg(long, env = "FURUMI_OIDC_CLIENT_ID")]
|
||||||
|
oidc_client_id: Option<String>,
|
||||||
|
|
||||||
|
/// OIDC Client Secret
|
||||||
|
#[arg(long, env = "FURUMI_OIDC_CLIENT_SECRET")]
|
||||||
|
oidc_client_secret: Option<String>,
|
||||||
|
|
||||||
|
/// OIDC Redirect URL (e.g. https://music.example.com/auth/callback)
|
||||||
|
#[arg(long, env = "FURUMI_OIDC_REDIRECT_URL")]
|
||||||
|
oidc_redirect_url: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn metrics_handler() -> String {
|
async fn metrics_handler() -> String {
|
||||||
@@ -91,7 +116,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
println!("Authentication: enabled (Bearer token)");
|
println!("Authentication: enabled (Bearer token)");
|
||||||
}
|
}
|
||||||
println!("Document Root: {:?}", root_path);
|
println!("Document Root: {:?}", root_path);
|
||||||
println!("Metrics: http://{}/metrics", metrics_addr);
|
println!("Metrics: http://{}/metrics", metrics_addr);
|
||||||
|
|
||||||
// Spawn the Prometheus metrics HTTP server on a separate port
|
// Spawn the Prometheus metrics HTTP server on a separate port
|
||||||
let metrics_app = Router::new().route("/metrics", get(metrics_handler));
|
let metrics_app = Router::new().route("/metrics", get(metrics_handler));
|
||||||
@@ -100,6 +125,40 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
axum::serve(metrics_listener, metrics_app).await.unwrap();
|
axum::serve(metrics_listener, metrics_app).await.unwrap();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Spawn the web music player on its own port
|
||||||
|
if !args.no_web {
|
||||||
|
let web_addr: SocketAddr = args.web_bind.parse().unwrap_or_else(|e| {
|
||||||
|
eprintln!("Error: Invalid web bind address '{}': {}", args.web_bind, e);
|
||||||
|
std::process::exit(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Initialize OIDC State if provided
|
||||||
|
let oidc_state = if let (Some(issuer), Some(client_id), Some(secret), Some(redirect)) = (
|
||||||
|
args.oidc_issuer_url,
|
||||||
|
args.oidc_client_id,
|
||||||
|
args.oidc_client_secret,
|
||||||
|
args.oidc_redirect_url,
|
||||||
|
) {
|
||||||
|
println!("OIDC (SSO): enabled for web UI (issuer: {})", issuer);
|
||||||
|
match web::auth::oidc_init(issuer, client_id, secret, redirect).await {
|
||||||
|
Ok(state) => Some(Arc::new(state)),
|
||||||
|
Err(e) => {
|
||||||
|
eprintln!("Error initializing OIDC client: {}", e);
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
|
let web_app = web::build_router(root_path.clone(), args.token.clone(), oidc_state);
|
||||||
|
let web_listener = tokio::net::TcpListener::bind(web_addr).await?;
|
||||||
|
println!("Web player: http://{}", web_addr);
|
||||||
|
tokio::spawn(async move {
|
||||||
|
axum::serve(web_listener, web_app).await.unwrap();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
let mut builder = Server::builder()
|
let mut builder = Server::builder()
|
||||||
.tcp_keepalive(Some(std::time::Duration::from_secs(60)))
|
.tcp_keepalive(Some(std::time::Duration::from_secs(60)))
|
||||||
.http2_keepalive_interval(Some(std::time::Duration::from_secs(60)));
|
.http2_keepalive_interval(Some(std::time::Duration::from_secs(60)));
|
||||||
|
|||||||
458
furumi-server/src/web/auth.rs
Normal file
458
furumi-server/src/web/auth.rs
Normal file
@@ -0,0 +1,458 @@
|
|||||||
|
use axum::{
|
||||||
|
body::Body,
|
||||||
|
extract::{Request, State},
|
||||||
|
http::{HeaderMap, StatusCode, header},
|
||||||
|
middleware::Next,
|
||||||
|
response::{Html, IntoResponse, Redirect, Response},
|
||||||
|
Form,
|
||||||
|
};
|
||||||
|
use sha2::{Digest, Sha256};
|
||||||
|
use serde::Deserialize;
|
||||||
|
|
||||||
|
use base64::Engine;
|
||||||
|
use hmac::{Hmac, Mac};
|
||||||
|
use rand::RngCore;
|
||||||
|
use openidconnect::core::{CoreClient, CoreProviderMetadata, CoreResponseType};
|
||||||
|
use openidconnect::reqwest::async_http_client;
|
||||||
|
use openidconnect::{
|
||||||
|
AuthenticationFlow, AuthorizationCode, ClientId, ClientSecret, CsrfToken, IssuerUrl, Nonce,
|
||||||
|
PkceCodeChallenge, PkceCodeVerifier, RedirectUrl, Scope, TokenResponse,
|
||||||
|
};
|
||||||
|
|
||||||
|
use super::{OidcState, WebState};
|
||||||
|
|
||||||
|
/// Cookie name used to store the session token.
|
||||||
|
const SESSION_COOKIE: &str = "furumi_session";
|
||||||
|
|
||||||
|
/// Compute SHA-256 of the token as hex string (stored in cookie, not raw token).
|
||||||
|
pub fn token_hash(token: &str) -> String {
|
||||||
|
let mut h = Sha256::new();
|
||||||
|
h.update(token.as_bytes());
|
||||||
|
format!("{:x}", h.finalize())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// axum middleware: if token is configured, requires a valid session cookie.
|
||||||
|
pub async fn require_auth(
|
||||||
|
State(state): State<WebState>,
|
||||||
|
req: Request,
|
||||||
|
next: Next,
|
||||||
|
) -> Response {
|
||||||
|
// Auth disabled when token is empty
|
||||||
|
if state.token.is_empty() {
|
||||||
|
return next.run(req).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
let cookies = req
|
||||||
|
.headers()
|
||||||
|
.get(header::COOKIE)
|
||||||
|
.and_then(|v| v.to_str().ok())
|
||||||
|
.unwrap_or("");
|
||||||
|
|
||||||
|
let expected = token_hash(&state.token);
|
||||||
|
let mut authed = false;
|
||||||
|
for c in cookies.split(';') {
|
||||||
|
let c = c.trim();
|
||||||
|
if let Some(val) = c.strip_prefix(&format!("{}=", SESSION_COOKIE)) {
|
||||||
|
if val == expected {
|
||||||
|
authed = true;
|
||||||
|
break;
|
||||||
|
} else if let Some(oidc) = &state.oidc {
|
||||||
|
if verify_sso_cookie(&oidc.session_secret, val) {
|
||||||
|
authed = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if authed {
|
||||||
|
next.run(req).await
|
||||||
|
} else {
|
||||||
|
let uri = req.uri().path();
|
||||||
|
if uri.starts_with("/api/") {
|
||||||
|
(StatusCode::UNAUTHORIZED, "Unauthorized").into_response()
|
||||||
|
} else {
|
||||||
|
Redirect::to("/login").into_response()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type HmacSha256 = Hmac<sha2::Sha256>;
|
||||||
|
|
||||||
|
pub fn generate_sso_cookie(secret: &[u8], user_id: &str) -> String {
|
||||||
|
let mut mac = HmacSha256::new_from_slice(secret).unwrap();
|
||||||
|
mac.update(user_id.as_bytes());
|
||||||
|
let sig = base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(mac.finalize().into_bytes());
|
||||||
|
format!("sso:{}:{}", user_id, sig)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn verify_sso_cookie(secret: &[u8], cookie_val: &str) -> bool {
|
||||||
|
let parts: Vec<&str> = cookie_val.split(':').collect();
|
||||||
|
if parts.len() != 3 || parts[0] != "sso" {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
let user_id = parts[1];
|
||||||
|
let sig = parts[2];
|
||||||
|
|
||||||
|
let mut mac = HmacSha256::new_from_slice(secret).unwrap();
|
||||||
|
mac.update(user_id.as_bytes());
|
||||||
|
|
||||||
|
let expected_sig = base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(mac.finalize().into_bytes());
|
||||||
|
sig == expected_sig
|
||||||
|
}
|
||||||
|
|
||||||
|
/// GET /login — show login form.
|
||||||
|
pub async fn login_page(State(state): State<WebState>) -> impl IntoResponse {
|
||||||
|
let token_enabled = !state.token.is_empty();
|
||||||
|
let oidc_enabled = state.oidc.is_some();
|
||||||
|
|
||||||
|
if !token_enabled && !oidc_enabled {
|
||||||
|
return Redirect::to("/").into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
let html = LOGIN_HTML.replace(
|
||||||
|
"<!-- OIDC_PLACEHOLDER -->",
|
||||||
|
if oidc_enabled {
|
||||||
|
r#"<div class="divider"><span>OR</span></div>
|
||||||
|
<a href="/auth/login" class="btn-oidc">Log in with Authentik (SSO)</a>"#
|
||||||
|
} else {
|
||||||
|
""
|
||||||
|
}
|
||||||
|
);
|
||||||
|
Html(html).into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct LoginForm {
|
||||||
|
password: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// POST /login — validate password, set session cookie.
|
||||||
|
pub async fn login_submit(
|
||||||
|
State(state): State<WebState>,
|
||||||
|
Form(form): Form<LoginForm>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
if state.token.is_empty() {
|
||||||
|
return Redirect::to("/").into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
if form.password == *state.token {
|
||||||
|
let hash = token_hash(&state.token);
|
||||||
|
let cookie = format!(
|
||||||
|
"{}={}; HttpOnly; SameSite=Strict; Path=/",
|
||||||
|
SESSION_COOKIE, hash
|
||||||
|
);
|
||||||
|
let mut headers = HeaderMap::new();
|
||||||
|
headers.insert(header::SET_COOKIE, cookie.parse().unwrap());
|
||||||
|
headers.insert(header::LOCATION, "/".parse().unwrap());
|
||||||
|
(StatusCode::FOUND, headers, Body::empty()).into_response()
|
||||||
|
} else {
|
||||||
|
Html(LOGIN_ERROR_HTML).into_response()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// GET /logout — clear session cookie and redirect to login.
|
||||||
|
pub async fn logout() -> impl IntoResponse {
|
||||||
|
let cookie = format!(
|
||||||
|
"{}=; HttpOnly; SameSite=Strict; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT",
|
||||||
|
SESSION_COOKIE
|
||||||
|
);
|
||||||
|
let mut headers = HeaderMap::new();
|
||||||
|
headers.insert(header::SET_COOKIE, cookie.parse().unwrap());
|
||||||
|
headers.insert(header::LOCATION, "/login".parse().unwrap());
|
||||||
|
(StatusCode::FOUND, headers, Body::empty()).into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn oidc_init(
|
||||||
|
issuer: String,
|
||||||
|
client_id: String,
|
||||||
|
client_secret: String,
|
||||||
|
redirect: String,
|
||||||
|
) -> anyhow::Result<OidcState> {
|
||||||
|
let provider_metadata = CoreProviderMetadata::discover_async(
|
||||||
|
IssuerUrl::new(issuer)?,
|
||||||
|
async_http_client,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let client = CoreClient::from_provider_metadata(
|
||||||
|
provider_metadata,
|
||||||
|
ClientId::new(client_id),
|
||||||
|
Some(ClientSecret::new(client_secret)),
|
||||||
|
)
|
||||||
|
.set_redirect_uri(RedirectUrl::new(redirect)?);
|
||||||
|
|
||||||
|
let mut session_secret = vec![0u8; 32];
|
||||||
|
rand::thread_rng().fill_bytes(&mut session_secret);
|
||||||
|
|
||||||
|
Ok(OidcState {
|
||||||
|
client,
|
||||||
|
session_secret,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn oidc_login(
|
||||||
|
State(state): State<WebState>,
|
||||||
|
req: Request,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
let oidc = match &state.oidc {
|
||||||
|
Some(o) => o,
|
||||||
|
None => return Redirect::to("/login").into_response(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let (pkce_challenge, pkce_verifier) = PkceCodeChallenge::new_random_sha256();
|
||||||
|
|
||||||
|
let (auth_url, csrf_token, nonce) = oidc
|
||||||
|
.client
|
||||||
|
.authorize_url(
|
||||||
|
AuthenticationFlow::<CoreResponseType>::AuthorizationCode,
|
||||||
|
CsrfToken::new_random,
|
||||||
|
Nonce::new_random,
|
||||||
|
)
|
||||||
|
.add_scope(Scope::new("openid".to_string()))
|
||||||
|
.add_scope(Scope::new("profile".to_string()))
|
||||||
|
.set_pkce_challenge(pkce_challenge)
|
||||||
|
.url();
|
||||||
|
|
||||||
|
let cookie_val = format!("{}:{}:{}", csrf_token.secret(), nonce.secret(), pkce_verifier.secret());
|
||||||
|
|
||||||
|
// Determine if we are running behind an HTTPS proxy
|
||||||
|
let is_https = req.headers().get("x-forwarded-proto")
|
||||||
|
.and_then(|v| v.to_str().ok())
|
||||||
|
.map(|s| s == "https")
|
||||||
|
.unwrap_or(false);
|
||||||
|
|
||||||
|
// If HTTPS, use SameSite=None + Secure to fully support cross-domain POST redirects.
|
||||||
|
// Otherwise fallback to Lax for local testing.
|
||||||
|
let cookie_attrs = if is_https {
|
||||||
|
"SameSite=None; Secure"
|
||||||
|
} else {
|
||||||
|
"SameSite=Lax"
|
||||||
|
};
|
||||||
|
|
||||||
|
let cookie = format!("furumi_oidc_state={}; HttpOnly; {}; Path=/; Max-Age=3600", cookie_val, cookie_attrs);
|
||||||
|
|
||||||
|
let mut headers = HeaderMap::new();
|
||||||
|
headers.insert(header::SET_COOKIE, cookie.parse().unwrap());
|
||||||
|
headers.insert(header::LOCATION, auth_url.as_str().parse().unwrap());
|
||||||
|
headers.insert(header::CACHE_CONTROL, "no-store, no-cache, must-revalidate".parse().unwrap());
|
||||||
|
|
||||||
|
(StatusCode::FOUND, headers, Body::empty()).into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct AuthCallbackQuery {
|
||||||
|
code: String,
|
||||||
|
state: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn oidc_callback(
|
||||||
|
State(state): State<WebState>,
|
||||||
|
axum::extract::Query(query): axum::extract::Query<AuthCallbackQuery>,
|
||||||
|
req: Request,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
let oidc = match &state.oidc {
|
||||||
|
Some(o) => o,
|
||||||
|
None => return Redirect::to("/login").into_response(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let cookies = req
|
||||||
|
.headers()
|
||||||
|
.get(header::COOKIE)
|
||||||
|
.and_then(|v| v.to_str().ok())
|
||||||
|
.unwrap_or("");
|
||||||
|
|
||||||
|
let mut matching_val = None;
|
||||||
|
for c in cookies.split(';') {
|
||||||
|
let c = c.trim();
|
||||||
|
if let Some(val) = c.strip_prefix("furumi_oidc_state=") {
|
||||||
|
let parts: Vec<&str> = val.split(':').collect();
|
||||||
|
if parts.len() == 3 && parts[0] == query.state {
|
||||||
|
matching_val = Some(val.to_string());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let cookie_val = match matching_val {
|
||||||
|
Some(c) => c,
|
||||||
|
None => {
|
||||||
|
tracing::warn!("OIDC callback failed: Invalid state or missing valid cookie. Received cookies: {}", cookies);
|
||||||
|
return (StatusCode::BAD_REQUEST, "Invalid state").into_response();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let parts: Vec<&str> = cookie_val.split(':').collect();
|
||||||
|
let nonce = Nonce::new(parts[1].to_string());
|
||||||
|
let pkce_verifier = PkceCodeVerifier::new(parts[2].to_string());
|
||||||
|
|
||||||
|
let token_response = oidc
|
||||||
|
.client
|
||||||
|
.exchange_code(AuthorizationCode::new(query.code))
|
||||||
|
.set_pkce_verifier(pkce_verifier)
|
||||||
|
.request_async(async_http_client)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let token_response = match token_response {
|
||||||
|
Ok(tr) => tr,
|
||||||
|
Err(e) => return (StatusCode::INTERNAL_SERVER_ERROR, format!("OIDC error: {}", e)).into_response(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let id_token = match token_response.id_token() {
|
||||||
|
Some(t) => t,
|
||||||
|
None => return (StatusCode::INTERNAL_SERVER_ERROR, "No ID token").into_response(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let claims = match id_token.claims(&oidc.client.id_token_verifier(), &nonce) {
|
||||||
|
Ok(c) => c,
|
||||||
|
Err(e) => return (StatusCode::UNAUTHORIZED, format!("Invalid ID token: {}", e)).into_response(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let subject = claims.subject().as_str();
|
||||||
|
let session_val = generate_sso_cookie(&oidc.session_secret, subject);
|
||||||
|
|
||||||
|
let is_https = req.headers().get("x-forwarded-proto")
|
||||||
|
.and_then(|v| v.to_str().ok())
|
||||||
|
.map(|s| s == "https")
|
||||||
|
.unwrap_or(false);
|
||||||
|
|
||||||
|
let session_attrs = if is_https {
|
||||||
|
"SameSite=Strict; Secure"
|
||||||
|
} else {
|
||||||
|
"SameSite=Strict"
|
||||||
|
};
|
||||||
|
|
||||||
|
let session_cookie = format!("{}={}; HttpOnly; {}; Path=/", SESSION_COOKIE, session_val, session_attrs);
|
||||||
|
let clear_state_cookie = "furumi_oidc_state=; HttpOnly; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT";
|
||||||
|
|
||||||
|
let mut headers = HeaderMap::new();
|
||||||
|
headers.insert(header::SET_COOKIE, session_cookie.parse().unwrap());
|
||||||
|
headers.append(header::SET_COOKIE, clear_state_cookie.parse().unwrap());
|
||||||
|
headers.insert(header::LOCATION, "/".parse().unwrap());
|
||||||
|
|
||||||
|
(StatusCode::FOUND, headers, Body::empty()).into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
const LOGIN_HTML: &str = r#"<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>Furumi Player — Login</title>
|
||||||
|
<style>
|
||||||
|
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||||
|
body {
|
||||||
|
min-height: 100vh;
|
||||||
|
display: flex; align-items: center; justify-content: center;
|
||||||
|
background: #0d0f14;
|
||||||
|
font-family: 'Inter', system-ui, sans-serif;
|
||||||
|
color: #e2e8f0;
|
||||||
|
}
|
||||||
|
.card {
|
||||||
|
background: #161b27;
|
||||||
|
border: 1px solid #2a3347;
|
||||||
|
border-radius: 16px;
|
||||||
|
padding: 2.5rem 3rem;
|
||||||
|
width: 360px;
|
||||||
|
box-shadow: 0 20px 60px rgba(0,0,0,0.5);
|
||||||
|
}
|
||||||
|
.logo { font-size: 1.8rem; font-weight: 700; color: #7c6af7; margin-bottom: 0.25rem; }
|
||||||
|
.subtitle { font-size: 0.85rem; color: #64748b; margin-bottom: 2rem; }
|
||||||
|
label { display: block; font-size: 0.8rem; color: #94a3b8; margin-bottom: 0.4rem; }
|
||||||
|
input[type=password] {
|
||||||
|
width: 100%; padding: 0.6rem 0.8rem;
|
||||||
|
background: #0d0f14; border: 1px solid #2a3347; border-radius: 8px;
|
||||||
|
color: #e2e8f0; font-size: 0.95rem; outline: none;
|
||||||
|
transition: border-color 0.2s;
|
||||||
|
}
|
||||||
|
input[type=password]:focus { border-color: #7c6af7; }
|
||||||
|
button {
|
||||||
|
margin-top: 1.2rem; width: 100%; padding: 0.65rem;
|
||||||
|
background: #7c6af7; border: none; border-radius: 8px;
|
||||||
|
color: #fff; font-size: 0.95rem; font-weight: 600; cursor: pointer;
|
||||||
|
transition: background 0.2s;
|
||||||
|
}
|
||||||
|
button:hover { background: #6b58e8; }
|
||||||
|
.btn-oidc {
|
||||||
|
display: block; width: 100%; padding: 0.65rem; text-align: center;
|
||||||
|
background: #2a3347; border: 1px solid #3d4a66; border-radius: 8px;
|
||||||
|
color: #e2e8f0; font-size: 0.95rem; font-weight: 600; text-decoration: none;
|
||||||
|
transition: background 0.2s;
|
||||||
|
}
|
||||||
|
.btn-oidc:hover { background: #3d4a66; }
|
||||||
|
.divider {
|
||||||
|
display: flex; align-items: center; text-align: center; margin: 1.5rem 0;
|
||||||
|
color: #64748b; font-size: 0.75rem;
|
||||||
|
}
|
||||||
|
.divider::before, .divider::after {
|
||||||
|
content: ''; flex: 1; border-bottom: 1px solid #2a3347;
|
||||||
|
}
|
||||||
|
.divider span { padding: 0 10px; }
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div class="card">
|
||||||
|
<div class="logo">🎵 Furumi</div>
|
||||||
|
<div class="subtitle">Enter access token to continue</div>
|
||||||
|
<form method="POST" action="/login">
|
||||||
|
<label for="password">Access Token</label>
|
||||||
|
<input type="password" id="password" name="password" autofocus autocomplete="current-password">
|
||||||
|
<button type="submit">Sign In</button>
|
||||||
|
</form>
|
||||||
|
<!-- OIDC_PLACEHOLDER -->
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>"#;
|
||||||
|
|
||||||
|
const LOGIN_ERROR_HTML: &str = r#"<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>Furumi Player — Login</title>
|
||||||
|
<style>
|
||||||
|
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||||
|
body {
|
||||||
|
min-height: 100vh;
|
||||||
|
display: flex; align-items: center; justify-content: center;
|
||||||
|
background: #0d0f14;
|
||||||
|
font-family: 'Inter', system-ui, sans-serif;
|
||||||
|
color: #e2e8f0;
|
||||||
|
}
|
||||||
|
.card {
|
||||||
|
background: #161b27;
|
||||||
|
border: 1px solid #2a3347;
|
||||||
|
border-radius: 16px;
|
||||||
|
padding: 2.5rem 3rem;
|
||||||
|
width: 360px;
|
||||||
|
box-shadow: 0 20px 60px rgba(0,0,0,0.5);
|
||||||
|
}
|
||||||
|
.logo { font-size: 1.8rem; font-weight: 700; color: #7c6af7; margin-bottom: 0.25rem; }
|
||||||
|
.subtitle { font-size: 0.85rem; color: #64748b; margin-bottom: 2rem; }
|
||||||
|
.error { color: #f87171; font-size: 0.85rem; margin-bottom: 1rem; }
|
||||||
|
label { display: block; font-size: 0.8rem; color: #94a3b8; margin-bottom: 0.4rem; }
|
||||||
|
input[type=password] {
|
||||||
|
width: 100%; padding: 0.6rem 0.8rem;
|
||||||
|
background: #0d0f14; border: 1px solid #f87171; border-radius: 8px;
|
||||||
|
color: #e2e8f0; font-size: 0.95rem; outline: none;
|
||||||
|
}
|
||||||
|
button {
|
||||||
|
margin-top: 1.2rem; width: 100%; padding: 0.65rem;
|
||||||
|
background: #7c6af7; border: none; border-radius: 8px;
|
||||||
|
color: #fff; font-size: 0.95rem; font-weight: 600; cursor: pointer;
|
||||||
|
}
|
||||||
|
button:hover { background: #6b58e8; }
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div class="card">
|
||||||
|
<div class="logo">🎵 Furumi</div>
|
||||||
|
<div class="subtitle">Enter access token to continue</div>
|
||||||
|
<p class="error">❌ Invalid token. Please try again.</p>
|
||||||
|
<form method="POST" action="/login">
|
||||||
|
<label for="password">Access Token</label>
|
||||||
|
<input type="password" id="password" name="password" autofocus>
|
||||||
|
<button type="submit">Sign In</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>"#;
|
||||||
132
furumi-server/src/web/browse.rs
Normal file
132
furumi-server/src/web/browse.rs
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
use axum::{
|
||||||
|
extract::{Query, State},
|
||||||
|
http::StatusCode,
|
||||||
|
response::{IntoResponse, Json},
|
||||||
|
};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
use crate::security::sanitize_path;
|
||||||
|
use super::WebState;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct BrowseQuery {
|
||||||
|
#[serde(default)]
|
||||||
|
pub path: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
pub struct BrowseResponse {
|
||||||
|
pub path: String,
|
||||||
|
pub entries: Vec<Entry>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
pub struct Entry {
|
||||||
|
pub name: String,
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
pub kind: EntryKind,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub size: Option<u64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
#[serde(rename_all = "lowercase")]
|
||||||
|
pub enum EntryKind {
|
||||||
|
File,
|
||||||
|
Dir,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn handler(
|
||||||
|
State(state): State<WebState>,
|
||||||
|
Query(query): Query<BrowseQuery>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
let safe = match sanitize_path(&query.path) {
|
||||||
|
Ok(p) => p,
|
||||||
|
Err(_) => {
|
||||||
|
return (StatusCode::BAD_REQUEST, Json(serde_json::json!({"error": "invalid path"}))).into_response();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let dir_path: PathBuf = state.root.join(&safe);
|
||||||
|
|
||||||
|
let read_dir = match tokio::fs::read_dir(&dir_path).await {
|
||||||
|
Ok(rd) => rd,
|
||||||
|
Err(e) => {
|
||||||
|
let status = if e.kind() == std::io::ErrorKind::NotFound {
|
||||||
|
StatusCode::NOT_FOUND
|
||||||
|
} else {
|
||||||
|
StatusCode::INTERNAL_SERVER_ERROR
|
||||||
|
};
|
||||||
|
return (status, Json(serde_json::json!({"error": e.to_string()}))).into_response();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut entries: Vec<Entry> = Vec::new();
|
||||||
|
let mut rd = read_dir;
|
||||||
|
|
||||||
|
loop {
|
||||||
|
match rd.next_entry().await {
|
||||||
|
Ok(Some(entry)) => {
|
||||||
|
let name = entry.file_name().to_string_lossy().into_owned();
|
||||||
|
// Skip hidden files
|
||||||
|
if name.starts_with('.') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let meta = match entry.metadata().await {
|
||||||
|
Ok(m) => m,
|
||||||
|
Err(_) => continue,
|
||||||
|
};
|
||||||
|
if meta.is_dir() {
|
||||||
|
entries.push(Entry { name, kind: EntryKind::Dir, size: None });
|
||||||
|
} else if meta.is_file() {
|
||||||
|
// Only expose audio files
|
||||||
|
if is_audio_file(&name) {
|
||||||
|
entries.push(Entry {
|
||||||
|
name,
|
||||||
|
kind: EntryKind::File,
|
||||||
|
size: Some(meta.len()),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(None) => break,
|
||||||
|
Err(e) => {
|
||||||
|
return (
|
||||||
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Json(serde_json::json!({"error": e.to_string()})),
|
||||||
|
)
|
||||||
|
.into_response();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort: dirs first, then files; alphabetically within each group
|
||||||
|
entries.sort_by(|a, b| {
|
||||||
|
let a_dir = matches!(a.kind, EntryKind::Dir);
|
||||||
|
let b_dir = matches!(b.kind, EntryKind::Dir);
|
||||||
|
b_dir.cmp(&a_dir).then(a.name.to_lowercase().cmp(&b.name.to_lowercase()))
|
||||||
|
});
|
||||||
|
|
||||||
|
let response = BrowseResponse {
|
||||||
|
path: safe,
|
||||||
|
entries,
|
||||||
|
};
|
||||||
|
|
||||||
|
(StatusCode::OK, Json(response)).into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Whitelist of audio extensions served via the web player.
|
||||||
|
pub fn is_audio_file(name: &str) -> bool {
|
||||||
|
let ext = name.rsplit('.').next().unwrap_or("").to_lowercase();
|
||||||
|
matches!(
|
||||||
|
ext.as_str(),
|
||||||
|
"mp3" | "flac" | "ogg" | "opus" | "aac" | "m4a" | "wav" | "ape" | "wv" | "wma" | "tta" | "aiff" | "aif"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns true if the format needs transcoding (not natively supported by browsers).
|
||||||
|
pub fn needs_transcode(name: &str) -> bool {
|
||||||
|
let ext = name.rsplit('.').next().unwrap_or("").to_lowercase();
|
||||||
|
matches!(ext.as_str(), "ape" | "wv" | "wma" | "tta" | "aiff" | "aif")
|
||||||
|
}
|
||||||
175
furumi-server/src/web/meta.rs
Normal file
175
furumi-server/src/web/meta.rs
Normal file
@@ -0,0 +1,175 @@
|
|||||||
|
use axum::{
|
||||||
|
extract::{Path, State},
|
||||||
|
http::StatusCode,
|
||||||
|
response::{IntoResponse, Json},
|
||||||
|
};
|
||||||
|
use base64::{Engine, engine::general_purpose::STANDARD as BASE64};
|
||||||
|
use serde::Serialize;
|
||||||
|
use symphonia::core::{
|
||||||
|
codecs::CODEC_TYPE_NULL,
|
||||||
|
formats::FormatOptions,
|
||||||
|
io::MediaSourceStream,
|
||||||
|
meta::{MetadataOptions, StandardTagKey},
|
||||||
|
probe::Hint,
|
||||||
|
};
|
||||||
|
|
||||||
|
use crate::security::sanitize_path;
|
||||||
|
use super::WebState;
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
pub struct MetaResponse {
|
||||||
|
pub title: Option<String>,
|
||||||
|
pub artist: Option<String>,
|
||||||
|
pub album: Option<String>,
|
||||||
|
pub track: Option<u32>,
|
||||||
|
pub year: Option<u32>,
|
||||||
|
pub duration_secs: Option<f64>,
|
||||||
|
pub cover_base64: Option<String>, // "data:image/jpeg;base64,..."
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn handler(
|
||||||
|
State(state): State<WebState>,
|
||||||
|
Path(path): Path<String>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
let safe = match sanitize_path(&path) {
|
||||||
|
Ok(p) => p,
|
||||||
|
Err(_) => return (StatusCode::BAD_REQUEST, Json(serde_json::json!({"error": "invalid path"}))).into_response(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let file_path = state.root.join(&safe);
|
||||||
|
let filename = file_path
|
||||||
|
.file_name()
|
||||||
|
.and_then(|n| n.to_str())
|
||||||
|
.unwrap_or("")
|
||||||
|
.to_owned();
|
||||||
|
|
||||||
|
let meta = tokio::task::spawn_blocking(move || read_meta(file_path, &filename)).await;
|
||||||
|
|
||||||
|
match meta {
|
||||||
|
Ok(Ok(m)) => (StatusCode::OK, Json(m)).into_response(),
|
||||||
|
Ok(Err(e)) => (StatusCode::INTERNAL_SERVER_ERROR, Json(serde_json::json!({"error": e.to_string()}))).into_response(),
|
||||||
|
Err(e) => (StatusCode::INTERNAL_SERVER_ERROR, Json(serde_json::json!({"error": e.to_string()}))).into_response(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_meta(file_path: std::path::PathBuf, filename: &str) -> anyhow::Result<MetaResponse> {
|
||||||
|
let file = std::fs::File::open(&file_path)?;
|
||||||
|
let mss = MediaSourceStream::new(Box::new(file), Default::default());
|
||||||
|
|
||||||
|
let mut hint = Hint::new();
|
||||||
|
if let Some(ext) = file_path.extension().and_then(|e| e.to_str()) {
|
||||||
|
hint.with_extension(ext);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut probed = symphonia::default::get_probe().format(
|
||||||
|
&hint,
|
||||||
|
mss,
|
||||||
|
&FormatOptions { enable_gapless: false, ..Default::default() },
|
||||||
|
&MetadataOptions::default(),
|
||||||
|
)?;
|
||||||
|
|
||||||
|
// Extract tags from container-level metadata
|
||||||
|
let mut title: Option<String> = None;
|
||||||
|
let mut artist: Option<String> = None;
|
||||||
|
let mut album: Option<String> = None;
|
||||||
|
let mut track: Option<u32> = None;
|
||||||
|
let mut year: Option<u32> = None;
|
||||||
|
let mut cover_data: Option<(Vec<u8>, String)> = None;
|
||||||
|
|
||||||
|
// Check metadata side-data (e.g., ID3 tags probed before format)
|
||||||
|
if let Some(rev) = probed.metadata.get().as_ref().and_then(|m| m.current()) {
|
||||||
|
extract_tags(rev.tags(), rev.visuals(), &mut title, &mut artist, &mut album, &mut track, &mut year, &mut cover_data);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Also check format-embedded metadata
|
||||||
|
if let Some(rev) = probed.format.metadata().current() {
|
||||||
|
if title.is_none() {
|
||||||
|
extract_tags(rev.tags(), rev.visuals(), &mut title, &mut artist, &mut album, &mut track, &mut year, &mut cover_data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no title from tags, use filename without extension
|
||||||
|
if title.is_none() {
|
||||||
|
title = Some(
|
||||||
|
std::path::Path::new(filename)
|
||||||
|
.file_stem()
|
||||||
|
.and_then(|s| s.to_str())
|
||||||
|
.unwrap_or(filename)
|
||||||
|
.to_owned(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Estimate duration from track time_base + n_frames
|
||||||
|
let duration_secs = probed
|
||||||
|
.format
|
||||||
|
.tracks()
|
||||||
|
.iter()
|
||||||
|
.find(|t| t.codec_params.codec != CODEC_TYPE_NULL)
|
||||||
|
.and_then(|t| {
|
||||||
|
let n_frames = t.codec_params.n_frames?;
|
||||||
|
let tb = t.codec_params.time_base?;
|
||||||
|
Some(n_frames as f64 * tb.numer as f64 / tb.denom as f64)
|
||||||
|
});
|
||||||
|
|
||||||
|
let cover_base64 = cover_data.map(|(data, mime)| {
|
||||||
|
format!("data:{};base64,{}", mime, BASE64.encode(&data))
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(MetaResponse {
|
||||||
|
title,
|
||||||
|
artist,
|
||||||
|
album,
|
||||||
|
track,
|
||||||
|
year,
|
||||||
|
duration_secs,
|
||||||
|
cover_base64,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn extract_tags(
|
||||||
|
tags: &[symphonia::core::meta::Tag],
|
||||||
|
visuals: &[symphonia::core::meta::Visual],
|
||||||
|
title: &mut Option<String>,
|
||||||
|
artist: &mut Option<String>,
|
||||||
|
album: &mut Option<String>,
|
||||||
|
track: &mut Option<u32>,
|
||||||
|
year: &mut Option<u32>,
|
||||||
|
cover: &mut Option<(Vec<u8>, String)>,
|
||||||
|
) {
|
||||||
|
for tag in tags {
|
||||||
|
if let Some(key) = tag.std_key {
|
||||||
|
match key {
|
||||||
|
StandardTagKey::TrackTitle => {
|
||||||
|
*title = Some(tag.value.to_string());
|
||||||
|
}
|
||||||
|
StandardTagKey::Artist | StandardTagKey::Performer => {
|
||||||
|
if artist.is_none() {
|
||||||
|
*artist = Some(tag.value.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
StandardTagKey::Album => {
|
||||||
|
*album = Some(tag.value.to_string());
|
||||||
|
}
|
||||||
|
StandardTagKey::TrackNumber => {
|
||||||
|
if track.is_none() {
|
||||||
|
*track = tag.value.to_string().parse().ok();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
StandardTagKey::Date | StandardTagKey::OriginalDate => {
|
||||||
|
if year.is_none() {
|
||||||
|
// Parse first 4 characters as year
|
||||||
|
*year = tag.value.to_string()[..4.min(tag.value.to_string().len())].parse().ok();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if cover.is_none() {
|
||||||
|
if let Some(visual) = visuals.first() {
|
||||||
|
let mime = visual.media_type.clone();
|
||||||
|
*cover = Some((visual.data.to_vec(), mime));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
58
furumi-server/src/web/mod.rs
Normal file
58
furumi-server/src/web/mod.rs
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
pub mod auth;
|
||||||
|
pub mod browse;
|
||||||
|
pub mod meta;
|
||||||
|
pub mod stream;
|
||||||
|
pub mod transcoder;
|
||||||
|
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use axum::{
|
||||||
|
Router,
|
||||||
|
middleware,
|
||||||
|
routing::get,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// Shared state passed to all web handlers.
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct WebState {
|
||||||
|
pub root: Arc<PathBuf>,
|
||||||
|
pub token: Arc<String>,
|
||||||
|
pub oidc: Option<Arc<OidcState>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct OidcState {
|
||||||
|
pub client: openidconnect::core::CoreClient,
|
||||||
|
pub session_secret: Vec<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Build the axum Router for the web player.
|
||||||
|
pub fn build_router(root: PathBuf, token: String, oidc: Option<Arc<OidcState>>) -> Router {
|
||||||
|
let state = WebState {
|
||||||
|
root: Arc::new(root),
|
||||||
|
token: Arc::new(token),
|
||||||
|
oidc,
|
||||||
|
};
|
||||||
|
|
||||||
|
let api = Router::new()
|
||||||
|
.route("/browse", get(browse::handler))
|
||||||
|
.route("/stream/*path", get(stream::handler))
|
||||||
|
.route("/meta/*path", get(meta::handler));
|
||||||
|
|
||||||
|
let authed_routes = Router::new()
|
||||||
|
.route("/", get(player_html))
|
||||||
|
.nest("/api", api)
|
||||||
|
.route_layer(middleware::from_fn_with_state(state.clone(), auth::require_auth));
|
||||||
|
|
||||||
|
Router::new()
|
||||||
|
.route("/login", get(auth::login_page).post(auth::login_submit))
|
||||||
|
.route("/logout", get(auth::logout))
|
||||||
|
.route("/auth/login", get(auth::oidc_login))
|
||||||
|
.route("/auth/callback", get(auth::oidc_callback))
|
||||||
|
.merge(authed_routes)
|
||||||
|
.with_state(state)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn player_html() -> axum::response::Html<&'static str> {
|
||||||
|
axum::response::Html(include_str!("player.html"))
|
||||||
|
}
|
||||||
912
furumi-server/src/web/player.html
Normal file
912
furumi-server/src/web/player.html
Normal file
@@ -0,0 +1,912 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>Furumi Player</title>
|
||||||
|
<style>
|
||||||
|
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap');
|
||||||
|
|
||||||
|
*, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
|
||||||
|
|
||||||
|
:root {
|
||||||
|
--bg-base: #0a0c12;
|
||||||
|
--bg-panel: #111520;
|
||||||
|
--bg-card: #161d2e;
|
||||||
|
--bg-hover: #1e2740;
|
||||||
|
--bg-active: #252f4a;
|
||||||
|
--border: #1f2c45;
|
||||||
|
--accent: #7c6af7;
|
||||||
|
--accent-dim: #5a4fcf;
|
||||||
|
--accent-glow:rgba(124,106,247,0.3);
|
||||||
|
--text: #e2e8f0;
|
||||||
|
--text-muted: #64748b;
|
||||||
|
--text-dim: #94a3b8;
|
||||||
|
--success: #34d399;
|
||||||
|
--danger: #f87171;
|
||||||
|
}
|
||||||
|
|
||||||
|
html, body { height: 100%; overflow: hidden; }
|
||||||
|
|
||||||
|
body {
|
||||||
|
font-family: 'Inter', system-ui, sans-serif;
|
||||||
|
background: var(--bg-base);
|
||||||
|
color: var(--text);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ─── Header ─── */
|
||||||
|
.header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding: 0.75rem 1.5rem;
|
||||||
|
background: var(--bg-panel);
|
||||||
|
border-bottom: 1px solid var(--border);
|
||||||
|
flex-shrink: 0;
|
||||||
|
z-index: 10;
|
||||||
|
}
|
||||||
|
.header-logo {
|
||||||
|
display: flex; align-items: center; gap: 0.5rem;
|
||||||
|
font-size: 1.15rem; font-weight: 700; color: var(--accent);
|
||||||
|
}
|
||||||
|
.header-logo svg { width: 22px; height: 22px; }
|
||||||
|
.btn-logout {
|
||||||
|
font-size: 0.78rem; color: var(--text-muted); background: none;
|
||||||
|
border: 1px solid var(--border); border-radius: 6px;
|
||||||
|
padding: 0.3rem 0.75rem; cursor: pointer; transition: all 0.2s;
|
||||||
|
}
|
||||||
|
.btn-logout:hover { border-color: var(--danger); color: var(--danger); }
|
||||||
|
|
||||||
|
/* ─── Main layout ─── */
|
||||||
|
.main {
|
||||||
|
display: flex;
|
||||||
|
flex: 1;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ─── File browser ─── */
|
||||||
|
.sidebar {
|
||||||
|
width: 280px;
|
||||||
|
min-width: 200px;
|
||||||
|
max-width: 400px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
background: var(--bg-panel);
|
||||||
|
border-right: 1px solid var(--border);
|
||||||
|
overflow: hidden;
|
||||||
|
resize: horizontal;
|
||||||
|
}
|
||||||
|
.sidebar-header {
|
||||||
|
padding: 0.85rem 1rem 0.6rem;
|
||||||
|
font-size: 0.7rem;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.08em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: var(--text-muted);
|
||||||
|
border-bottom: 1px solid var(--border);
|
||||||
|
flex-shrink: 0;
|
||||||
|
display: flex; align-items: center; gap: 0.5rem;
|
||||||
|
}
|
||||||
|
.breadcrumb {
|
||||||
|
padding: 0.5rem 1rem;
|
||||||
|
font-size: 0.78rem;
|
||||||
|
color: var(--text-muted);
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
border-bottom: 1px solid var(--border);
|
||||||
|
flex-shrink: 0;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
.breadcrumb span { color: var(--accent); cursor: pointer; }
|
||||||
|
.breadcrumb span:hover { text-decoration: underline; }
|
||||||
|
|
||||||
|
.file-list {
|
||||||
|
flex: 1;
|
||||||
|
overflow-y: auto;
|
||||||
|
padding: 0.3rem 0;
|
||||||
|
}
|
||||||
|
.file-list::-webkit-scrollbar { width: 4px; }
|
||||||
|
.file-list::-webkit-scrollbar-track { background: transparent; }
|
||||||
|
.file-list::-webkit-scrollbar-thumb { background: var(--border); border-radius: 4px; }
|
||||||
|
|
||||||
|
.file-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.6rem;
|
||||||
|
padding: 0.45rem 1rem;
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: 0;
|
||||||
|
transition: background 0.12s;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
color: var(--text-dim);
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
.file-item:hover { background: var(--bg-hover); color: var(--text); }
|
||||||
|
.file-item.dir { color: var(--accent); }
|
||||||
|
.file-item.dir:hover { color: var(--accent); }
|
||||||
|
.file-item .icon { font-size: 0.95rem; flex-shrink: 0; opacity: 0.8; }
|
||||||
|
.file-item .name { flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
|
.file-item .add-btn {
|
||||||
|
opacity: 0;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
background: var(--bg-hover);
|
||||||
|
color: var(--text);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: 4px;
|
||||||
|
padding: 0.2rem 0.4rem;
|
||||||
|
cursor: pointer;
|
||||||
|
flex-shrink: 0;
|
||||||
|
transition: all 0.15s;
|
||||||
|
}
|
||||||
|
.file-item:hover .add-btn { opacity: 1; }
|
||||||
|
.file-item .add-btn:hover { background: var(--accent); color: #fff; border-color: var(--accent); }
|
||||||
|
|
||||||
|
/* ─── Queue ─── */
|
||||||
|
.queue-panel {
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
overflow: hidden;
|
||||||
|
background: var(--bg-base);
|
||||||
|
}
|
||||||
|
.queue-header {
|
||||||
|
padding: 0.85rem 1.25rem 0.6rem;
|
||||||
|
font-size: 0.7rem;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.08em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: var(--text-muted);
|
||||||
|
border-bottom: 1px solid var(--border);
|
||||||
|
flex-shrink: 0;
|
||||||
|
display: flex; align-items: center; justify-content: space-between;
|
||||||
|
}
|
||||||
|
.queue-actions { display: flex; gap: 0.5rem; }
|
||||||
|
.queue-btn {
|
||||||
|
font-size: 0.7rem; padding: 0.2rem 0.55rem;
|
||||||
|
background: none; border: 1px solid var(--border); border-radius: 5px;
|
||||||
|
color: var(--text-muted); cursor: pointer; transition: all 0.15s;
|
||||||
|
}
|
||||||
|
.queue-btn:hover { border-color: var(--accent); color: var(--accent); }
|
||||||
|
.queue-btn.active { background: var(--accent); border-color: var(--accent); color: #fff; }
|
||||||
|
|
||||||
|
.queue-list {
|
||||||
|
flex: 1;
|
||||||
|
overflow-y: auto;
|
||||||
|
padding: 0.3rem 0;
|
||||||
|
}
|
||||||
|
.queue-list::-webkit-scrollbar { width: 4px; }
|
||||||
|
.queue-list::-webkit-scrollbar-track { background: transparent; }
|
||||||
|
.queue-list::-webkit-scrollbar-thumb { background: var(--border); border-radius: 4px; }
|
||||||
|
|
||||||
|
.queue-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.75rem;
|
||||||
|
padding: 0.55rem 1.25rem;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background 0.12s;
|
||||||
|
border-left: 2px solid transparent;
|
||||||
|
}
|
||||||
|
.queue-item:hover { background: var(--bg-hover); }
|
||||||
|
.queue-item.playing {
|
||||||
|
background: var(--bg-active);
|
||||||
|
border-left-color: var(--accent);
|
||||||
|
}
|
||||||
|
.queue-item.playing .qi-title { color: var(--accent); }
|
||||||
|
.queue-item .qi-index { font-size: 0.75rem; color: var(--text-muted); width: 1.5rem; text-align: right; flex-shrink: 0; }
|
||||||
|
.queue-item.playing .qi-index::before { content: '▶'; font-size: 0.6rem; color: var(--accent); }
|
||||||
|
.queue-item .qi-cover {
|
||||||
|
width: 36px; height: 36px; border-radius: 5px;
|
||||||
|
background: var(--bg-card);
|
||||||
|
flex-shrink: 0; overflow: hidden;
|
||||||
|
display: flex; align-items: center; justify-content: center;
|
||||||
|
font-size: 1.1rem;
|
||||||
|
}
|
||||||
|
.queue-item .qi-cover img { width: 100%; height: 100%; object-fit: cover; }
|
||||||
|
.queue-item .qi-info { flex: 1; overflow: hidden; }
|
||||||
|
.queue-item .qi-title { font-size: 0.875rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
|
.queue-item .qi-artist { font-size: 0.75rem; color: var(--text-muted); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
|
.queue-item .qi-dur { font-size: 0.72rem; color: var(--text-muted); flex-shrink: 0; }
|
||||||
|
.queue-item .qi-remove {
|
||||||
|
opacity: 0; font-size: 0.8rem; color: var(--text-muted);
|
||||||
|
background: none; border: none; cursor: pointer; padding: 2px 5px;
|
||||||
|
border-radius: 4px; transition: all 0.15s;
|
||||||
|
}
|
||||||
|
.queue-item:hover .qi-remove { opacity: 1; }
|
||||||
|
.queue-item .qi-remove:hover { color: var(--danger); }
|
||||||
|
.queue-item.dragging { opacity: 0.5; background: var(--bg-active); }
|
||||||
|
.queue-item.drag-over { border-top: 2px solid var(--accent); margin-top: -2px; }
|
||||||
|
|
||||||
|
.queue-empty {
|
||||||
|
flex: 1; display: flex; flex-direction: column;
|
||||||
|
align-items: center; justify-content: center;
|
||||||
|
color: var(--text-muted); font-size: 0.875rem; gap: 0.5rem;
|
||||||
|
padding: 2rem;
|
||||||
|
}
|
||||||
|
.queue-empty .empty-icon { font-size: 2.5rem; opacity: 0.3; }
|
||||||
|
|
||||||
|
/* ─── Player bar ─── */
|
||||||
|
.player-bar {
|
||||||
|
background: var(--bg-panel);
|
||||||
|
border-top: 1px solid var(--border);
|
||||||
|
padding: 0.9rem 1.5rem;
|
||||||
|
flex-shrink: 0;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1fr 2fr 1fr;
|
||||||
|
align-items: center;
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.np-info { display: flex; align-items: center; gap: 0.75rem; min-width: 0; }
|
||||||
|
.np-cover {
|
||||||
|
width: 44px; height: 44px; border-radius: 6px;
|
||||||
|
background: var(--bg-card);
|
||||||
|
flex-shrink: 0; overflow: hidden;
|
||||||
|
display: flex; align-items: center; justify-content: center; font-size: 1.3rem;
|
||||||
|
}
|
||||||
|
.np-cover img { width: 100%; height: 100%; object-fit: cover; }
|
||||||
|
.np-text { min-width: 0; }
|
||||||
|
.np-title { font-size: 0.875rem; font-weight: 500; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
|
.np-artist { font-size: 0.75rem; color: var(--text-muted); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
|
|
||||||
|
.controls { display: flex; flex-direction: column; align-items: center; gap: 0.5rem; }
|
||||||
|
.ctrl-btns { display: flex; align-items: center; gap: 0.5rem; }
|
||||||
|
.ctrl-btn {
|
||||||
|
background: none; border: none; color: var(--text-dim);
|
||||||
|
cursor: pointer; padding: 0.35rem; border-radius: 50%;
|
||||||
|
display: flex; align-items: center; justify-content: center;
|
||||||
|
font-size: 1rem; transition: all 0.15s;
|
||||||
|
}
|
||||||
|
.ctrl-btn:hover { color: var(--text); background: var(--bg-hover); }
|
||||||
|
.ctrl-btn.active { color: var(--accent); }
|
||||||
|
.ctrl-btn-main {
|
||||||
|
width: 38px; height: 38px;
|
||||||
|
background: var(--accent); color: #fff !important;
|
||||||
|
font-size: 1.1rem;
|
||||||
|
box-shadow: 0 0 14px var(--accent-glow);
|
||||||
|
}
|
||||||
|
.ctrl-btn-main:hover { background: var(--accent-dim) !important; }
|
||||||
|
|
||||||
|
.progress-row { display: flex; align-items: center; gap: 0.6rem; width: 100%; }
|
||||||
|
.time { font-size: 0.7rem; color: var(--text-muted); flex-shrink: 0; font-variant-numeric: tabular-nums; min-width: 2.5rem; text-align: center; }
|
||||||
|
.progress-bar {
|
||||||
|
flex: 1; height: 4px; background: var(--bg-hover);
|
||||||
|
border-radius: 2px; cursor: pointer; position: relative;
|
||||||
|
}
|
||||||
|
.progress-fill {
|
||||||
|
height: 100%; background: var(--accent); border-radius: 2px;
|
||||||
|
position: relative; transition: width 0.1s linear;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
.progress-fill::after {
|
||||||
|
content: ''; position: absolute; right: -5px; top: 50%;
|
||||||
|
transform: translateY(-50%);
|
||||||
|
width: 10px; height: 10px; border-radius: 50%;
|
||||||
|
background: var(--accent);
|
||||||
|
box-shadow: 0 0 6px var(--accent-glow);
|
||||||
|
opacity: 0; transition: opacity 0.15s;
|
||||||
|
}
|
||||||
|
.progress-bar:hover .progress-fill::after { opacity: 1; }
|
||||||
|
|
||||||
|
.volume-row { display: flex; align-items: center; gap: 0.5rem; justify-content: flex-end; }
|
||||||
|
.vol-icon { font-size: 0.9rem; color: var(--text-muted); cursor: pointer; }
|
||||||
|
.volume-slider {
|
||||||
|
-webkit-appearance: none; appearance: none;
|
||||||
|
width: 80px; height: 4px; border-radius: 2px;
|
||||||
|
background: var(--bg-hover); cursor: pointer; outline: none;
|
||||||
|
}
|
||||||
|
.volume-slider::-webkit-slider-thumb {
|
||||||
|
-webkit-appearance: none; width: 12px; height: 12px;
|
||||||
|
border-radius: 50%; background: var(--accent); cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* scrollbar global */
|
||||||
|
* { scrollbar-width: thin; scrollbar-color: var(--border) transparent; }
|
||||||
|
|
||||||
|
/* loading spinner */
|
||||||
|
@keyframes spin { to { transform: rotate(360deg); } }
|
||||||
|
.spinner { display: inline-block; width: 14px; height: 14px; border: 2px solid var(--border); border-top-color: var(--accent); border-radius: 50%; animation: spin 0.7s linear infinite; }
|
||||||
|
|
||||||
|
/* toast */
|
||||||
|
.toast {
|
||||||
|
position: fixed; bottom: 90px; right: 1.5rem;
|
||||||
|
background: var(--bg-card); border: 1px solid var(--border);
|
||||||
|
border-radius: 8px; padding: 0.6rem 1rem;
|
||||||
|
font-size: 0.8rem; color: var(--text-dim);
|
||||||
|
box-shadow: 0 8px 24px rgba(0,0,0,0.4);
|
||||||
|
opacity: 0; transform: translateY(8px);
|
||||||
|
transition: all 0.25s; pointer-events: none; z-index: 100;
|
||||||
|
}
|
||||||
|
.toast.show { opacity: 1; transform: translateY(0); }
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<!-- Header -->
|
||||||
|
<header class="header">
|
||||||
|
<div class="header-logo">
|
||||||
|
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
|
<circle cx="9" cy="18" r="3"/><circle cx="18" cy="15" r="3"/>
|
||||||
|
<path d="M12 18V6l9-3v3"/>
|
||||||
|
</svg>
|
||||||
|
Furumi Player
|
||||||
|
</div>
|
||||||
|
<button class="btn-logout" onclick="logout()">Sign out</button>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<!-- Main -->
|
||||||
|
<div class="main">
|
||||||
|
<!-- Sidebar: file browser -->
|
||||||
|
<aside class="sidebar">
|
||||||
|
<div class="sidebar-header">📁 Library</div>
|
||||||
|
<div class="breadcrumb" id="breadcrumb">/ <span onclick="navigate('')">root</span></div>
|
||||||
|
<div class="file-list" id="fileList">
|
||||||
|
<div style="padding:2rem;text-align:center;color:var(--text-muted)"><div class="spinner"></div></div>
|
||||||
|
</div>
|
||||||
|
</aside>
|
||||||
|
|
||||||
|
<!-- Queue -->
|
||||||
|
<section class="queue-panel">
|
||||||
|
<div class="queue-header">
|
||||||
|
<span>Queue</span>
|
||||||
|
<div class="queue-actions">
|
||||||
|
<button class="queue-btn active" id="btnShuffle" onclick="toggleShuffle()" title="Shuffle">⇄ Shuffle</button>
|
||||||
|
<button class="queue-btn active" id="btnRepeat" onclick="toggleRepeat()" title="Repeat">↻ Repeat</button>
|
||||||
|
<button class="queue-btn" onclick="clearQueue()" title="Clear queue">✕ Clear</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="queue-list" id="queueList">
|
||||||
|
<div class="queue-empty" id="queueEmpty">
|
||||||
|
<div class="empty-icon">🎵</div>
|
||||||
|
<div>Click files to add to queue</div>
|
||||||
|
<div style="font-size:0.75rem;margin-top:0.25rem">Double-click a folder to add all tracks</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Player bar -->
|
||||||
|
<div class="player-bar">
|
||||||
|
<!-- Now playing -->
|
||||||
|
<div class="np-info">
|
||||||
|
<div class="np-cover" id="npCover">🎵</div>
|
||||||
|
<div class="np-text">
|
||||||
|
<div class="np-title" id="npTitle">Nothing playing</div>
|
||||||
|
<div class="np-artist" id="npArtist">—</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Controls -->
|
||||||
|
<div class="controls">
|
||||||
|
<div class="ctrl-btns">
|
||||||
|
<button class="ctrl-btn" onclick="prevTrack()" title="Previous">⏮</button>
|
||||||
|
<button class="ctrl-btn ctrl-btn-main" id="btnPlayPause" onclick="togglePlay()" title="Play/Pause">▶</button>
|
||||||
|
<button class="ctrl-btn" onclick="nextTrack()" title="Next">⏭</button>
|
||||||
|
</div>
|
||||||
|
<div class="progress-row">
|
||||||
|
<span class="time" id="timeElapsed">0:00</span>
|
||||||
|
<div class="progress-bar" id="progressBar" onclick="seekTo(event)" title="Seek position">
|
||||||
|
<div class="progress-fill" id="progressFill" style="width:0%"></div>
|
||||||
|
</div>
|
||||||
|
<span class="time" id="timeDuration">0:00</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Volume -->
|
||||||
|
<div class="volume-row">
|
||||||
|
<span class="vol-icon" onclick="toggleMute()" id="volIcon" title="Toggle Mute">🔊</span>
|
||||||
|
<input type="range" class="volume-slider" id="volSlider" min="0" max="100" value="80"
|
||||||
|
title="Volume" oninput="setVolume(this.value)">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="toast" id="toast"></div>
|
||||||
|
|
||||||
|
<audio id="audioEl"></audio>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
// ─── State ───────────────────────────────────────────────────────────────────
|
||||||
|
const audio = document.getElementById('audioEl');
|
||||||
|
let queue = []; // [{path, name, meta}]
|
||||||
|
let queueIndex = -1;
|
||||||
|
let shuffle = false;
|
||||||
|
let repeatAll = true;
|
||||||
|
let shuffleOrder = [];
|
||||||
|
let currentPath = '';
|
||||||
|
let isSeeking = false;
|
||||||
|
let metaCache = {};
|
||||||
|
|
||||||
|
// Restore prefs
|
||||||
|
(function() {
|
||||||
|
try {
|
||||||
|
const v = localStorage.getItem('furumi_vol');
|
||||||
|
if (v !== null) { audio.volume = v / 100; document.getElementById('volSlider').value = v; }
|
||||||
|
shuffle = localStorage.getItem('furumi_shuffle') === '1';
|
||||||
|
repeatAll = localStorage.getItem('furumi_repeat') !== '0';
|
||||||
|
updateShuffleUI();
|
||||||
|
updateRepeatUI();
|
||||||
|
} catch(e) {}
|
||||||
|
})();
|
||||||
|
|
||||||
|
// ─── Audio events ─────────────────────────────────────────────────────────────
|
||||||
|
audio.addEventListener('timeupdate', () => {
|
||||||
|
if (!isSeeking && audio.duration) {
|
||||||
|
const pct = (audio.currentTime / audio.duration) * 100;
|
||||||
|
document.getElementById('progressFill').style.width = pct + '%';
|
||||||
|
document.getElementById('timeElapsed').textContent = fmt(audio.currentTime);
|
||||||
|
document.getElementById('timeDuration').textContent = fmt(audio.duration);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
audio.addEventListener('ended', () => nextTrack());
|
||||||
|
audio.addEventListener('play', () => { document.getElementById('btnPlayPause').textContent = '⏸'; });
|
||||||
|
audio.addEventListener('pause', () => { document.getElementById('btnPlayPause').textContent = '▶'; });
|
||||||
|
audio.addEventListener('error', () => { showToast('Failed to play track'); nextTrack(); });
|
||||||
|
|
||||||
|
// ─── Browse ───────────────────────────────────────────────────────────────────
|
||||||
|
async function navigate(path) {
|
||||||
|
currentPath = path;
|
||||||
|
updateBreadcrumb(path);
|
||||||
|
const listEl = document.getElementById('fileList');
|
||||||
|
listEl.innerHTML = '<div style="padding:2rem;text-align:center;color:var(--text-muted)"><div class="spinner"></div></div>';
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/browse?path=' + encodeURIComponent(path));
|
||||||
|
const data = await res.json();
|
||||||
|
if (!res.ok) { listEl.innerHTML = `<div style="padding:1rem;color:var(--danger)">${data.error||'Error'}</div>`; return; }
|
||||||
|
renderFileList(data.entries, path);
|
||||||
|
} catch(e) {
|
||||||
|
listEl.innerHTML = '<div style="padding:1rem;color:var(--danger)">Network error</div>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderFileList(entries, basePath) {
|
||||||
|
const listEl = document.getElementById('fileList');
|
||||||
|
if (!entries.length) {
|
||||||
|
listEl.innerHTML = '<div style="padding:1.5rem;text-align:center;color:var(--text-muted);font-size:0.85rem">Empty folder</div>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
listEl.innerHTML = '';
|
||||||
|
entries.forEach(e => {
|
||||||
|
const div = document.createElement('div');
|
||||||
|
div.className = 'file-item ' + (e.type === 'dir' ? 'dir' : '');
|
||||||
|
const itemPath = basePath ? basePath + '/' + e.name : e.name;
|
||||||
|
|
||||||
|
if (e.type === 'dir') {
|
||||||
|
div.innerHTML = `<span class="icon">📁</span><span class="name">${esc(e.name)}</span>
|
||||||
|
<button class="add-btn" title="Add folder to queue">➕</button>`;
|
||||||
|
div.querySelector('.add-btn').addEventListener('click', ev => {
|
||||||
|
ev.stopPropagation();
|
||||||
|
addFolderToQueue(itemPath);
|
||||||
|
});
|
||||||
|
div.addEventListener('click', () => navigate(itemPath));
|
||||||
|
div.addEventListener('dblclick', () => addFolderToQueue(itemPath));
|
||||||
|
} else {
|
||||||
|
div.innerHTML = `<span class="icon">🎵</span><span class="name">${esc(e.name)}</span>
|
||||||
|
<button class="add-btn add-next" title="Play next">▶️</button>
|
||||||
|
<button class="add-btn add-end" title="Add to end">➕</button>`;
|
||||||
|
|
||||||
|
div.querySelector('.add-next').addEventListener('click', ev => {
|
||||||
|
ev.stopPropagation();
|
||||||
|
addNextProtocol(itemPath, e.name);
|
||||||
|
});
|
||||||
|
div.querySelector('.add-end').addEventListener('click', ev => {
|
||||||
|
ev.stopPropagation();
|
||||||
|
addToQueue(itemPath, e.name);
|
||||||
|
showToast('Added to queue');
|
||||||
|
});
|
||||||
|
div.addEventListener('click', () => {
|
||||||
|
addToQueue(itemPath, e.name, true);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
listEl.appendChild(div);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateBreadcrumb(path) {
|
||||||
|
const el = document.getElementById('breadcrumb');
|
||||||
|
if (!path) { el.innerHTML = '/ <span onclick="navigate(\'\')">root</span>'; return; }
|
||||||
|
const parts = path.split('/');
|
||||||
|
let html = '/ <span onclick="navigate(\'\')">root</span>';
|
||||||
|
let acc = '';
|
||||||
|
parts.forEach((p, i) => {
|
||||||
|
acc = acc ? acc + '/' + p : p;
|
||||||
|
const cap = acc;
|
||||||
|
if (i < parts.length - 1) html += ` / <span onclick="navigate('${cap}')">${esc(p)}</span>`;
|
||||||
|
else html += ` / ${esc(p)}`;
|
||||||
|
});
|
||||||
|
el.innerHTML = html;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function addFolderToQueue(folderPath) {
|
||||||
|
showToast('Loading folder…');
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/browse?path=' + encodeURIComponent(folderPath));
|
||||||
|
if (!res.ok) throw new Error('API error');
|
||||||
|
const data = await res.json();
|
||||||
|
const files = (data.entries || []).filter(e => e.type === 'file');
|
||||||
|
|
||||||
|
// Process additions in a batch to avoid UI race conditions
|
||||||
|
files.forEach(f => {
|
||||||
|
const p = folderPath ? folderPath + '/' + f.name : f.name;
|
||||||
|
addToQueue(p, f.name, false, true); // true = skipRender
|
||||||
|
});
|
||||||
|
|
||||||
|
renderQueue(); // render once after the batch
|
||||||
|
|
||||||
|
// Auto-start if it was empty
|
||||||
|
if (queueIndex === -1 && queue.length > 0) {
|
||||||
|
playIndex(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
showToast(`Added ${files.length} tracks`);
|
||||||
|
} catch(e) {
|
||||||
|
console.error(e);
|
||||||
|
showToast('Error loading folder');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Queue ────────────────────────────────────────────────────────────────────
|
||||||
|
function addNextProtocol(path, name) {
|
||||||
|
const existing = queue.findIndex(t => t.path === path);
|
||||||
|
if (existing !== -1) return; // already in queue
|
||||||
|
|
||||||
|
const track = { path, name, meta: null };
|
||||||
|
let newIdx;
|
||||||
|
|
||||||
|
if (queueIndex === -1 || queue.length === 0) {
|
||||||
|
// nothing playing, just add and play
|
||||||
|
queue.push(track);
|
||||||
|
newIdx = queue.length - 1;
|
||||||
|
fetchMeta(path, newIdx);
|
||||||
|
renderQueue();
|
||||||
|
playIndex(newIdx);
|
||||||
|
} else {
|
||||||
|
// insert right after current playing
|
||||||
|
newIdx = queueIndex + 1;
|
||||||
|
queue.splice(newIdx, 0, track);
|
||||||
|
|
||||||
|
// update shuffle order if needed
|
||||||
|
if (shuffle) {
|
||||||
|
shuffleOrder.splice(shuffleOrder.indexOf(queueIndex) + 1, 0, newIdx);
|
||||||
|
// adjust indices for tracks shifted to the right
|
||||||
|
for (let i = 0; i < shuffleOrder.length; i++) {
|
||||||
|
if (shuffleOrder[i] >= newIdx && shuffleOrder[i] !== newIdx) {
|
||||||
|
shuffleOrder[i]++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fetchMeta(path, newIdx);
|
||||||
|
renderQueue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function addToQueue(path, name, playNow = false, skipRender = false) {
|
||||||
|
const existing = queue.findIndex(t => t.path === path);
|
||||||
|
if (existing !== -1 && !playNow) return;
|
||||||
|
|
||||||
|
if (existing === -1) {
|
||||||
|
queue.push({ path, name, meta: null });
|
||||||
|
const idx = queue.length - 1;
|
||||||
|
fetchMeta(path, idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
const idx = existing !== -1 ? existing : queue.length - 1;
|
||||||
|
|
||||||
|
if (!skipRender) renderQueue();
|
||||||
|
|
||||||
|
if (playNow) {
|
||||||
|
if (queueIndex === -1) {
|
||||||
|
playIndex(idx);
|
||||||
|
} // else already playing, just queued
|
||||||
|
}
|
||||||
|
|
||||||
|
if (queueIndex === -1 && !playNow && !skipRender) {
|
||||||
|
// Auto-start if first item
|
||||||
|
playIndex(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function playIndex(i) {
|
||||||
|
if (i < 0 || i >= queue.length) return;
|
||||||
|
queueIndex = i;
|
||||||
|
const track = queue[i];
|
||||||
|
const url = '/api/stream/' + track.path;
|
||||||
|
audio.src = url;
|
||||||
|
audio.play().catch(() => {});
|
||||||
|
updateNowPlaying(track);
|
||||||
|
renderQueue();
|
||||||
|
scrollQueueToActive();
|
||||||
|
loadMeta(track);
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateNowPlaying(track) {
|
||||||
|
document.getElementById('npTitle').textContent = track.meta?.title || displayName(track.name);
|
||||||
|
document.getElementById('npArtist').textContent = track.meta?.artist || '—';
|
||||||
|
if (track.meta?.cover_base64) {
|
||||||
|
document.getElementById('npCover').innerHTML = `<img src="${track.meta.cover_base64}" alt="cover">`;
|
||||||
|
} else {
|
||||||
|
document.getElementById('npCover').textContent = '🎵';
|
||||||
|
}
|
||||||
|
document.title = (track.meta?.title || displayName(track.name)) + ' — Furumi Player';
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadMeta(track) {
|
||||||
|
if (track.meta) { updateNowPlaying(track); return; }
|
||||||
|
const cached = metaCache[track.path];
|
||||||
|
if (cached) { track.meta = cached; updateNowPlaying(track); return; }
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/meta/' + track.path);
|
||||||
|
if (res.ok) {
|
||||||
|
const meta = await res.json();
|
||||||
|
metaCache[track.path] = meta;
|
||||||
|
track.meta = meta;
|
||||||
|
updateNowPlaying(track);
|
||||||
|
renderQueue();
|
||||||
|
}
|
||||||
|
} catch(e) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchMeta(path, idx) {
|
||||||
|
const cached = metaCache[path];
|
||||||
|
if (cached) { queue[idx].meta = cached; renderQueue(); return; }
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/meta/' + path);
|
||||||
|
if (res.ok) {
|
||||||
|
const meta = await res.json();
|
||||||
|
metaCache[path] = meta;
|
||||||
|
if (queue[idx]) { queue[idx].meta = meta; }
|
||||||
|
renderQueue();
|
||||||
|
}
|
||||||
|
} catch(e) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderQueue() {
|
||||||
|
const listEl = document.getElementById('queueList');
|
||||||
|
|
||||||
|
if (!queue.length) {
|
||||||
|
listEl.innerHTML = `
|
||||||
|
<div class="queue-empty" id="queueEmpty">
|
||||||
|
<div class="empty-icon">🎵</div>
|
||||||
|
<div>Click files to add to queue</div>
|
||||||
|
<div style="font-size:0.75rem;margin-top:0.25rem">Double-click a folder to add all tracks</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const order = currentOrder();
|
||||||
|
listEl.innerHTML = '';
|
||||||
|
|
||||||
|
order.forEach((origIdx, pos) => {
|
||||||
|
const track = queue[origIdx];
|
||||||
|
const isPlaying = origIdx === queueIndex;
|
||||||
|
const div = document.createElement('div');
|
||||||
|
div.className = 'queue-item' + (isPlaying ? ' playing' : '');
|
||||||
|
div.dataset.origIdx = origIdx;
|
||||||
|
|
||||||
|
const cover = track.meta?.cover_base64
|
||||||
|
? `<img src="${track.meta.cover_base64}" alt="">`
|
||||||
|
: '🎵';
|
||||||
|
const title = track.meta?.title || displayName(track.name);
|
||||||
|
const artist = track.meta?.artist || '';
|
||||||
|
const dur = track.meta?.duration_secs != null ? fmt(track.meta.duration_secs) : '';
|
||||||
|
const idxDisplay = isPlaying ? '' : (pos + 1);
|
||||||
|
|
||||||
|
div.innerHTML = `
|
||||||
|
<span class="qi-index">${idxDisplay}</span>
|
||||||
|
<div class="qi-cover">${cover}</div>
|
||||||
|
<div class="qi-info">
|
||||||
|
<div class="qi-title">${esc(title)}</div>
|
||||||
|
<div class="qi-artist">${esc(artist)}</div>
|
||||||
|
</div>
|
||||||
|
<span class="qi-dur">${dur}</span>
|
||||||
|
<button class="qi-remove" title="Remove track" onclick="removeFromQueue(${origIdx}, event)">✕</button>
|
||||||
|
`;
|
||||||
|
div.addEventListener('click', () => playIndex(origIdx));
|
||||||
|
|
||||||
|
// Drag & Drop for reordering
|
||||||
|
div.draggable = true;
|
||||||
|
div.addEventListener('dragstart', e => {
|
||||||
|
e.dataTransfer.effectAllowed = 'move';
|
||||||
|
e.dataTransfer.setData('text/plain', pos);
|
||||||
|
div.classList.add('dragging');
|
||||||
|
});
|
||||||
|
div.addEventListener('dragend', () => {
|
||||||
|
div.classList.remove('dragging');
|
||||||
|
document.querySelectorAll('.queue-item').forEach(el => el.classList.remove('drag-over'));
|
||||||
|
});
|
||||||
|
div.addEventListener('dragover', e => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.dataTransfer.dropEffect = 'move';
|
||||||
|
});
|
||||||
|
div.addEventListener('dragenter', () => div.classList.add('drag-over'));
|
||||||
|
div.addEventListener('dragleave', () => div.classList.remove('drag-over'));
|
||||||
|
div.addEventListener('drop', e => {
|
||||||
|
e.preventDefault();
|
||||||
|
div.classList.remove('drag-over');
|
||||||
|
const fromPos = parseInt(e.dataTransfer.getData('text/plain'), 10);
|
||||||
|
if (!isNaN(fromPos)) moveQueueItem(fromPos, pos);
|
||||||
|
});
|
||||||
|
|
||||||
|
listEl.appendChild(div);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function scrollQueueToActive() {
|
||||||
|
const el = document.querySelector('.queue-item.playing');
|
||||||
|
if (el) el.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeFromQueue(origIdx, ev) {
|
||||||
|
ev.stopPropagation();
|
||||||
|
queue.splice(origIdx, 1);
|
||||||
|
if (queueIndex === origIdx) { queueIndex = -1; audio.pause(); audio.src = ''; }
|
||||||
|
else if (queueIndex > origIdx) queueIndex--;
|
||||||
|
|
||||||
|
if (shuffle) {
|
||||||
|
const sidx = shuffleOrder.indexOf(origIdx);
|
||||||
|
if (sidx !== -1) shuffleOrder.splice(sidx, 1);
|
||||||
|
for (let i = 0; i < shuffleOrder.length; i++) {
|
||||||
|
if (shuffleOrder[i] > origIdx) shuffleOrder[i]--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
renderQueue();
|
||||||
|
}
|
||||||
|
|
||||||
|
function moveQueueItem(fromPos, toPos) {
|
||||||
|
if (fromPos === toPos) return;
|
||||||
|
|
||||||
|
if (shuffle) {
|
||||||
|
const item = shuffleOrder.splice(fromPos, 1)[0];
|
||||||
|
shuffleOrder.splice(toPos, 0, item);
|
||||||
|
} else {
|
||||||
|
const item = queue.splice(fromPos, 1)[0];
|
||||||
|
queue.splice(toPos, 0, item);
|
||||||
|
|
||||||
|
if (queueIndex === fromPos) {
|
||||||
|
queueIndex = toPos;
|
||||||
|
} else if (fromPos < queueIndex && toPos >= queueIndex) {
|
||||||
|
queueIndex--;
|
||||||
|
} else if (fromPos > queueIndex && toPos <= queueIndex) {
|
||||||
|
queueIndex++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
renderQueue();
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearQueue() {
|
||||||
|
queue = []; queueIndex = -1; shuffleOrder = [];
|
||||||
|
audio.pause(); audio.src = '';
|
||||||
|
document.getElementById('npTitle').textContent = 'Nothing playing';
|
||||||
|
document.getElementById('npArtist').textContent = '—';
|
||||||
|
document.getElementById('npCover').textContent = '🎵';
|
||||||
|
document.title = 'Furumi Player';
|
||||||
|
renderQueue();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Playback controls ────────────────────────────────────────────────────────
|
||||||
|
function togglePlay() {
|
||||||
|
if (!audio.src) { if (queue.length) playIndex(queueIndex === -1 ? 0 : queueIndex); return; }
|
||||||
|
if (audio.paused) audio.play();
|
||||||
|
else audio.pause();
|
||||||
|
}
|
||||||
|
|
||||||
|
function nextTrack() {
|
||||||
|
if (!queue.length) return;
|
||||||
|
const order = currentOrder();
|
||||||
|
const pos = order.indexOf(queueIndex);
|
||||||
|
if (pos < order.length - 1) {
|
||||||
|
playIndex(order[pos + 1]);
|
||||||
|
} else if (repeatAll) {
|
||||||
|
if (shuffle) buildShuffleOrder();
|
||||||
|
playIndex(currentOrder()[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function prevTrack() {
|
||||||
|
if (!queue.length) return;
|
||||||
|
if (audio.currentTime > 3) { audio.currentTime = 0; return; }
|
||||||
|
const order = currentOrder();
|
||||||
|
const pos = order.indexOf(queueIndex);
|
||||||
|
if (pos > 0) playIndex(order[pos - 1]);
|
||||||
|
else if (repeatAll) playIndex(order[order.length - 1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleShuffle() {
|
||||||
|
shuffle = !shuffle;
|
||||||
|
if (shuffle) buildShuffleOrder();
|
||||||
|
updateShuffleUI();
|
||||||
|
localStorage.setItem('furumi_shuffle', shuffle ? '1' : '0');
|
||||||
|
renderQueue();
|
||||||
|
}
|
||||||
|
function updateShuffleUI() {
|
||||||
|
document.getElementById('btnShuffle').classList.toggle('active', shuffle);
|
||||||
|
}
|
||||||
|
function toggleRepeat() {
|
||||||
|
repeatAll = !repeatAll;
|
||||||
|
updateRepeatUI();
|
||||||
|
localStorage.setItem('furumi_repeat', repeatAll ? '1' : '0');
|
||||||
|
}
|
||||||
|
function updateRepeatUI() {
|
||||||
|
document.getElementById('btnRepeat').classList.toggle('active', repeatAll);
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildShuffleOrder() {
|
||||||
|
shuffleOrder = [...Array(queue.length).keys()];
|
||||||
|
for (let i = shuffleOrder.length - 1; i > 0; i--) {
|
||||||
|
const j = Math.floor(Math.random() * (i + 1));
|
||||||
|
[shuffleOrder[i], shuffleOrder[j]] = [shuffleOrder[j], shuffleOrder[i]];
|
||||||
|
}
|
||||||
|
// Put current track first in shuffle order
|
||||||
|
if (queueIndex !== -1) {
|
||||||
|
const ci = shuffleOrder.indexOf(queueIndex);
|
||||||
|
if (ci > 0) { shuffleOrder.splice(ci, 1); shuffleOrder.unshift(queueIndex); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function currentOrder() {
|
||||||
|
if (!shuffle) return [...Array(queue.length).keys()];
|
||||||
|
if (shuffleOrder.length !== queue.length) buildShuffleOrder();
|
||||||
|
return shuffleOrder;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Seek & Volume ────────────────────────────────────────────────────────────
|
||||||
|
function seekTo(e) {
|
||||||
|
if (!audio.duration) return;
|
||||||
|
const bar = document.getElementById('progressBar');
|
||||||
|
const rect = bar.getBoundingClientRect();
|
||||||
|
const pct = (e.clientX - rect.left) / rect.width;
|
||||||
|
audio.currentTime = pct * audio.duration;
|
||||||
|
}
|
||||||
|
|
||||||
|
let muted = false, volBeforeMute = 80;
|
||||||
|
function toggleMute() {
|
||||||
|
muted = !muted;
|
||||||
|
audio.muted = muted;
|
||||||
|
document.getElementById('volIcon').textContent = muted ? '🔇' : '🔊';
|
||||||
|
}
|
||||||
|
function setVolume(v) {
|
||||||
|
audio.volume = v / 100;
|
||||||
|
document.getElementById('volIcon').textContent = v == 0 ? '🔇' : '🔊';
|
||||||
|
localStorage.setItem('furumi_vol', v);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Helpers ──────────────────────────────────────────────────────────────────
|
||||||
|
function fmt(secs) {
|
||||||
|
if (!secs || isNaN(secs)) return '0:00';
|
||||||
|
const s = Math.floor(secs);
|
||||||
|
const m = Math.floor(s / 60);
|
||||||
|
const h = Math.floor(m / 60);
|
||||||
|
if (h > 0) return `${h}:${pad(m % 60)}:${pad(s % 60)}`;
|
||||||
|
return `${m}:${pad(s % 60)}`;
|
||||||
|
}
|
||||||
|
function pad(n) { return String(n).padStart(2, '0'); }
|
||||||
|
function esc(s) { return String(s).replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"'); }
|
||||||
|
function displayName(filename) {
|
||||||
|
return filename.replace(/\.[^.]+$/, '').replace(/_/g, ' ').replace(/^\d+[\s.-]+/, '');
|
||||||
|
}
|
||||||
|
|
||||||
|
let toastTimer;
|
||||||
|
function showToast(msg) {
|
||||||
|
const t = document.getElementById('toast');
|
||||||
|
t.textContent = msg;
|
||||||
|
t.classList.add('show');
|
||||||
|
clearTimeout(toastTimer);
|
||||||
|
toastTimer = setTimeout(() => t.classList.remove('show'), 2500);
|
||||||
|
}
|
||||||
|
|
||||||
|
function logout() {
|
||||||
|
window.location.href = '/logout';
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Init ─────────────────────────────────────────────────────────────────────
|
||||||
|
navigate('');
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
171
furumi-server/src/web/stream.rs
Normal file
171
furumi-server/src/web/stream.rs
Normal file
@@ -0,0 +1,171 @@
|
|||||||
|
use axum::{
|
||||||
|
body::Body,
|
||||||
|
extract::{Path, Query, State},
|
||||||
|
http::{HeaderMap, HeaderValue, StatusCode, header},
|
||||||
|
response::{IntoResponse, Response},
|
||||||
|
};
|
||||||
|
use serde::Deserialize;
|
||||||
|
use tokio::io::{AsyncReadExt, AsyncSeekExt};
|
||||||
|
|
||||||
|
use crate::security::sanitize_path;
|
||||||
|
use super::{
|
||||||
|
WebState,
|
||||||
|
browse::{is_audio_file, needs_transcode},
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct StreamQuery {
|
||||||
|
#[serde(default)]
|
||||||
|
pub transcode: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn handler(
|
||||||
|
State(state): State<WebState>,
|
||||||
|
Path(path): Path<String>,
|
||||||
|
Query(query): Query<StreamQuery>,
|
||||||
|
headers: HeaderMap,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
let safe = match sanitize_path(&path) {
|
||||||
|
Ok(p) => p,
|
||||||
|
Err(_) => return bad_request("invalid path"),
|
||||||
|
};
|
||||||
|
|
||||||
|
let file_path = state.root.join(&safe);
|
||||||
|
|
||||||
|
let filename = file_path
|
||||||
|
.file_name()
|
||||||
|
.and_then(|n| n.to_str())
|
||||||
|
.unwrap_or("")
|
||||||
|
.to_owned();
|
||||||
|
|
||||||
|
if !is_audio_file(&filename) {
|
||||||
|
return (StatusCode::FORBIDDEN, "not an audio file").into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
let force_transcode = query.transcode.as_deref() == Some("1");
|
||||||
|
|
||||||
|
if force_transcode || needs_transcode(&filename) {
|
||||||
|
return stream_transcoded(file_path).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
stream_native(file_path, &filename, &headers).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Stream a file as-is with Range support.
|
||||||
|
async fn stream_native(file_path: std::path::PathBuf, filename: &str, req_headers: &HeaderMap) -> Response {
|
||||||
|
let mut file = match tokio::fs::File::open(&file_path).await {
|
||||||
|
Ok(f) => f,
|
||||||
|
Err(e) => {
|
||||||
|
let status = if e.kind() == std::io::ErrorKind::NotFound {
|
||||||
|
StatusCode::NOT_FOUND
|
||||||
|
} else {
|
||||||
|
StatusCode::INTERNAL_SERVER_ERROR
|
||||||
|
};
|
||||||
|
return (status, e.to_string()).into_response();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let file_size = match file.metadata().await {
|
||||||
|
Ok(m) => m.len(),
|
||||||
|
Err(e) => return (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let content_type = guess_content_type(filename);
|
||||||
|
|
||||||
|
// Parse Range header
|
||||||
|
let range_header = req_headers
|
||||||
|
.get(header::RANGE)
|
||||||
|
.and_then(|v| v.to_str().ok())
|
||||||
|
.and_then(parse_range);
|
||||||
|
|
||||||
|
if let Some((start, end)) = range_header {
|
||||||
|
let end = end.unwrap_or(file_size - 1).min(file_size - 1);
|
||||||
|
if start > end || start >= file_size {
|
||||||
|
return (StatusCode::RANGE_NOT_SATISFIABLE, "invalid range").into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
let length = end - start + 1;
|
||||||
|
|
||||||
|
if let Err(e) = file.seek(std::io::SeekFrom::Start(start)).await {
|
||||||
|
return (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
let limited = file.take(length);
|
||||||
|
let stream = tokio_util::io::ReaderStream::new(limited);
|
||||||
|
let body = Body::from_stream(stream);
|
||||||
|
|
||||||
|
let mut resp_headers = HeaderMap::new();
|
||||||
|
resp_headers.insert(header::CONTENT_TYPE, content_type.parse().unwrap());
|
||||||
|
resp_headers.insert(header::ACCEPT_RANGES, HeaderValue::from_static("bytes"));
|
||||||
|
resp_headers.insert(header::CONTENT_LENGTH, length.to_string().parse().unwrap());
|
||||||
|
resp_headers.insert(
|
||||||
|
header::CONTENT_RANGE,
|
||||||
|
format!("bytes {}-{}/{}", start, end, file_size).parse().unwrap(),
|
||||||
|
);
|
||||||
|
(StatusCode::PARTIAL_CONTENT, resp_headers, body).into_response()
|
||||||
|
} else {
|
||||||
|
// Full file
|
||||||
|
let stream = tokio_util::io::ReaderStream::new(file);
|
||||||
|
let body = Body::from_stream(stream);
|
||||||
|
|
||||||
|
let mut resp_headers = HeaderMap::new();
|
||||||
|
resp_headers.insert(header::CONTENT_TYPE, content_type.parse().unwrap());
|
||||||
|
resp_headers.insert(header::ACCEPT_RANGES, HeaderValue::from_static("bytes"));
|
||||||
|
resp_headers.insert(header::CONTENT_LENGTH, file_size.to_string().parse().unwrap());
|
||||||
|
(StatusCode::OK, resp_headers, body).into_response()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Stream a transcoded (Ogg/Opus) version of the file.
|
||||||
|
async fn stream_transcoded(file_path: std::path::PathBuf) -> Response {
|
||||||
|
let ogg_data = match tokio::task::spawn_blocking(move || {
|
||||||
|
super::transcoder::transcode_to_ogg_opus(file_path)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(Ok(data)) => data,
|
||||||
|
Ok(Err(e)) => {
|
||||||
|
return (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response();
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
return (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let len = ogg_data.len();
|
||||||
|
let mut resp_headers = HeaderMap::new();
|
||||||
|
resp_headers.insert(header::CONTENT_TYPE, "audio/ogg".parse().unwrap());
|
||||||
|
resp_headers.insert(header::CONTENT_LENGTH, len.to_string().parse().unwrap());
|
||||||
|
resp_headers.insert(header::ACCEPT_RANGES, HeaderValue::from_static("none"));
|
||||||
|
|
||||||
|
(StatusCode::OK, resp_headers, Body::from(ogg_data)).into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse `Range: bytes=<start>-<end>` header.
|
||||||
|
fn parse_range(s: &str) -> Option<(u64, Option<u64>)> {
|
||||||
|
let s = s.strip_prefix("bytes=")?;
|
||||||
|
let mut parts = s.splitn(2, '-');
|
||||||
|
let start: u64 = parts.next()?.parse().ok()?;
|
||||||
|
let end: Option<u64> = parts.next().and_then(|e| {
|
||||||
|
if e.is_empty() { None } else { e.parse().ok() }
|
||||||
|
});
|
||||||
|
Some((start, end))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn guess_content_type(filename: &str) -> &'static str {
|
||||||
|
let ext = filename.rsplit('.').next().unwrap_or("").to_lowercase();
|
||||||
|
match ext.as_str() {
|
||||||
|
"mp3" => "audio/mpeg",
|
||||||
|
"flac" => "audio/flac",
|
||||||
|
"ogg" => "audio/ogg",
|
||||||
|
"opus" => "audio/ogg; codecs=opus",
|
||||||
|
"aac" => "audio/aac",
|
||||||
|
"m4a" => "audio/mp4",
|
||||||
|
"wav" => "audio/wav",
|
||||||
|
_ => "application/octet-stream",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn bad_request(msg: &'static str) -> Response {
|
||||||
|
(StatusCode::BAD_REQUEST, msg).into_response()
|
||||||
|
}
|
||||||
244
furumi-server/src/web/transcoder.rs
Normal file
244
furumi-server/src/web/transcoder.rs
Normal file
@@ -0,0 +1,244 @@
|
|||||||
|
//! Symphonia-based audio transcoder: decodes any format → encodes to Ogg/Opus stream.
|
||||||
|
//!
|
||||||
|
//! The heavy decode/encode work runs in a `spawn_blocking` thread.
|
||||||
|
//! PCM samples are sent over a channel to the async stream handler.
|
||||||
|
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::io::Cursor;
|
||||||
|
|
||||||
|
use anyhow::{anyhow, Result};
|
||||||
|
use symphonia::core::{
|
||||||
|
audio::{AudioBufferRef, Signal},
|
||||||
|
codecs::{DecoderOptions, CODEC_TYPE_NULL},
|
||||||
|
errors::Error as SymphoniaError,
|
||||||
|
formats::FormatOptions,
|
||||||
|
io::MediaSourceStream,
|
||||||
|
meta::MetadataOptions,
|
||||||
|
probe::Hint,
|
||||||
|
};
|
||||||
|
use ogg::writing::PacketWriter;
|
||||||
|
use opus::{Application, Channels, Encoder};
|
||||||
|
|
||||||
|
/// Transcode an audio file at `path` into an Ogg/Opus byte stream.
|
||||||
|
/// Returns `Vec<u8>` with the full Ogg/Opus file (suitable for streaming/download).
|
||||||
|
///
|
||||||
|
/// This is intentionally synchronous (for use inside `spawn_blocking`).
|
||||||
|
pub fn transcode_to_ogg_opus(path: PathBuf) -> Result<Vec<u8>> {
|
||||||
|
// ---- Open and probe the source ----
|
||||||
|
let file = std::fs::File::open(&path)?;
|
||||||
|
let mss = MediaSourceStream::new(Box::new(file), Default::default());
|
||||||
|
|
||||||
|
let mut hint = Hint::new();
|
||||||
|
if let Some(ext) = path.extension().and_then(|e| e.to_str()) {
|
||||||
|
hint.with_extension(ext);
|
||||||
|
}
|
||||||
|
|
||||||
|
let probed = symphonia::default::get_probe()
|
||||||
|
.format(&hint, mss, &FormatOptions::default(), &MetadataOptions::default())
|
||||||
|
.map_err(|e| anyhow!("probe failed: {e}"))?;
|
||||||
|
|
||||||
|
let mut format = probed.format;
|
||||||
|
|
||||||
|
// Find the default audio track
|
||||||
|
let track = format
|
||||||
|
.tracks()
|
||||||
|
.iter()
|
||||||
|
.find(|t| t.codec_params.codec != CODEC_TYPE_NULL)
|
||||||
|
.ok_or_else(|| anyhow!("no audio track found"))?
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
let track_id = track.id;
|
||||||
|
let codec_params = &track.codec_params;
|
||||||
|
|
||||||
|
let sample_rate = codec_params.sample_rate.unwrap_or(44100);
|
||||||
|
let n_channels = codec_params.channels.map(|c| c.count()).unwrap_or(2);
|
||||||
|
|
||||||
|
// Opus only supports 1 or 2 channels; downmix to stereo if needed
|
||||||
|
let opus_channels = if n_channels == 1 { Channels::Mono } else { Channels::Stereo };
|
||||||
|
let opus_ch_count = if n_channels == 1 { 1usize } else { 2 };
|
||||||
|
|
||||||
|
// Opus encoder (target 48 kHz, we'll resample if needed)
|
||||||
|
// Opus natively works at 48000 Hz; symphonia will decode at source rate.
|
||||||
|
// For simplicity, we encode at the source sample rate - most clients handle this.
|
||||||
|
let opus_sample_rate = if [8000u32, 12000, 16000, 24000, 48000].contains(&sample_rate) {
|
||||||
|
sample_rate
|
||||||
|
} else {
|
||||||
|
// Opus spec: use closest supported rate; 48000 is safest
|
||||||
|
48000
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut encoder = Encoder::new(opus_sample_rate, opus_channels, Application::Audio)
|
||||||
|
.map_err(|e| anyhow!("opus encoder init: {e}"))?;
|
||||||
|
|
||||||
|
// Typical Opus frame = 20ms
|
||||||
|
let frame_size = (opus_sample_rate as usize * 20) / 1000; // samples per channel per frame
|
||||||
|
|
||||||
|
let mut decoder = symphonia::default::get_codecs()
|
||||||
|
.make(codec_params, &DecoderOptions::default())
|
||||||
|
.map_err(|e| anyhow!("decoder init: {e}"))?;
|
||||||
|
|
||||||
|
// ---- Ogg output buffer ----
|
||||||
|
let mut ogg_buf: Vec<u8> = Vec::with_capacity(4 * 1024 * 1024);
|
||||||
|
{
|
||||||
|
let cursor = Cursor::new(&mut ogg_buf);
|
||||||
|
let mut pkt_writer = PacketWriter::new(cursor);
|
||||||
|
|
||||||
|
// Write Opus header packet (stream serial = 1)
|
||||||
|
let serial: u32 = 1;
|
||||||
|
let opus_head = build_opus_head(opus_ch_count as u8, opus_sample_rate, 0);
|
||||||
|
pkt_writer.write_packet(opus_head, serial, ogg::writing::PacketWriteEndInfo::EndPage, 0)?;
|
||||||
|
|
||||||
|
// Write Opus tags packet (empty)
|
||||||
|
let opus_tags = build_opus_tags();
|
||||||
|
pkt_writer.write_packet(opus_tags, serial, ogg::writing::PacketWriteEndInfo::EndPage, 0)?;
|
||||||
|
|
||||||
|
let mut sample_buf: Vec<f32> = Vec::new();
|
||||||
|
let mut granule_pos: u64 = 0;
|
||||||
|
|
||||||
|
loop {
|
||||||
|
let packet = match format.next_packet() {
|
||||||
|
Ok(p) => p,
|
||||||
|
Err(SymphoniaError::IoError(e)) if e.kind() == std::io::ErrorKind::UnexpectedEof => break,
|
||||||
|
Err(SymphoniaError::ResetRequired) => {
|
||||||
|
decoder.reset();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Err(e) => return Err(anyhow!("format error: {e}")),
|
||||||
|
};
|
||||||
|
|
||||||
|
if packet.track_id() != track_id {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
match decoder.decode(&packet) {
|
||||||
|
Ok(decoded) => {
|
||||||
|
collect_samples(&decoded, opus_ch_count, &mut sample_buf);
|
||||||
|
}
|
||||||
|
Err(SymphoniaError::DecodeError(_)) => continue,
|
||||||
|
Err(e) => return Err(anyhow!("decode error: {e}")),
|
||||||
|
}
|
||||||
|
|
||||||
|
// Encode complete frames from sample_buf
|
||||||
|
while sample_buf.len() >= frame_size * opus_ch_count {
|
||||||
|
let frame: Vec<f32> = sample_buf.drain(..frame_size * opus_ch_count).collect();
|
||||||
|
let mut out = vec![0u8; 4000];
|
||||||
|
let encoded_len = encoder
|
||||||
|
.encode_float(&frame, &mut out)
|
||||||
|
.map_err(|e| anyhow!("opus encode: {e}"))?;
|
||||||
|
out.truncate(encoded_len);
|
||||||
|
|
||||||
|
granule_pos += frame_size as u64;
|
||||||
|
pkt_writer.write_packet(
|
||||||
|
out,
|
||||||
|
serial,
|
||||||
|
ogg::writing::PacketWriteEndInfo::NormalPacket,
|
||||||
|
granule_pos,
|
||||||
|
)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Encode remaining samples (partial frame — pad with silence)
|
||||||
|
if !sample_buf.is_empty() {
|
||||||
|
let needed = frame_size * opus_ch_count;
|
||||||
|
sample_buf.resize(needed, 0.0);
|
||||||
|
let mut out = vec![0u8; 4000];
|
||||||
|
let encoded_len = encoder
|
||||||
|
.encode_float(&sample_buf, &mut out)
|
||||||
|
.map_err(|e| anyhow!("opus encode final: {e}"))?;
|
||||||
|
out.truncate(encoded_len);
|
||||||
|
granule_pos += frame_size as u64;
|
||||||
|
pkt_writer.write_packet(
|
||||||
|
out,
|
||||||
|
serial,
|
||||||
|
ogg::writing::PacketWriteEndInfo::EndStream,
|
||||||
|
granule_pos,
|
||||||
|
)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(ogg_buf)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Collect PCM samples from a symphonia AudioBufferRef into a flat f32 vec.
|
||||||
|
/// Downmixes to `target_channels` (1 or 2) if source has more channels.
|
||||||
|
fn collect_samples(decoded: &AudioBufferRef<'_>, target_channels: usize, out: &mut Vec<f32>) {
|
||||||
|
match decoded {
|
||||||
|
AudioBufferRef::F32(buf) => {
|
||||||
|
interleave_channels(buf.chan(0), if buf.spec().channels.count() > 1 { Some(buf.chan(1)) } else { None }, target_channels, out);
|
||||||
|
}
|
||||||
|
AudioBufferRef::S16(buf) => {
|
||||||
|
let ch0: Vec<f32> = buf.chan(0).iter().map(|&s| s as f32 / 32768.0).collect();
|
||||||
|
let ch1 = if buf.spec().channels.count() > 1 {
|
||||||
|
Some(buf.chan(1).iter().map(|&s| s as f32 / 32768.0).collect::<Vec<_>>())
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
interleave_channels(&ch0, ch1.as_deref(), target_channels, out);
|
||||||
|
}
|
||||||
|
AudioBufferRef::S32(buf) => {
|
||||||
|
let ch0: Vec<f32> = buf.chan(0).iter().map(|&s| s as f32 / 2147483648.0).collect();
|
||||||
|
let ch1 = if buf.spec().channels.count() > 1 {
|
||||||
|
Some(buf.chan(1).iter().map(|&s| s as f32 / 2147483648.0).collect::<Vec<_>>())
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
interleave_channels(&ch0, ch1.as_deref(), target_channels, out);
|
||||||
|
}
|
||||||
|
AudioBufferRef::U8(buf) => {
|
||||||
|
let ch0: Vec<f32> = buf.chan(0).iter().map(|&s| (s as f32 - 128.0) / 128.0).collect();
|
||||||
|
let ch1 = if buf.spec().channels.count() > 1 {
|
||||||
|
Some(buf.chan(1).iter().map(|&s| (s as f32 - 128.0) / 128.0).collect::<Vec<_>>())
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
interleave_channels(&ch0, ch1.as_deref(), target_channels, out);
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
// For other formats, try to get samples via S16 conversion
|
||||||
|
// (symphonia may provide other types; we skip unsupported ones)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn interleave_channels(ch0: &[f32], ch1: Option<&[f32]>, target_channels: usize, out: &mut Vec<f32>) {
|
||||||
|
let len = ch0.len();
|
||||||
|
if target_channels == 1 {
|
||||||
|
if let Some(c1) = ch1 {
|
||||||
|
// Mix down to mono
|
||||||
|
out.extend(ch0.iter().zip(c1.iter()).map(|(l, r)| (l + r) * 0.5));
|
||||||
|
} else {
|
||||||
|
out.extend_from_slice(ch0);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Stereo interleaved
|
||||||
|
let c1 = ch1.unwrap_or(ch0);
|
||||||
|
for i in 0..len {
|
||||||
|
out.push(ch0[i]);
|
||||||
|
out.push(c1[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Build OpusHead binary packet (RFC 7845).
|
||||||
|
fn build_opus_head(channels: u8, sample_rate: u32, pre_skip: u16) -> Vec<u8> {
|
||||||
|
let mut v = Vec::with_capacity(19);
|
||||||
|
v.extend_from_slice(b"OpusHead");
|
||||||
|
v.push(1); // version
|
||||||
|
v.push(channels);
|
||||||
|
v.extend_from_slice(&pre_skip.to_le_bytes());
|
||||||
|
v.extend_from_slice(&sample_rate.to_le_bytes());
|
||||||
|
v.extend_from_slice(&0u16.to_le_bytes()); // output gain
|
||||||
|
v.push(0); // channel mapping family
|
||||||
|
v
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Build OpusTags binary packet with minimal vendor string.
|
||||||
|
fn build_opus_tags() -> Vec<u8> {
|
||||||
|
let vendor = b"furumi-server";
|
||||||
|
let mut v = Vec::new();
|
||||||
|
v.extend_from_slice(b"OpusTags");
|
||||||
|
v.extend_from_slice(&(vendor.len() as u32).to_le_bytes());
|
||||||
|
v.extend_from_slice(vendor);
|
||||||
|
v.extend_from_slice(&0u32.to_le_bytes()); // user comment list length = 0
|
||||||
|
v
|
||||||
|
}
|
||||||
56
windows-implementation-plan.md
Normal file
56
windows-implementation-plan.md
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
# Implementation Plan for `furumi-mount-windows` Client
|
||||||
|
|
||||||
|
## Architectural Decision
|
||||||
|
|
||||||
|
- **VFS Driver:** `WinFSP` (Windows File System Proxy).
|
||||||
|
- **Justification:** Excellent performance, perfect compatibility with the FUSE model, widely used in similar projects (e.g., rclone, sshfs-win).
|
||||||
|
- **Installation:** A unified installer (bundle) will be created (for example, using Inno Setup or WiX Toolkit), which will:
|
||||||
|
- Check if WinFSP is already installed.
|
||||||
|
- Automatically install the official `winfsp.msi` silently (using `/qn` flags) if the driver is missing.
|
||||||
|
- Install the `furumi-mount-windows.exe` client itself.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Implementation Details
|
||||||
|
|
||||||
|
### 1. Application Scaffold
|
||||||
|
- Create a new binary crate `furumi-mount-windows` within the workspace.
|
||||||
|
- Add dependencies: `winfsp` (or `wfd`), `tokio`, `clap`, `tracing`, and an internal dependency on `furumi-client-core`.
|
||||||
|
|
||||||
|
### 2. Entry Point (CLI)
|
||||||
|
- In `main.rs`, configure parsing for command-line arguments and environment variables (`--server`, `--token`, `--mount`), similar to `furumi-mount-macos`.
|
||||||
|
- Initialize the gRPC connection to the server via `furumi-client-core`.
|
||||||
|
- Configure directory mounting:
|
||||||
|
- As a network drive (e.g., `Z:`).
|
||||||
|
- Or as a transparent folder within an existing NTFS filesystem (depending on driver support/flags).
|
||||||
|
|
||||||
|
### 3. VFS Implementation
|
||||||
|
- Create an `fs.rs` module.
|
||||||
|
- Implement the trait or callback structure required by WinFSP (e.g., the `WinFspFileSystem` structure).
|
||||||
|
- Action mapping:
|
||||||
|
- `GetFileInfo` / `GetSecurityByName` → gRPC `GetAttr` call.
|
||||||
|
- `ReadDirectory` → Streaming gRPC `ReadDir` call.
|
||||||
|
- `ReadFile` → `ReadFile` gRPC call (with support for stream chunking).
|
||||||
|
- **Crucial Part:** Translating Unix file attributes (from gRPC) into Windows File Attributes to ensure the system permits high-performance continuous stream reading (especially for media).
|
||||||
|
|
||||||
|
### 4. Installer Creation
|
||||||
|
- Write a configuration script for a Windows installer builder (e.g., `windows/setup.iss` for Inno Setup).
|
||||||
|
- Neatly bundle both `winfsp-x.y.z.msi` and `furumi-mount-windows.exe` together.
|
||||||
|
- Add Custom Actions / Logic to:
|
||||||
|
- Check the Windows Registry for an existing WinFSP installation.
|
||||||
|
- Trigger the `winfsp.msi` installation conditionally.
|
||||||
|
|
||||||
|
### 5. CI/CD Integration
|
||||||
|
- Update the GitHub Actions workflow (`docker-publish.yml` or create a dedicated release workflow).
|
||||||
|
- Add the target toolchain: `x86_64-pc-windows-msvc`.
|
||||||
|
- Add a step to compile: `cargo build --release --bin furumi-mount-windows`.
|
||||||
|
- Add a step to build the installer (e.g., `iscc setup.iss` or via `cargo-wix`).
|
||||||
|
- Output the final `setup.exe` as a GitHub Release artifact alongside other binaries.
|
||||||
|
|
||||||
|
### 6. Testing Strategy
|
||||||
|
- Write unit tests in Rust covering attribute translation and path mapping (mapping slashes `/` to backslashes `\`).
|
||||||
|
- Manual System Testing:
|
||||||
|
- Start `furumi-server` locally.
|
||||||
|
- Run the installer on a clean Windows machine (VM without pre-installed WinFSP).
|
||||||
|
- Verify that the drive mounts correctly and seamlessly.
|
||||||
|
- Launch media playback (e.g., via VLC/mpv) to ensure streaming stability over the VFS connection.
|
||||||
Reference in New Issue
Block a user