feat(media): loop mode + high-quality OggOpus music playback

- Loop: toggle via POST /api/media/loop → COMMAND_MEDIA_LOOP; gateway
  replays finished music track on natural end (queue untouched); status
  payload exposes loop flag; FE tombol Loop di music-player + mini-player.
- Kualitas suara: music playback sekarang di-transcode sekali via ffmpeg ke
  OggOpus 48kHz stereo 192kbps dengan volume di-bake ke encode — menghindari
  double lossy encode (inlineVolume) yang bikin suara buram. Screen share
  tetap pakai jalur lama.
- Backend: MediaState.loop, setLoop service, route + schema validation.
This commit is contained in:
asepharyana
2026-08-07 14:53:37 +07:00
parent a690e5b63e
commit 18dd6a56ba
16 changed files with 216 additions and 10 deletions
@@ -2,8 +2,8 @@ import type { Request, Response, Router } from "express";
import express from "express"; import express from "express";
import { createChildLogger } from "@/shared/logger/index"; import { createChildLogger } from "@/shared/logger/index";
import { asyncHandler, validateBody } from "../../shared/middlewares/index.js"; import { asyncHandler, validateBody } from "../../shared/middlewares/index.js";
import { mediaQueueSchema } from "./media.schema.js"; import { mediaLoopSchema, mediaQueueSchema } from "./media.schema.js";
import { getStatus, queue, skip, stop } from "./media.service.js"; import { getStatus, queue, setLoop, skip, stop } from "./media.service.js";
const logger = createChildLogger("media.routes"); const logger = createChildLogger("media.routes");
@@ -55,5 +55,17 @@ export function createMediaRouter(): Router {
}), }),
); );
// POST /api/media/loop
router.post(
"/media/loop",
validateBody(mediaLoopSchema),
asyncHandler(async (req: Request, res: Response) => {
const { loop } = req.body as { loop: boolean };
logger.debug({ loop }, "Media loop requested");
const state = await setLoop(loop);
res.json(state);
}),
);
return router; return router;
} }
@@ -5,4 +5,9 @@ export const mediaQueueSchema = z.object({
mode: z.enum(["music", "screen"]).default("music"), mode: z.enum(["music", "screen"]).default("music"),
}); });
export const mediaLoopSchema = z.object({
loop: z.boolean().default(false),
});
export type MediaQueueInput = z.infer<typeof mediaQueueSchema>; export type MediaQueueInput = z.infer<typeof mediaQueueSchema>;
export type MediaLoopInput = z.infer<typeof mediaLoopSchema>;
@@ -3,6 +3,7 @@ import {
tryCommandThenFallback, tryCommandThenFallback,
} from "../../shared/commandHelper.js"; } from "../../shared/commandHelper.js";
import { import {
COMMAND_MEDIA_LOOP,
COMMAND_MEDIA_QUEUE, COMMAND_MEDIA_QUEUE,
COMMAND_MEDIA_SKIP, COMMAND_MEDIA_SKIP,
COMMAND_MEDIA_STOP, COMMAND_MEDIA_STOP,
@@ -30,6 +31,7 @@ export interface MediaState {
/** null/absent when idle; "music" | "screen" while a track is active. */ /** null/absent when idle; "music" | "screen" while a track is active. */
activeMode?: "music" | "screen" | null; activeMode?: "music" | "screen" | null;
musicVolume: number; musicVolume: number;
loop: boolean;
current: MediaItem | null; current: MediaItem | null;
queue: MediaItem[]; queue: MediaItem[];
} }
@@ -44,6 +46,7 @@ const DEFAULT_STATE: MediaState = {
playing: false, playing: false,
activeMode: null, activeMode: null,
musicVolume: 0.3, musicVolume: 0.3,
loop: false,
current: null, current: null,
queue: [], queue: [],
}; };
@@ -65,6 +68,7 @@ function normalizeMediaState(raw: Record<string, unknown>): MediaState {
playing, playing,
activeMode, activeMode,
musicVolume: Number(raw.musicVolume ?? 0.3), musicVolume: Number(raw.musicVolume ?? 0.3),
loop: Boolean(raw.loop ?? false),
current: (raw.current as MediaItem | null) ?? null, current: (raw.current as MediaItem | null) ?? null,
queue: (raw.queue as MediaItem[]) ?? [], queue: (raw.queue as MediaItem[]) ?? [],
}; };
@@ -148,3 +152,20 @@ export async function stop(): Promise<MediaState> {
"stop", "stop",
); );
} }
/**
* Toggle loop mode (replay current track on natural end) via Redis command.
*/
export async function setLoop(loop: boolean): Promise<MediaState> {
logger.info({ loop }, "setLoop called");
return tryCommandThenFallback(
() =>
publishCommand<MediaState>(
COMMAND_MEDIA_LOOP,
{ loop },
DEFAULT_COMMAND_TIMEOUT_MS,
),
() => readStatusFallback(),
"setLoop",
);
}
@@ -62,6 +62,7 @@ export const COMMAND_MEDIA_QUEUE = "media:queue";
export const COMMAND_MEDIA_SKIP = "media:skip"; export const COMMAND_MEDIA_SKIP = "media:skip";
export const COMMAND_MEDIA_STOP = "media:stop"; export const COMMAND_MEDIA_STOP = "media:stop";
export const COMMAND_MEDIA_VOLUME = "media:volume"; export const COMMAND_MEDIA_VOLUME = "media:volume";
export const COMMAND_MEDIA_LOOP = "media:loop";
export const COMMAND_MODERATION_ACTION = "moderation:action"; export const COMMAND_MODERATION_ACTION = "moderation:action";
export const DISCORD_VOICE_ANALYZED = "discord:voice:analyzed"; export const DISCORD_VOICE_ANALYZED = "discord:voice:analyzed";
@@ -1,6 +1,7 @@
import { import {
COMMAND_GUILDS_LIST, COMMAND_GUILDS_LIST,
COMMAND_GUILDS_TEXT_CHANNELS, COMMAND_GUILDS_TEXT_CHANNELS,
COMMAND_MEDIA_LOOP,
COMMAND_MEDIA_QUEUE, COMMAND_MEDIA_QUEUE,
COMMAND_MEDIA_SKIP, COMMAND_MEDIA_SKIP,
COMMAND_MEDIA_STOP, COMMAND_MEDIA_STOP,
@@ -69,6 +70,7 @@ export function createHandlerRegistry(
registry.set(COMMAND_MEDIA_VOLUME, (cmd) => registry.set(COMMAND_MEDIA_VOLUME, (cmd) =>
mediaHandler.handleMediaVolume(cmd), mediaHandler.handleMediaVolume(cmd),
); );
registry.set(COMMAND_MEDIA_LOOP, (cmd) => mediaHandler.handleMediaLoop(cmd));
// Guild commands // Guild commands
registry.set(COMMAND_GUILDS_LIST, (cmd) => registry.set(COMMAND_GUILDS_LIST, (cmd) =>
@@ -6,6 +6,7 @@ import { createChildLogger } from "../../shared/logger/index.js";
import { import {
extractMediaInfo, extractMediaInfo,
resolveMediaUrl, resolveMediaUrl,
transcodeToHighQualityOgg,
} from "../voice-recording/mediaSource.js"; } from "../voice-recording/mediaSource.js";
import type { import type {
MediaMode, MediaMode,
@@ -35,6 +36,7 @@ export interface MediaStatusPayload {
playing: boolean; playing: boolean;
activeMode: MediaMode | null; activeMode: MediaMode | null;
musicVolume: number; musicVolume: number;
loop: boolean;
current: MediaStatusItem | null; current: MediaStatusItem | null;
queue: MediaStatusItem[]; queue: MediaStatusItem[];
} }
@@ -45,6 +47,9 @@ export interface MediaStatusPayload {
const mediaQueue: MediaQueueItem[] = []; const mediaQueue: MediaQueueItem[] = [];
let currentTrackItem: MediaQueueItem | null = null; let currentTrackItem: MediaQueueItem | null = null;
let loopEnabled = false;
/** Active ffmpeg transcode (killed on stop/skip). */
let currentTranscodeCleanup: (() => void) | null = null;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Helpers // Helpers
@@ -67,6 +72,7 @@ function buildStatusPayload(): MediaStatusPayload {
currentTrackItem !== null && discordPlayer.getStatus() === "playing", currentTrackItem !== null && discordPlayer.getStatus() === "playing",
activeMode: currentTrackItem?.mode ?? null, activeMode: currentTrackItem?.mode ?? null,
musicVolume: discordPlayer.getMusicVolume(), musicVolume: discordPlayer.getMusicVolume(),
loop: loopEnabled,
current: currentTrackItem ? mapToStatusItem(currentTrackItem) : null, current: currentTrackItem ? mapToStatusItem(currentTrackItem) : null,
queue: mediaQueue.map(mapToStatusItem), queue: mediaQueue.map(mapToStatusItem),
}; };
@@ -336,6 +342,17 @@ export class MediaHandler {
}; };
} }
async handleMediaLoop(cmd: CommandMessage): Promise<CommandReply<unknown>> {
loopEnabled = Boolean(cmd.payload.loop);
this.logger.info({ loop: loopEnabled }, "Media loop toggled");
this.publishStatus();
return {
id: cmd.id,
success: true,
data: buildStatusPayload(),
};
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Internal // Internal
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -350,6 +367,8 @@ export class MediaHandler {
discordPlayer.stop("music"); discordPlayer.stop("music");
currentTrackItem = null; currentTrackItem = null;
} }
currentTranscodeCleanup?.();
currentTranscodeCleanup = null;
const next = mediaQueue.shift(); const next = mediaQueue.shift();
if (!next) { if (!next) {
@@ -372,11 +391,20 @@ export class MediaHandler {
next.title = resolution.title ?? next.title; next.title = resolution.title ?? next.title;
next.duration = resolution.duration ?? next.duration; next.duration = resolution.duration ?? next.duration;
discordPlayer.playStream(resolution.stream, "music", { // Music playback: transcode once to high-quality OggOpus (48kHz stereo,
inputType: StreamType.Arbitrary, // 192kbps) with volume baked into the encode. This avoids the double
inlineVolume: true, // lossy encode that inlineVolume would cause and gives Discord the
volume: discordPlayer.getMusicVolume(), // cleanest possible stream. Screen share bypasses this entirely.
const transcoded = transcodeToHighQualityOgg(
resolution.stream,
discordPlayer.getMusicVolume(),
);
discordPlayer.playStream(transcoded.stream, "music", {
inputType: StreamType.OggOpus,
inlineVolume: false,
}); });
currentTranscodeCleanup = transcoded.cleanup;
this.logger.info({ title: next.title }, "Playback started"); this.logger.info({ title: next.title }, "Playback started");
} catch (err) { } catch (err) {
@@ -403,10 +431,21 @@ export class MediaHandler {
/** /**
* Called by the idle callback — delegates to playNext since the player is * Called by the idle callback — delegates to playNext since the player is
* already idle and currentTrackItem is already null. * already idle and currentTrackItem is already null. When loop mode is
* enabled and a music track ended naturally, requeue it so it plays again.
*/ */
private async advanceQueue(): Promise<void> { private async advanceQueue(): Promise<void> {
const finished = currentTrackItem;
currentTrackItem = null; currentTrackItem = null;
if (loopEnabled && finished && finished.mode === "music") {
mediaQueue.unshift(finished);
this.logger.info(
{ title: finished.title },
"Loop enabled — replaying finished track",
);
}
await this.playNext(); await this.playNext();
} }
} }
@@ -33,6 +33,71 @@ export interface ResolveOptions {
quality?: string; quality?: string;
} }
export interface TranscodeResult {
stream: Readable;
/** Kill the ffmpeg child (used on stop/skip). */
cleanup: () => void;
}
/**
* Re-encode a source stream to high-quality OggOpus (48kHz stereo, 192kbps).
*
* Discord voice downmixes whatever we feed it to the channel's bitrate, so the
* best we can do is hand it a clean 48kHz stereo Opus stream instead of the
* raw source (which may be mono, low-bitrate, or a non-Opus container). The
* volume is baked into the encode with `-af volume=` so the player does not
* need inlineVolume re-encoding (double lossy encode).
*/
export function transcodeToHighQualityOgg(
input: Readable,
volume: number,
): TranscodeResult {
const proc = spawn(
"ffmpeg",
[
"-hide_banner",
"-loglevel",
"error",
"-i",
"pipe:0",
"-vn",
"-ac",
"2",
"-ar",
"48000",
"-c:a",
"libopus",
"-b:a",
"192k",
"-af",
`volume=${volume}`,
"-f",
"ogg",
"pipe:1",
],
{ stdio: ["pipe", "pipe", "ignore"] },
);
input.pipe(proc.stdin);
activeProcesses.add(proc);
const cleanup = () => {
activeProcesses.delete(proc);
if (proc.exitCode === null) {
proc.kill("SIGKILL");
}
};
proc.once("exit", () => activeProcesses.delete(proc));
// If ffmpeg fails, surface the error to the consumer stream so the
// AudioPlayer's error handler can advance the queue.
const output = proc.stdout;
output.on("error", () => cleanup());
return { stream: output, cleanup };
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Internal state // Internal state
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -32,6 +32,7 @@ export interface MediaState {
playing: boolean; playing: boolean;
activeMode: MediaMode | null; activeMode: MediaMode | null;
musicVolume: number; musicVolume: number;
loop: boolean;
current: MediaQueueItem | null; current: MediaQueueItem | null;
queue: MediaQueueItem[]; queue: MediaQueueItem[];
} }
@@ -62,6 +62,7 @@ export const COMMAND_MEDIA_QUEUE = "media:queue";
export const COMMAND_MEDIA_SKIP = "media:skip"; export const COMMAND_MEDIA_SKIP = "media:skip";
export const COMMAND_MEDIA_STOP = "media:stop"; export const COMMAND_MEDIA_STOP = "media:stop";
export const COMMAND_MEDIA_VOLUME = "media:volume"; export const COMMAND_MEDIA_VOLUME = "media:volume";
export const COMMAND_MEDIA_LOOP = "media:loop";
export const COMMAND_MODERATION_ACTION = "moderation:action"; export const COMMAND_MODERATION_ACTION = "moderation:action";
export const DISCORD_VOICE_ANALYZED = "discord:voice:analyzed"; export const DISCORD_VOICE_ANALYZED = "discord:voice:analyzed";
@@ -1,10 +1,11 @@
"use client"; "use client";
import { Disc3, Music, SkipForward, Square } from "lucide-react"; import { Disc3, Music, Repeat, SkipForward, Square } from "lucide-react";
import { useMediaPlayer } from "@/lib/hooks/use-media-player"; import { useMediaPlayer } from "@/lib/hooks/use-media-player";
export function MiniPlayer() { export function MiniPlayer() {
const { playing, current, queue, pending, skip, stop } = useMediaPlayer(); const { playing, current, queue, loop, pending, skip, stop, toggleLoop } =
useMediaPlayer();
// Nothing to show if no track is playing and nothing is queued // Nothing to show if no track is playing and nothing is queued
if (!current && queue.length === 0) return null; if (!current && queue.length === 0) return null;
@@ -59,6 +60,20 @@ export function MiniPlayer() {
<SkipForward className="size-3.5" /> <SkipForward className="size-3.5" />
</button> </button>
)} )}
<button
type="button"
onClick={() => toggleLoop()}
disabled={pending}
className={`size-8 flex items-center justify-center rounded-md transition-colors disabled:opacity-40 ${
loop
? "text-primary bg-glass-bg"
: "text-text-secondary hover:text-text-primary hover:bg-glass-bg"
}`}
aria-label={loop ? "Loop on" : "Loop off"}
aria-pressed={loop}
>
<Repeat className="size-3.5" />
</button>
</div> </div>
</div> </div>
); );
@@ -1,6 +1,6 @@
"use client"; "use client";
import { Disc3, Music, Play, SkipForward, Square } from "lucide-react"; import { Disc3, Music, Play, Repeat, SkipForward, Square } from "lucide-react";
import Image from "next/image"; import Image from "next/image";
import { useCallback, useState } from "react"; import { useCallback, useState } from "react";
@@ -8,6 +8,7 @@ import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { import {
useMediaLoop,
useMediaQueue, useMediaQueue,
useMediaSkip, useMediaSkip,
useMediaState, useMediaState,
@@ -28,6 +29,7 @@ export function MusicPlayer({ ws, initialData }: MusicPlayerProps) {
const queueMut = useMediaQueue(); const queueMut = useMediaQueue();
const skipMut = useMediaSkip(); const skipMut = useMediaSkip();
const stopMut = useMediaStop(); const stopMut = useMediaStop();
const loopMut = useMediaLoop();
const [queueUrl, setQueueUrl] = useState(""); const [queueUrl, setQueueUrl] = useState("");
const [screenMode, setScreenMode] = useState(false); const [screenMode, setScreenMode] = useState(false);
@@ -131,6 +133,21 @@ export function MusicPlayer({ ws, initialData }: MusicPlayerProps) {
<SkipForward className="size-4 mr-1" /> <SkipForward className="size-4 mr-1" />
Skip Skip
</Button> </Button>
<Button
variant={mediaState?.loop ? "default" : "outline"}
size="sm"
onClick={() => loopMut.mutate(!mediaState?.loop)}
disabled={loopMut.isPending}
title={
mediaState?.loop
? "Loop enabled — replay current track"
: "Enable loop"
}
aria-pressed={mediaState?.loop}
>
<Repeat className="size-4 mr-1" />
Loop
</Button>
</div> </div>
{mediaState && mediaState.queue.length > 0 && ( {mediaState && mediaState.queue.length > 0 && (
+1
View File
@@ -11,6 +11,7 @@ export {
} from "./use-dashboard"; } from "./use-dashboard";
export { useGuilds } from "./use-guilds"; export { useGuilds } from "./use-guilds";
export { export {
useMediaLoop,
useMediaQueue, useMediaQueue,
useMediaSkip, useMediaSkip,
useMediaState, useMediaState,
+4
View File
@@ -38,6 +38,10 @@ export function useMediaStop() {
return useMediaAction(() => mediaApi.stop()); return useMediaAction(() => mediaApi.stop());
} }
export function useMediaLoop() {
return useMediaAction((loop: boolean) => mediaApi.loop(loop));
}
/** Subscribe to WS media_state events to keep cache fresh */ /** Subscribe to WS media_state events to keep cache fresh */
export function useMediaWsSync(ws: WsHook) { export function useMediaWsSync(ws: WsHook) {
const { mutate } = useSWRConfig(); const { mutate } = useSWRConfig();
+1
View File
@@ -7,4 +7,5 @@ export const mediaApi = {
api.post<MediaState>("/api/media/queue", { source, mode }), api.post<MediaState>("/api/media/queue", { source, mode }),
skip: () => api.post<MediaState>("/api/media/skip", {}), skip: () => api.post<MediaState>("/api/media/skip", {}),
stop: () => api.post<MediaState>("/api/media/stop", {}), stop: () => api.post<MediaState>("/api/media/stop", {}),
loop: (loop: boolean) => api.post<MediaState>("/api/media/loop", { loop }),
}; };
@@ -20,6 +20,8 @@ interface MediaPlayerContextValue {
current: MediaItem | null; current: MediaItem | null;
/** Upcoming queue */ /** Upcoming queue */
queue: MediaItem[]; queue: MediaItem[];
/** Loop mode (replay current track on natural end) */
loop: boolean;
/** True while a mutation is in flight */ /** True while a mutation is in flight */
pending: boolean; pending: boolean;
@@ -27,6 +29,8 @@ interface MediaPlayerContextValue {
skip: () => void; skip: () => void;
/** Stop playback */ /** Stop playback */
stop: () => void; stop: () => void;
/** Toggle loop mode */
toggleLoop: () => void;
/** Queue a URL for playback */ /** Queue a URL for playback */
queueUrl: (url: string) => void; queueUrl: (url: string) => void;
} }
@@ -38,6 +42,7 @@ export function MediaPlayerProvider({ children }: { children: ReactNode }) {
const [state, setState] = useState<MediaState>({ const [state, setState] = useState<MediaState>({
playing: false, playing: false,
musicVolume: 0.3, musicVolume: 0.3,
loop: false,
current: null, current: null,
queue: [], queue: [],
}); });
@@ -105,15 +110,30 @@ export function MediaPlayerProvider({ children }: { children: ReactNode }) {
.finally(() => setPending(false)); .finally(() => setPending(false));
}, []); }, []);
const toggleLoop = useCallback(() => {
setPending(true);
mediaApi
.loop(!state.loop)
.then((data) => {
if (data) setState(data as MediaState);
})
.catch(() => {
// ignore
})
.finally(() => setPending(false));
}, [state.loop]);
return ( return (
<MediaPlayerContext.Provider <MediaPlayerContext.Provider
value={{ value={{
playing: state.playing, playing: state.playing,
current: state.current, current: state.current,
queue: state.queue, queue: state.queue,
loop: state.loop,
pending, pending,
skip, skip,
stop, stop,
toggleLoop,
queueUrl, queueUrl,
}} }}
> >
+1
View File
@@ -13,6 +13,7 @@ export interface MediaState {
playing: boolean; playing: boolean;
activeMode?: MediaMode | null; activeMode?: MediaMode | null;
musicVolume: number; musicVolume: number;
loop: boolean;
current: MediaItem | null; current: MediaItem | null;
queue: MediaItem[]; queue: MediaItem[];
} }