-
-
+ searchSelectRef.current(type, slug)}
+ />
-
)
}
diff --git a/furumi-node-player/client/src/components/Header.tsx b/furumi-node-player/client/src/components/Header.tsx
new file mode 100644
index 0000000..1cd5708
--- /dev/null
+++ b/furumi-node-player/client/src/components/Header.tsx
@@ -0,0 +1,45 @@
+import { SearchDropdown } from './SearchDropdown'
+
+type SearchResultItem = {
+ result_type: string
+ slug: string
+ name: string
+ detail?: string
+}
+
+type HeaderProps = {
+ searchOpen: boolean
+ searchResults: SearchResultItem[]
+ onSearchSelect: (type: string, slug: string) => void
+}
+
+export function Header({
+ searchOpen,
+ searchResults,
+ onSearchSelect,
+}: HeaderProps) {
+ return (
+
-
-
- Furumi
- v
-
-
-
-
-
- searchSelectRef.current(type, slug)}
- />
-
-
-
-
+ queueActionsRef.current?.playIndex(origIdx)}
+ onQueueRemove={(origIdx) =>
+ queueActionsRef.current?.removeFromQueue(origIdx)
+ }
+ onQueueMove={(fromPos, toPos) =>
+ queueActionsRef.current?.moveQueueItem(fromPos, toPos)
+ }
+ />
-
-
-
-
-
- Queue
-
-
-
-
-
-
-
- queueActionsRef.current?.playIndex(origIdx)}
- onRemove={(origIdx) =>
- queueActionsRef.current?.removeFromQueue(origIdx)
- }
- onMove={(fromPos, toPos) =>
- queueActionsRef.current?.moveQueueItem(fromPos, toPos)
- }
- />
-
-
-
+
-
-
-
-
-
-
-
-
- 0:00
-
-
-
-
-
-
- 0:00
-
-
-
- 🔊
-
-
-
-
+
+
+ Furumi
+ v
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
diff --git a/furumi-node-player/client/src/components/NowPlaying.tsx b/furumi-node-player/client/src/components/NowPlaying.tsx
index 175c1b1..c3275bc 100644
--- a/furumi-node-player/client/src/components/NowPlaying.tsx
+++ b/furumi-node-player/client/src/components/NowPlaying.tsx
@@ -1,4 +1,5 @@
import { useEffect, useState } from 'react'
+import { API_ROOT } from '../furumiApi'
import type { QueueItem } from './QueueList'
function Cover({ src }: { src: string }) {
@@ -12,7 +13,7 @@ function Cover({ src }: { src: string }) {
return
+ Queue
+
+
+
+
+
+
+
+
+
@@ -31,7 +32,7 @@ export function NowPlaying({ apiRoot, track }: { apiRoot: string; track: QueueIt
)
}
- const coverUrl = `${apiRoot}/tracks/${track.slug}/cover`
+ const coverUrl = `${API_ROOT}/tracks/${track.slug}/cover`
return (
diff --git a/furumi-node-player/client/src/components/PlayerBar.tsx b/furumi-node-player/client/src/components/PlayerBar.tsx
new file mode 100644
index 0000000..48fcdff
--- /dev/null
+++ b/furumi-node-player/client/src/components/PlayerBar.tsx
@@ -0,0 +1,47 @@
+import { NowPlaying } from './NowPlaying'
+import type { QueueItem } from './QueueList'
+
+export function PlayerBar({ track }: { track: QueueItem | null }) {
+ return (
+
+import axios from 'axios'
+import type { Album, Artist, SearchResult, Track, TrackDetail } from './types'
-export function createFurumiApiClient(apiRoot: string): FurumiApiClient {
- const API = apiRoot
+const API_BASE = import.meta.env.VITE_API_BASE_URL ?? ''
+export const API_ROOT = `${API_BASE}/api`
- return async function api(path: string) {
- const r = await fetch(API + path)
- if (!r.ok) return null
- return r.json()
- }
+const API_KEY = import.meta.env.VITE_API_KEY
+
+export const furumiApi = axios.create({
+ baseURL: API_ROOT,
+ headers: API_KEY ? { 'x-api-key': API_KEY } : {},
+})
+
+export async function getArtists(): Promise {
+ const res = await furumiApi.get('/artists').catch(() => null)
+ return res?.data ?? null
+}
+
+export async function getArtistAlbums(artistSlug: string): Promise {
+ const res = await furumiApi.get(`/artists/${artistSlug}/albums`).catch(() => null)
+ return res?.data ?? null
+}
+
+export async function getAlbumTracks(albumSlug: string): Promise {
+ const res = await furumiApi.get(`/albums/${albumSlug}`).catch(() => null)
+ return res?.data ?? null
+}
+
+export async function getArtistTracks(artistSlug: string): Promise {
+ const res = await furumiApi.get(`/artists/${artistSlug}/tracks`).catch(() => null)
+ return res?.data ?? null
+}
+
+export async function searchTracks(query: string): Promise {
+ const res = await furumiApi
+ .get(`/search?q=${encodeURIComponent(query)}`)
+ .catch(() => null)
+ return res?.data ?? null
+}
+
+export async function getTrackInfo(trackSlug: string): Promise {
+ const res = await furumiApi.get(`/tracks/${trackSlug}`).catch(() => null)
+ return res?.data ?? null
+}
+
+export async function preloadStream(trackSlug: string) {
+ await furumiApi.get(`/stream/${trackSlug}`).catch(() => null)
}
diff --git a/furumi-node-player/client/src/index.css b/furumi-node-player/client/src/index.css
index 8214183..ebf9a85 100644
--- a/furumi-node-player/client/src/index.css
+++ b/furumi-node-player/client/src/index.css
@@ -1,3 +1,8 @@
+html,
+body {
+ height: 100%;
+}
+
body {
margin: 0;
font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
@@ -5,6 +10,10 @@ body {
background-color: #f3f6fb;
}
+#root {
+ height: 100%;
+}
+
* {
box-sizing: border-box;
}
diff --git a/furumi-node-player/client/src/main.tsx b/furumi-node-player/client/src/main.tsx
index bef5202..9d4c1bf 100644
--- a/furumi-node-player/client/src/main.tsx
+++ b/furumi-node-player/client/src/main.tsx
@@ -1,10 +1,14 @@
import { StrictMode } from 'react'
import { createRoot } from 'react-dom/client'
+import { Provider } from 'react-redux'
+import { store } from './store'
import './index.css'
import App from './App.tsx'
createRoot(document.getElementById('root')!).render(
-
+
,
)
diff --git a/furumi-node-player/client/src/store/index.ts b/furumi-node-player/client/src/store/index.ts
new file mode 100644
index 0000000..49b5321
--- /dev/null
+++ b/furumi-node-player/client/src/store/index.ts
@@ -0,0 +1,23 @@
+import { configureStore } from '@reduxjs/toolkit'
+import { useDispatch, useSelector, type TypedUseSelectorHook } from 'react-redux'
+import artistsReducer from './slices/artistsSlice'
+import albumsReducer from './slices/albumsSlice'
+import albumTracksReducer from './slices/albumTracksSlice'
+import artistTracksReducer from './slices/artistTracksSlice'
+import trackDetailReducer from './slices/trackDetailSlice'
+
+export const store = configureStore({
+ reducer: {
+ artists: artistsReducer,
+ albums: albumsReducer,
+ albumTracks: albumTracksReducer,
+ artistTracks: artistTracksReducer,
+ trackDetail: trackDetailReducer,
+ },
+})
+
+export type RootState = ReturnType
+export type AppDispatch = typeof store.dispatch
+
+export const useAppDispatch = useDispatch.withTypes()
+export const useAppSelector: TypedUseSelectorHook = useSelector
diff --git a/furumi-node-player/client/src/store/slices/albumTracksSlice.ts b/furumi-node-player/client/src/store/slices/albumTracksSlice.ts
new file mode 100644
index 0000000..8ede869
--- /dev/null
+++ b/furumi-node-player/client/src/store/slices/albumTracksSlice.ts
@@ -0,0 +1,54 @@
+import { createSlice, createAsyncThunk } from '@reduxjs/toolkit'
+import type { Track } from '../../types'
+import { getAlbumTracks } from '../../furumiApi'
+
+export const fetchAlbumTracks = createAsyncThunk(
+ 'albumTracks/fetch',
+ async (albumSlug: string, { rejectWithValue }) => {
+ const data = await getAlbumTracks(albumSlug)
+ if (data === null) return rejectWithValue('Failed to fetch album tracks')
+ return { albumSlug, tracks: data }
+ },
+)
+
+interface AlbumTracksState {
+ byAlbum: Record
+ loading: boolean
+ error: string | null
+}
+
+const initialState: AlbumTracksState = {
+ byAlbum: {},
+ loading: false,
+ error: null,
+}
+
+const albumTracksSlice = createSlice({
+ name: 'albumTracks',
+ initialState,
+ reducers: {
+ clearAlbumTracks(state) {
+ state.byAlbum = {}
+ state.error = null
+ },
+ },
+ extraReducers: (builder) => {
+ builder
+ .addCase(fetchAlbumTracks.pending, (state) => {
+ state.loading = true
+ state.error = null
+ })
+ .addCase(fetchAlbumTracks.fulfilled, (state, action) => {
+ state.loading = false
+ state.byAlbum[action.payload.albumSlug] = action.payload.tracks
+ state.error = null
+ })
+ .addCase(fetchAlbumTracks.rejected, (state, action) => {
+ state.loading = false
+ state.error = action.payload as string ?? 'Unknown error'
+ })
+ },
+})
+
+export const { clearAlbumTracks } = albumTracksSlice.actions
+export default albumTracksSlice.reducer
diff --git a/furumi-node-player/client/src/store/slices/albumsSlice.ts b/furumi-node-player/client/src/store/slices/albumsSlice.ts
new file mode 100644
index 0000000..386c3f5
--- /dev/null
+++ b/furumi-node-player/client/src/store/slices/albumsSlice.ts
@@ -0,0 +1,54 @@
+import { createSlice, createAsyncThunk } from '@reduxjs/toolkit'
+import type { Album } from '../../types'
+import { getArtistAlbums } from '../../furumiApi'
+
+export const fetchArtistAlbums = createAsyncThunk(
+ 'albums/fetchByArtist',
+ async (artistSlug: string, { rejectWithValue }) => {
+ const data = await getArtistAlbums(artistSlug)
+ if (data === null) return rejectWithValue('Failed to fetch albums')
+ return { artistSlug, albums: data }
+ },
+)
+
+interface AlbumsState {
+ byArtist: Record
+ loading: boolean
+ error: string | null
+}
+
+const initialState: AlbumsState = {
+ byArtist: {},
+ loading: false,
+ error: null,
+}
+
+const albumsSlice = createSlice({
+ name: 'albums',
+ initialState,
+ reducers: {
+ clearAlbums(state) {
+ state.byArtist = {}
+ state.error = null
+ },
+ },
+ extraReducers: (builder) => {
+ builder
+ .addCase(fetchArtistAlbums.pending, (state) => {
+ state.loading = true
+ state.error = null
+ })
+ .addCase(fetchArtistAlbums.fulfilled, (state, action) => {
+ state.loading = false
+ state.byArtist[action.payload.artistSlug] = action.payload.albums
+ state.error = null
+ })
+ .addCase(fetchArtistAlbums.rejected, (state, action) => {
+ state.loading = false
+ state.error = action.payload as string ?? 'Unknown error'
+ })
+ },
+})
+
+export const { clearAlbums } = albumsSlice.actions
+export default albumsSlice.reducer
diff --git a/furumi-node-player/client/src/store/slices/artistTracksSlice.ts b/furumi-node-player/client/src/store/slices/artistTracksSlice.ts
new file mode 100644
index 0000000..e3e7592
--- /dev/null
+++ b/furumi-node-player/client/src/store/slices/artistTracksSlice.ts
@@ -0,0 +1,54 @@
+import { createSlice, createAsyncThunk } from '@reduxjs/toolkit'
+import type { Track } from '../../types'
+import { getArtistTracks } from '../../furumiApi'
+
+export const fetchArtistTracks = createAsyncThunk(
+ 'artistTracks/fetch',
+ async (artistSlug: string, { rejectWithValue }) => {
+ const data = await getArtistTracks(artistSlug)
+ if (data === null) return rejectWithValue('Failed to fetch artist tracks')
+ return { artistSlug, tracks: data }
+ },
+)
+
+interface ArtistTracksState {
+ byArtist: Record
+ loading: boolean
+ error: string | null
+}
+
+const initialState: ArtistTracksState = {
+ byArtist: {},
+ loading: false,
+ error: null,
+}
+
+const artistTracksSlice = createSlice({
+ name: 'artistTracks',
+ initialState,
+ reducers: {
+ clearArtistTracks(state) {
+ state.byArtist = {}
+ state.error = null
+ },
+ },
+ extraReducers: (builder) => {
+ builder
+ .addCase(fetchArtistTracks.pending, (state) => {
+ state.loading = true
+ state.error = null
+ })
+ .addCase(fetchArtistTracks.fulfilled, (state, action) => {
+ state.loading = false
+ state.byArtist[action.payload.artistSlug] = action.payload.tracks
+ state.error = null
+ })
+ .addCase(fetchArtistTracks.rejected, (state, action) => {
+ state.loading = false
+ state.error = action.payload as string ?? 'Unknown error'
+ })
+ },
+})
+
+export const { clearArtistTracks } = artistTracksSlice.actions
+export default artistTracksSlice.reducer
diff --git a/furumi-node-player/client/src/store/slices/artistsSlice.ts b/furumi-node-player/client/src/store/slices/artistsSlice.ts
new file mode 100644
index 0000000..ecef76a
--- /dev/null
+++ b/furumi-node-player/client/src/store/slices/artistsSlice.ts
@@ -0,0 +1,54 @@
+import { createSlice, createAsyncThunk } from '@reduxjs/toolkit'
+import type { Artist } from '../../types'
+import { getArtists } from '../../furumiApi'
+
+export const fetchArtists = createAsyncThunk(
+ 'artists/fetch',
+ async (_, { rejectWithValue }) => {
+ const data = await getArtists()
+ if (data === null) return rejectWithValue('Failed to fetch artists')
+ return data
+ },
+)
+
+interface ArtistsState {
+ items: Artist[]
+ loading: boolean
+ error: string | null
+}
+
+const initialState: ArtistsState = {
+ items: [],
+ loading: false,
+ error: null,
+}
+
+const artistsSlice = createSlice({
+ name: 'artists',
+ initialState,
+ reducers: {
+ clearArtists(state) {
+ state.items = []
+ state.error = null
+ },
+ },
+ extraReducers: (builder) => {
+ builder
+ .addCase(fetchArtists.pending, (state) => {
+ state.loading = true
+ state.error = null
+ })
+ .addCase(fetchArtists.fulfilled, (state, action) => {
+ state.loading = false
+ state.items = action.payload
+ state.error = null
+ })
+ .addCase(fetchArtists.rejected, (state, action) => {
+ state.loading = false
+ state.error = action.payload as string ?? 'Unknown error'
+ })
+ },
+})
+
+export const { clearArtists } = artistsSlice.actions
+export default artistsSlice.reducer
diff --git a/furumi-node-player/client/src/store/slices/trackDetailSlice.ts b/furumi-node-player/client/src/store/slices/trackDetailSlice.ts
new file mode 100644
index 0000000..60a852f
--- /dev/null
+++ b/furumi-node-player/client/src/store/slices/trackDetailSlice.ts
@@ -0,0 +1,57 @@
+import { createSlice, createAsyncThunk } from '@reduxjs/toolkit'
+import type { TrackDetail } from '../../types'
+import { getTrackInfo } from '../../furumiApi'
+
+export const fetchTrackDetail = createAsyncThunk(
+ 'trackDetail/fetch',
+ async (trackSlug: string, { rejectWithValue }) => {
+ const data = await getTrackInfo(trackSlug)
+ if (data === null) return rejectWithValue('Failed to fetch track detail')
+ return { trackSlug, detail: data }
+ },
+)
+
+interface TrackDetailState {
+ bySlug: Record
+ loading: boolean
+ error: string | null
+}
+
+const initialState: TrackDetailState = {
+ bySlug: {},
+ loading: false,
+ error: null,
+}
+
+const trackDetailSlice = createSlice({
+ name: 'trackDetail',
+ initialState,
+ reducers: {
+ clearTrackDetail(state) {
+ state.bySlug = {}
+ state.error = null
+ },
+ removeTrackDetail(state, action: { payload: string }) {
+ delete state.bySlug[action.payload]
+ },
+ },
+ extraReducers: (builder) => {
+ builder
+ .addCase(fetchTrackDetail.pending, (state) => {
+ state.loading = true
+ state.error = null
+ })
+ .addCase(fetchTrackDetail.fulfilled, (state, action) => {
+ state.loading = false
+ state.bySlug[action.payload.trackSlug] = action.payload.detail
+ state.error = null
+ })
+ .addCase(fetchTrackDetail.rejected, (state, action) => {
+ state.loading = false
+ state.error = action.payload as string ?? 'Unknown error'
+ })
+ },
+})
+
+export const { clearTrackDetail, removeTrackDetail } = trackDetailSlice.actions
+export default trackDetailSlice.reducer
diff --git a/furumi-node-player/client/src/types.ts b/furumi-node-player/client/src/types.ts
new file mode 100644
index 0000000..654adc6
--- /dev/null
+++ b/furumi-node-player/client/src/types.ts
@@ -0,0 +1,42 @@
+// API entity types (see PLAYER-API.md)
+
+export interface Artist {
+ slug: string
+ name: string
+ album_count: number
+ track_count: number
+}
+
+export interface Album {
+ slug: string
+ name: string
+ year: number | null
+ track_count: number
+ has_cover: boolean
+}
+
+export interface Track {
+ slug: string
+ title: string
+ track_number: number | null
+ duration_secs: number
+ artist_name: string
+ album_name: string | null
+ album_slug: string | null
+ genre: string | null
+}
+
+export interface TrackDetail extends Track {
+ storage_path: string
+ artist_slug: string
+ album_year: number | null
+}
+
+export type SearchResultType = 'artist' | 'album' | 'track'
+
+export interface SearchResult {
+ result_type: SearchResultType
+ slug: string
+ name: string
+ detail: string | null
+}
diff --git a/furumi-node-player/client/src/utils.ts b/furumi-node-player/client/src/utils.ts
new file mode 100644
index 0000000..6e9ce67
--- /dev/null
+++ b/furumi-node-player/client/src/utils.ts
@@ -0,0 +1,14 @@
+function pad(n: number) {
+ return String(n).padStart(2, '0')
+}
+
+export function fmt(secs: number) {
+ if (!secs || Number.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)}`
+}
diff --git a/furumi-web-player/Cargo.toml b/furumi-web-player/Cargo.toml
index 03088db..822300c 100644
--- a/furumi-web-player/Cargo.toml
+++ b/furumi-web-player/Cargo.toml
@@ -25,3 +25,4 @@ base64 = "0.22"
rand = "0.8"
urlencoding = "2.1.3"
rustls = { version = "0.23", features = ["ring"] }
+tower-http = { version = "0.6", features = ["cors"] }
diff --git a/furumi-web-player/src/main.rs b/furumi-web-player/src/main.rs
index 66696dc..b8a8592 100644
--- a/furumi-web-player/src/main.rs
+++ b/furumi-web-player/src/main.rs
@@ -39,6 +39,10 @@ struct Args {
/// OIDC Session Secret (32+ chars, for HMAC). Random if not provided.
#[arg(long, env = "FURUMI_PLAYER_OIDC_SESSION_SECRET")]
oidc_session_secret: Option,
+
+ /// API key for x-api-key header auth (alternative to OIDC session)
+ #[arg(long, env = "FURUMI_PLAYER_API_KEY")]
+ api_key: Option,
}
#[tokio::main]
@@ -90,10 +94,15 @@ async fn main() -> Result<(), Box> {
std::process::exit(1);
});
+ if args.api_key.is_some() {
+ tracing::info!("x-api-key auth: enabled");
+ }
+
let state = Arc::new(web::AppState {
pool,
storage_dir: Arc::new(args.storage_dir),
oidc: oidc_state,
+ api_key: args.api_key,
});
tracing::info!("Web player: http://{}", bind_addr);
diff --git a/furumi-web-player/src/web/auth.rs b/furumi-web-player/src/web/auth.rs
index c2f626c..33f8184 100644
--- a/furumi-web-player/src/web/auth.rs
+++ b/furumi-web-player/src/web/auth.rs
@@ -5,6 +5,8 @@ use axum::{
middleware::Next,
response::{Html, IntoResponse, Redirect, Response},
};
+
+const X_API_KEY: &str = "x-api-key";
use openidconnect::{
core::{CoreClient, CoreProviderMetadata, CoreResponseType},
reqwest::async_http_client,
@@ -92,37 +94,51 @@ fn verify_sso_cookie(secret: &[u8], cookie_val: &str) -> Option {
}
}
-/// Auth middleware: requires valid SSO session cookie.
+/// Auth middleware: requires valid SSO session cookie or x-api-key header.
pub async fn require_auth(
State(state): State>,
req: Request,
next: Next,
) -> Response {
- let oidc = match &state.oidc {
- Some(o) => o,
- None => return next.run(req).await, // No OIDC configured = no auth
- };
-
- let cookies = req
- .headers()
- .get(header::COOKIE)
- .and_then(|v| v.to_str().ok())
- .unwrap_or("");
-
- for c in cookies.split(';') {
- let c = c.trim();
- if let Some(val) = c.strip_prefix(&format!("{}=", SESSION_COOKIE)) {
- if verify_sso_cookie(&oidc.session_secret, val).is_some() {
+ // 1. Check x-api-key header (if configured)
+ if let Some(ref expected) = state.api_key {
+ if let Some(val) = req
+ .headers()
+ .get(X_API_KEY)
+ .and_then(|v| v.to_str().ok())
+ {
+ if val == expected {
return next.run(req).await;
}
}
}
+ // 2. Check SSO session cookie (if OIDC configured)
+ if let Some(ref oidc) = state.oidc {
+ let cookies = req
+ .headers()
+ .get(header::COOKIE)
+ .and_then(|v| v.to_str().ok())
+ .unwrap_or("");
+
+ for c in cookies.split(';') {
+ let c = c.trim();
+ if let Some(val) = c.strip_prefix(&format!("{}=", SESSION_COOKIE)) {
+ if verify_sso_cookie(&oidc.session_secret, val).is_some() {
+ return next.run(req).await;
+ }
+ }
+ }
+ }
+
let uri = req.uri().to_string();
if uri.starts_with("/api/") {
(StatusCode::UNAUTHORIZED, "Unauthorized").into_response()
- } else {
+ } else if state.oidc.is_some() {
Redirect::to("/login").into_response()
+ } else {
+ // Only API key configured — no web login available
+ (StatusCode::UNAUTHORIZED, "Unauthorized").into_response()
}
}
diff --git a/furumi-web-player/src/web/mod.rs b/furumi-web-player/src/web/mod.rs
index e53ff2c..355b4bb 100644
--- a/furumi-web-player/src/web/mod.rs
+++ b/furumi-web-player/src/web/mod.rs
@@ -3,9 +3,12 @@ pub mod auth;
use std::sync::Arc;
use std::path::PathBuf;
+use std::time::Duration;
use axum::{Router, routing::get, middleware};
+use axum::http::{header, Method};
use sqlx::PgPool;
+use tower_http::cors::{Any, CorsLayer};
#[derive(Clone)]
pub struct AppState {
@@ -13,6 +16,7 @@ pub struct AppState {
#[allow(dead_code)]
pub storage_dir: Arc,
pub oidc: Option>,
+ pub api_key: Option,
}
pub fn build_router(state: Arc) -> Router {
@@ -32,21 +36,28 @@ pub fn build_router(state: Arc) -> Router {
.route("/", get(player_html))
.nest("/api", library);
- let has_oidc = state.oidc.is_some();
+ let requires_auth = state.oidc.is_some();
- let app = if has_oidc {
+ let app = if requires_auth {
authed
.route_layer(middleware::from_fn_with_state(state.clone(), auth::require_auth))
} else {
authed
};
+ let cors = CorsLayer::new()
+ .allow_origin(Any)
+ .allow_methods([Method::GET, Method::OPTIONS, Method::HEAD])
+ .allow_headers([header::ACCEPT, header::CONTENT_TYPE, header::HeaderName::from_static("x-api-key")])
+ .max_age(Duration::from_secs(600));
+
Router::new()
.route("/login", get(auth::login_page))
.route("/logout", get(auth::logout))
.route("/auth/login", get(auth::oidc_login))
.route("/auth/callback", get(auth::oidc_callback))
.merge(app)
+ .layer(cors)
.with_state(state)
}
+
+ )
+}
diff --git a/furumi-node-player/client/src/components/QueueList.tsx b/furumi-node-player/client/src/components/QueueList.tsx
index f1529fe..c371f09 100644
--- a/furumi-node-player/client/src/components/QueueList.tsx
+++ b/furumi-node-player/client/src/components/QueueList.tsx
@@ -1,4 +1,5 @@
import { useEffect, useRef, useState } from 'react'
+import { API_ROOT } from '../furumiApi'
export type QueueItem = {
slug: string
@@ -9,7 +10,6 @@ export type QueueItem = {
}
type QueueListProps = {
- apiRoot: string
queue: QueueItem[]
order: number[]
playingOrigIdx: number
@@ -43,7 +43,6 @@ function Cover({ src }: { src: string }) {
}
export function QueueList({
- apiRoot,
queue,
order,
playingOrigIdx,
@@ -78,7 +77,7 @@ export function QueueList({
if (!t) return null
const isPlaying = origIdx === playingOrigIdx
- const coverSrc = t.album_slug ? `${apiRoot}/tracks/${t.slug}/cover` : ''
+ const coverSrc = t.album_slug ? `${API_ROOT}/tracks/${t.slug}/cover` : ''
const dur = t.duration ? fmt(t.duration) : ''
const isDragging = draggingPos === pos
const isDragOver = dragOverPos === pos
diff --git a/furumi-node-player/client/src/furumiApi.ts b/furumi-node-player/client/src/furumiApi.ts
index 412b656..e7518ec 100644
--- a/furumi-node-player/client/src/furumiApi.ts
+++ b/furumi-node-player/client/src/furumiApi.ts
@@ -1,12 +1,49 @@
-export type FurumiApiClient = (path: string) => Promise
+
+
+
+
+
+
+
+
+ 0:00
+
+
+
+
+
+
+ 0:00
+
+
+
+ 🔊
+
+
+
+