v2: mpegts.js + single-upstream fan-out hub (no FFmpeg/HLS)
Replaces the FFmpeg -> MediaMTX -> HLS pipeline with a raw MPEG-TS fan-out architecture: - Go stream.Hub holds ONE upstream connection per active channel and broadcasts the raw TS bytes to all connected browsers via /ts. The IPTV provider only ever sees one IP (the server), no matter how many viewers are watching (shared single-channel model). - Frontend uses mpegts.js to play the raw TS in-browser via MSE, fixing HEVC/H.265 4K streams that HLS could not package. - Dropped FFmpeg, MediaMTX, RTMP/RTSP, HLS proxy, playback/ingest modes, the OBS source toggle, and FFmpeg health stats. - UI look preserved (fullscreen video, collapsible sidebar, status bar, upstream-down banner, hourly playlist auto-refresh). Tradeoff: loses iOS Safari (no MSE/mpegts.js); fixes desktop/Android playback of both H.264 and H.265.
This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
|
||||
"tuner/m3u"
|
||||
"tuner/models"
|
||||
"tuner/process"
|
||||
"tuner/stream"
|
||||
)
|
||||
|
||||
// App holds shared application state for all handlers.
|
||||
@@ -19,12 +19,10 @@ type App struct {
|
||||
Status models.StreamStatus
|
||||
PlaylistPath string
|
||||
PlaylistURL string // if set, reload fetches from this URL before parsing
|
||||
PlaybackMode string // "llhls" or "standard"
|
||||
SwitchStartedAt time.Time
|
||||
CurrentStreamURL string
|
||||
PlaylistVersion int64
|
||||
MediaMTX *process.MediaMTXManager
|
||||
FFmpeg *process.FFmpegManager
|
||||
Hub *stream.Hub
|
||||
}
|
||||
|
||||
// HandleConfig returns runtime client configuration as JSON.
|
||||
@@ -35,13 +33,8 @@ func (a *App) HandleConfig(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
mode := a.PlaybackMode
|
||||
if mode == "" {
|
||||
mode = "standard"
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(map[string]string{"playback_mode": mode})
|
||||
json.NewEncoder(w).Encode(map[string]string{"player": "mpegts"})
|
||||
}
|
||||
|
||||
// HandleChannels lists, searches, and filters channels.
|
||||
@@ -79,52 +72,7 @@ func (a *App) HandleGroups(w http.ResponseWriter, r *http.Request) {
|
||||
json.NewEncoder(w).Encode(groups)
|
||||
}
|
||||
|
||||
// HandleSetSource sets the active source (obs or iptv).
|
||||
// POST /api/admin/source {"source": "obs"|"iptv"}
|
||||
func (a *App) HandleSetSource(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
var req struct {
|
||||
Source string `json:"source"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
http.Error(w, "invalid json", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if req.Source != "obs" && req.Source != "iptv" {
|
||||
http.Error(w, `source must be "obs" or "iptv"`, http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
a.mu.Lock()
|
||||
a.Status.Source = req.Source
|
||||
a.mu.Unlock()
|
||||
|
||||
// If switching to OBS, stop FFmpeg relay
|
||||
if req.Source == "obs" {
|
||||
if err := a.FFmpeg.Stop(); err != nil {
|
||||
log.Printf("[admin] error stopping ffmpeg: %v", err)
|
||||
}
|
||||
a.mu.Lock()
|
||||
a.Status.ChannelName = ""
|
||||
a.Status.Transitioning = false
|
||||
a.Status.UpstreamDown = false
|
||||
a.SwitchStartedAt = time.Time{}
|
||||
a.CurrentStreamURL = ""
|
||||
a.mu.Unlock()
|
||||
}
|
||||
|
||||
log.Printf("[admin] source set to %s", req.Source)
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(map[string]string{"status": "ok", "source": req.Source})
|
||||
}
|
||||
|
||||
// HandleSetChannel selects an IPTV channel and starts FFmpeg relay.
|
||||
// HandleSetChannel selects an IPTV channel and points the hub at its upstream.
|
||||
// POST /api/admin/channel {"channel_id": "..."}
|
||||
func (a *App) HandleSetChannel(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
@@ -156,14 +104,10 @@ func (a *App) HandleSetChannel(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
// Start FFmpeg with the channel's stream URL
|
||||
if err := a.FFmpeg.Start(found.StreamURL); err != nil {
|
||||
http.Error(w, "failed to start stream: "+err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
// Point the shared fan-out hub at this channel's upstream URL.
|
||||
a.Hub.SetChannel(found.StreamURL)
|
||||
|
||||
a.mu.Lock()
|
||||
a.Status.Source = "iptv"
|
||||
a.Status.ChannelName = found.Name
|
||||
a.Status.Live = true
|
||||
a.Status.Transitioning = true
|
||||
@@ -232,20 +176,3 @@ func (a *App) HandleReloadPlaylist(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(map[string]interface{}{"status": "ok", "channels": count})
|
||||
}
|
||||
|
||||
// HandleProcessStatus returns the status of managed processes.
|
||||
// GET /api/admin/process/status
|
||||
func (a *App) HandleProcessStatus(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodGet {
|
||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
status := models.SystemStatus{
|
||||
MediaMTX: a.MediaMTX.Status(),
|
||||
FFmpeg: a.FFmpeg.Status(),
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(status)
|
||||
}
|
||||
|
||||
@@ -20,29 +20,22 @@ func (a *App) HandleStatus(w http.ResponseWriter, r *http.Request) {
|
||||
status := a.Status
|
||||
a.mu.RUnlock()
|
||||
|
||||
// Attach live stream health metrics when FFmpeg is running
|
||||
status.Health = a.FFmpeg.Health()
|
||||
|
||||
// Auto-clear transitioning once FFmpeg is producing health data.
|
||||
// If no progress arrives for a while after a channel switch, flag upstream_down
|
||||
// so all watchers see an "Upstream down?" warning via polling.
|
||||
if status.Transitioning && status.Health != nil && status.Health.Speed != "" {
|
||||
// Detect upstream health from the hub. Once the hub receives data, the
|
||||
// channel is considered live; if no data arrives within the threshold
|
||||
// after a switch, flag upstream_down so all watchers see the warning.
|
||||
gotData, since := a.Hub.GotData()
|
||||
if status.Transitioning && gotData {
|
||||
a.mu.Lock()
|
||||
a.Status.Transitioning = false
|
||||
a.Status.UpstreamDown = false
|
||||
a.mu.Unlock()
|
||||
status.Transitioning = false
|
||||
status.UpstreamDown = false
|
||||
} else if status.Transitioning {
|
||||
a.mu.RLock()
|
||||
switchStartedAt := a.SwitchStartedAt
|
||||
a.mu.RUnlock()
|
||||
if !switchStartedAt.IsZero() && time.Since(switchStartedAt) >= upstreamDownAfter {
|
||||
a.mu.Lock()
|
||||
a.Status.UpstreamDown = true
|
||||
a.mu.Unlock()
|
||||
status.UpstreamDown = true
|
||||
}
|
||||
} else if status.Transitioning && !gotData && since >= upstreamDownAfter {
|
||||
a.mu.Lock()
|
||||
a.Status.UpstreamDown = true
|
||||
a.mu.Unlock()
|
||||
status.UpstreamDown = true
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
45
backend/api/ts.go
Normal file
45
backend/api/ts.go
Normal file
@@ -0,0 +1,45 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
)
|
||||
|
||||
// HandleTS streams the shared channel's raw MPEG-TS bytes to a viewer.
|
||||
// Every connected browser subscribes to the same upstream via the hub, so the
|
||||
// server holds only one connection to the IPTV source regardless of how many
|
||||
// clients are watching.
|
||||
// GET /ts
|
||||
func (a *App) HandleTS(w http.ResponseWriter, r *http.Request) {
|
||||
flusher, ok := w.(http.Flusher)
|
||||
if !ok {
|
||||
http.Error(w, "streaming unsupported", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "video/mp2t")
|
||||
w.Header().Set("Cache-Control", "no-cache, no-store")
|
||||
w.Header().Set("Connection", "keep-alive")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
flusher.Flush()
|
||||
|
||||
sub, unsub := a.Hub.Subscribe()
|
||||
defer unsub()
|
||||
|
||||
ctx := r.Context()
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-sub.Done():
|
||||
return
|
||||
case chunk, ok := <-sub.Chan():
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
if _, err := w.Write(chunk); err != nil {
|
||||
return
|
||||
}
|
||||
flusher.Flush()
|
||||
}
|
||||
}
|
||||
}
|
||||
105
backend/main.go
105
backend/main.go
@@ -6,8 +6,6 @@ import (
|
||||
"io"
|
||||
"log"
|
||||
"net/http"
|
||||
"net/http/httputil"
|
||||
"net/url"
|
||||
"os"
|
||||
"os/signal"
|
||||
"strings"
|
||||
@@ -16,7 +14,7 @@ import (
|
||||
|
||||
"tuner/api"
|
||||
"tuner/m3u"
|
||||
"tuner/process"
|
||||
"tuner/stream"
|
||||
)
|
||||
|
||||
func getEnv(key, fallback string) string {
|
||||
@@ -26,65 +24,6 @@ func getEnv(key, fallback string) string {
|
||||
return fallback
|
||||
}
|
||||
|
||||
// normalizePlaybackMode validates the PLAYBACK_MODE value. Accepts "standard",
|
||||
// "fmp4", or "llhls" (case-insensitive); anything else falls back to "standard".
|
||||
func normalizePlaybackMode(mode string) string {
|
||||
switch strings.ToLower(strings.TrimSpace(mode)) {
|
||||
case "llhls", "lowlatency", "low-latency":
|
||||
return "llhls"
|
||||
case "fmp4", "mp4", "fragmented-mp4", "fragmented_mp4":
|
||||
return "fmp4"
|
||||
default:
|
||||
return "standard"
|
||||
}
|
||||
}
|
||||
|
||||
func normalizeIngestMode(mode string) string {
|
||||
switch strings.ToLower(strings.TrimSpace(mode)) {
|
||||
case "rtsp":
|
||||
return "rtsp"
|
||||
default:
|
||||
return "rtmp"
|
||||
}
|
||||
}
|
||||
|
||||
func normalizeIngestAudioMode(mode string) string {
|
||||
switch strings.ToLower(strings.TrimSpace(mode)) {
|
||||
case "copy":
|
||||
return "copy"
|
||||
default:
|
||||
return "aac"
|
||||
}
|
||||
}
|
||||
|
||||
// mediamtxEnvForMode returns the MTX_* environment variable overrides for the
|
||||
// given playback mode.
|
||||
func mediamtxEnvForMode(mode string) []string {
|
||||
if mode == "llhls" {
|
||||
// Low-Latency HLS: minimal latency, more sensitive to upstream jitter.
|
||||
return []string{
|
||||
"MTX_HLSVARIANT=lowLatency",
|
||||
"MTX_HLSSEGMENTCOUNT=7",
|
||||
"MTX_HLSSEGMENTDURATION=1s",
|
||||
"MTX_HLSPARTDURATION=200ms",
|
||||
}
|
||||
}
|
||||
if mode == "fmp4" {
|
||||
// Fragmented MP4 HLS: smooth standard HLS with HEVC/H.265 support.
|
||||
return []string{
|
||||
"MTX_HLSVARIANT=fmp4",
|
||||
"MTX_HLSSEGMENTCOUNT=7",
|
||||
"MTX_HLSSEGMENTDURATION=2s",
|
||||
}
|
||||
}
|
||||
// Standard HLS (mpegts): smooth, resilient, universally compatible (including iOS Safari).
|
||||
return []string{
|
||||
"MTX_HLSVARIANT=mpegts",
|
||||
"MTX_HLSSEGMENTCOUNT=7",
|
||||
"MTX_HLSSEGMENTDURATION=2s",
|
||||
}
|
||||
}
|
||||
|
||||
func parseRefreshInterval(value string) time.Duration {
|
||||
v := strings.ToLower(strings.TrimSpace(value))
|
||||
if v == "" || v == "0" || v == "off" || v == "false" || v == "disabled" {
|
||||
@@ -121,14 +60,9 @@ func copyFile(src, dst string) error {
|
||||
|
||||
func main() {
|
||||
playlistPath := getEnv("PLAYLIST_PATH", "/data/playlist.m3u")
|
||||
mediamtxBin := getEnv("MEDIAMTX_PATH", "mediamtx")
|
||||
mediamtxCfg := getEnv("MEDIAMTX_CONFIG", "mediamtx.yml")
|
||||
port := getEnv("RESTREAMER_PORT", "8080")
|
||||
playlistURL := getEnv("PLAYLIST_URL", "")
|
||||
useLocal := getEnv("PLAYLIST_USE_LOCAL", "false") == "true"
|
||||
playbackMode := normalizePlaybackMode(getEnv("PLAYBACK_MODE", "standard"))
|
||||
ingestMode := normalizeIngestMode(getEnv("INGEST_MODE", "rtmp"))
|
||||
ingestAudioMode := normalizeIngestAudioMode(getEnv("INGEST_AUDIO_MODE", "aac"))
|
||||
playlistRefreshInterval := parseRefreshInterval(getEnv("PLAYLIST_AUTO_REFRESH_INTERVAL", "1h"))
|
||||
|
||||
localSrcPath := getEnv("PLAYLIST_LOCAL_SRC", "/data/playlist.m3u.local")
|
||||
@@ -145,20 +79,13 @@ func main() {
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize process managers
|
||||
mtxManager := process.NewMediaMTXManager(mediamtxBin, mediamtxCfg)
|
||||
mtxManager.SetEnv(mediamtxEnvForMode(playbackMode))
|
||||
ffmpegManager := process.NewFFmpegManager(ingestMode, ingestAudioMode)
|
||||
log.Printf("[startup] playback mode: %s", playbackMode)
|
||||
log.Printf("[startup] ingest mode: %s", ingestMode)
|
||||
log.Printf("[startup] ingest audio mode: %s", ingestAudioMode)
|
||||
// Single shared upstream fan-out hub.
|
||||
hub := stream.NewHub()
|
||||
|
||||
// Build shared app state
|
||||
app := &api.App{
|
||||
PlaylistPath: playlistPath,
|
||||
PlaybackMode: playbackMode,
|
||||
MediaMTX: mtxManager,
|
||||
FFmpeg: ffmpegManager,
|
||||
Hub: hub,
|
||||
}
|
||||
// Only expose the URL for reloads when we're in URL mode
|
||||
if !useLocal && playlistURL != "" {
|
||||
@@ -194,11 +121,6 @@ func main() {
|
||||
log.Printf("[startup] playlist auto-refresh disabled")
|
||||
}
|
||||
|
||||
// Start MediaMTX (warn but don't crash if binary not found)
|
||||
if err := mtxManager.Start(); err != nil {
|
||||
log.Printf("[startup] warning: could not start mediamtx: %v", err)
|
||||
}
|
||||
|
||||
// Register routes
|
||||
mux := http.NewServeMux()
|
||||
|
||||
@@ -207,18 +129,11 @@ func main() {
|
||||
mux.HandleFunc("/api/status", app.HandleStatus)
|
||||
mux.HandleFunc("/api/admin/channels", app.HandleChannels)
|
||||
mux.HandleFunc("/api/admin/groups", app.HandleGroups)
|
||||
mux.HandleFunc("/api/admin/source", app.HandleSetSource)
|
||||
mux.HandleFunc("/api/admin/channel", app.HandleSetChannel)
|
||||
mux.HandleFunc("/api/admin/playlist/reload", app.HandleReloadPlaylist)
|
||||
mux.HandleFunc("/api/admin/process/status", app.HandleProcessStatus)
|
||||
|
||||
// Proxy HLS through the main app origin so HTTPS deployments avoid mixed content.
|
||||
hlsURL, err := url.Parse("http://127.0.0.1:8888")
|
||||
if err != nil {
|
||||
log.Printf("[startup] warning: invalid HLS proxy URL: %v", err)
|
||||
} else {
|
||||
mux.Handle("/live/", httputil.NewSingleHostReverseProxy(hlsURL))
|
||||
}
|
||||
// Raw MPEG-TS fan-out endpoint: every viewer streams the shared channel here.
|
||||
mux.HandleFunc("/ts", app.HandleTS)
|
||||
|
||||
// Serve frontend static files (falls back to index.html for SPA routing)
|
||||
frontendDir := getEnv("FRONTEND_DIR", "frontend/dist")
|
||||
@@ -257,13 +172,7 @@ func main() {
|
||||
sig := <-sigCh
|
||||
log.Printf("[shutdown] received %v, shutting down...", sig)
|
||||
|
||||
// Stop child processes
|
||||
if err := ffmpegManager.Stop(); err != nil {
|
||||
log.Printf("[shutdown] error stopping ffmpeg: %v", err)
|
||||
}
|
||||
if err := mtxManager.Stop(); err != nil {
|
||||
log.Printf("[shutdown] error stopping mediamtx: %v", err)
|
||||
}
|
||||
hub.Stop()
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
|
||||
@@ -9,38 +9,11 @@ type Channel struct {
|
||||
StreamURL string `json:"stream_url"`
|
||||
}
|
||||
|
||||
// StreamHealth holds real-time FFmpeg progress metrics for diagnosing issues.
|
||||
// Speed < 1x indicates the upstream IPTV source can't deliver fast enough.
|
||||
// Drop frames > 0 with speed ~1x suggests local processing issues.
|
||||
type StreamHealth struct {
|
||||
Speed string `json:"speed"` // "1.00x" — upstream delivery rate
|
||||
FPS string `json:"fps"` // frames per second being processed
|
||||
Bitrate string `json:"bitrate"` // output bitrate
|
||||
DropFrames string `json:"drop_frames"` // frames dropped by FFmpeg
|
||||
DupFrames string `json:"dup_frames"` // frames duplicated by FFmpeg
|
||||
}
|
||||
|
||||
// StreamStatus represents the current streaming state.
|
||||
type StreamStatus struct {
|
||||
Source string `json:"source"` // "obs" or "iptv"
|
||||
ChannelName string `json:"channel_name"` // current IPTV channel name (empty if OBS)
|
||||
Live bool `json:"live"`
|
||||
Transitioning bool `json:"transitioning"` // true while switching to a new channel
|
||||
UpstreamDown bool `json:"upstream_down"` // true when no data is detected from the selected upstream
|
||||
PlaylistVersion int64 `json:"playlist_version"` // increments when playlist reloads
|
||||
Health *StreamHealth `json:"health,omitempty"`
|
||||
}
|
||||
|
||||
// ProcessInfo represents the status of a managed child process.
|
||||
type ProcessInfo struct {
|
||||
Running bool `json:"running"`
|
||||
PID int `json:"pid"`
|
||||
Uptime string `json:"uptime"`
|
||||
Error string `json:"error,omitempty"`
|
||||
}
|
||||
|
||||
// SystemStatus holds status for all managed processes.
|
||||
type SystemStatus struct {
|
||||
MediaMTX ProcessInfo `json:"mediamtx"`
|
||||
FFmpeg ProcessInfo `json:"ffmpeg"`
|
||||
ChannelName string `json:"channel_name"` // current IPTV channel name
|
||||
Live bool `json:"live"` // true when a channel is selected
|
||||
Transitioning bool `json:"transitioning"` // true while switching to a new channel
|
||||
UpstreamDown bool `json:"upstream_down"` // true when no data is detected from the selected upstream
|
||||
PlaylistVersion int64 `json:"playlist_version"` // increments when playlist reloads
|
||||
}
|
||||
|
||||
@@ -1,218 +0,0 @@
|
||||
package process
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"tuner/models"
|
||||
)
|
||||
|
||||
// FFmpegManager manages an FFmpeg child process for IPTV relay.
|
||||
type FFmpegManager struct {
|
||||
mu sync.Mutex
|
||||
cmd *exec.Cmd
|
||||
ingestMode string
|
||||
audioMode string
|
||||
startTime time.Time
|
||||
lastError string
|
||||
streamURL string
|
||||
health models.StreamHealth
|
||||
}
|
||||
|
||||
// NewFFmpegManager creates a new FFmpeg process manager.
|
||||
func NewFFmpegManager(ingestMode, audioMode string) *FFmpegManager {
|
||||
if ingestMode != "rtsp" {
|
||||
ingestMode = "rtmp"
|
||||
}
|
||||
if audioMode != "copy" {
|
||||
audioMode = "aac"
|
||||
}
|
||||
return &FFmpegManager{ingestMode: ingestMode, audioMode: audioMode}
|
||||
}
|
||||
|
||||
// Start spawns an FFmpeg process to pull from streamURL and push to MediaMTX.
|
||||
// It kills any existing FFmpeg process first.
|
||||
func (f *FFmpegManager) Start(streamURL string) error {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
|
||||
// Kill existing process if running
|
||||
f.stopLocked()
|
||||
|
||||
args := []string{
|
||||
"-loglevel", "warning",
|
||||
"-progress", "pipe:1",
|
||||
"-reconnect", "1",
|
||||
"-reconnect_streamed", "1",
|
||||
"-reconnect_delay_max", "5",
|
||||
"-i", streamURL,
|
||||
}
|
||||
if f.ingestMode == "rtsp" {
|
||||
if f.audioMode == "copy" {
|
||||
args = append(args, "-c", "copy")
|
||||
} else {
|
||||
args = append(args,
|
||||
"-c:v", "copy",
|
||||
"-c:a", "aac",
|
||||
"-ar", "48000",
|
||||
"-b:a", "160k",
|
||||
)
|
||||
}
|
||||
args = append(args,
|
||||
"-f", "rtsp",
|
||||
"-rtsp_transport", "tcp",
|
||||
"rtsp://localhost:8554/live/stream",
|
||||
)
|
||||
} else {
|
||||
args = append(args,
|
||||
"-c", "copy",
|
||||
"-f", "flv",
|
||||
"rtmp://localhost:1935/live/stream",
|
||||
)
|
||||
}
|
||||
|
||||
f.cmd = exec.Command("ffmpeg", args...)
|
||||
f.streamURL = streamURL
|
||||
f.lastError = ""
|
||||
f.health = models.StreamHealth{}
|
||||
|
||||
// Capture stdout for progress stats, stderr for errors
|
||||
stdout, err := f.cmd.StdoutPipe()
|
||||
if err != nil {
|
||||
return fmt.Errorf("stdout pipe: %w", err)
|
||||
}
|
||||
stderr, err := f.cmd.StderrPipe()
|
||||
if err != nil {
|
||||
return fmt.Errorf("stderr pipe: %w", err)
|
||||
}
|
||||
|
||||
if err := f.cmd.Start(); err != nil {
|
||||
f.lastError = err.Error()
|
||||
return fmt.Errorf("start ffmpeg: %w", err)
|
||||
}
|
||||
|
||||
f.startTime = time.Now()
|
||||
log.Printf("[ffmpeg] started with pid %d, ingest=%s, audio=%s, source: %s", f.cmd.Process.Pid, f.ingestMode, f.audioMode, streamURL)
|
||||
|
||||
// Pass cmd reference so goroutines can detect process replacement
|
||||
cmd := f.cmd
|
||||
go f.parseProgress(stdout)
|
||||
go f.logStderr(stderr)
|
||||
go f.monitor(cmd)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// parseProgress reads FFmpeg -progress output and updates health stats.
|
||||
func (f *FFmpegManager) parseProgress(r io.Reader) {
|
||||
scanner := bufio.NewScanner(r)
|
||||
for scanner.Scan() {
|
||||
line := scanner.Text()
|
||||
k, v, ok := strings.Cut(line, "=")
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
f.mu.Lock()
|
||||
switch k {
|
||||
case "speed":
|
||||
f.health.Speed = v
|
||||
case "fps":
|
||||
f.health.FPS = v
|
||||
case "bitrate":
|
||||
f.health.Bitrate = v
|
||||
case "drop_frames":
|
||||
f.health.DropFrames = v
|
||||
case "dup_frames":
|
||||
f.health.DupFrames = v
|
||||
}
|
||||
f.mu.Unlock()
|
||||
}
|
||||
}
|
||||
|
||||
func (f *FFmpegManager) logStderr(r io.Reader) {
|
||||
scanner := bufio.NewScanner(r)
|
||||
for scanner.Scan() {
|
||||
log.Printf("[ffmpeg] %s", scanner.Text())
|
||||
}
|
||||
}
|
||||
|
||||
func (f *FFmpegManager) monitor(cmd *exec.Cmd) {
|
||||
err := cmd.Wait()
|
||||
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
|
||||
// If the process was replaced by a new Start() call, don't touch state
|
||||
if f.cmd != cmd {
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
f.lastError = err.Error()
|
||||
log.Printf("[ffmpeg] exited: %v", err)
|
||||
} else {
|
||||
log.Println("[ffmpeg] exited (status 0)")
|
||||
}
|
||||
|
||||
f.cmd = nil
|
||||
}
|
||||
|
||||
// Stop kills the FFmpeg process.
|
||||
func (f *FFmpegManager) Stop() error {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
return f.stopLocked()
|
||||
}
|
||||
|
||||
func (f *FFmpegManager) stopLocked() error {
|
||||
if f.cmd == nil || f.cmd.Process == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if err := f.cmd.Process.Kill(); err != nil {
|
||||
return fmt.Errorf("kill ffmpeg: %w", err)
|
||||
}
|
||||
|
||||
// Wait for the process to fully exit to avoid zombies
|
||||
_ = f.cmd.Wait()
|
||||
f.cmd = nil
|
||||
log.Println("[ffmpeg] killed")
|
||||
return nil
|
||||
}
|
||||
|
||||
// Health returns the latest stream health stats from FFmpeg progress.
|
||||
func (f *FFmpegManager) Health() *models.StreamHealth {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
|
||||
if f.cmd == nil || f.health.Speed == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
h := f.health // copy
|
||||
return &h
|
||||
}
|
||||
|
||||
// Status returns the current FFmpeg process status.
|
||||
func (f *FFmpegManager) Status() models.ProcessInfo {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
|
||||
info := models.ProcessInfo{
|
||||
Error: f.lastError,
|
||||
}
|
||||
|
||||
if f.cmd != nil && f.cmd.Process != nil {
|
||||
info.Running = true
|
||||
info.PID = f.cmd.Process.Pid
|
||||
info.Uptime = time.Since(f.startTime).Truncate(time.Second).String()
|
||||
}
|
||||
|
||||
return info
|
||||
}
|
||||
@@ -1,189 +0,0 @@
|
||||
package process
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"os"
|
||||
"os/exec"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"tuner/models"
|
||||
)
|
||||
|
||||
// MediaMTXManager manages the MediaMTX child process.
|
||||
type MediaMTXManager struct {
|
||||
mu sync.Mutex
|
||||
cmd *exec.Cmd
|
||||
binaryPath string
|
||||
configPath string
|
||||
extraEnv []string
|
||||
startTime time.Time
|
||||
lastError string
|
||||
stopCh chan struct{}
|
||||
stopped bool
|
||||
}
|
||||
|
||||
// NewMediaMTXManager creates a new manager for the MediaMTX process.
|
||||
func NewMediaMTXManager(binaryPath, configPath string) *MediaMTXManager {
|
||||
return &MediaMTXManager{
|
||||
binaryPath: binaryPath,
|
||||
configPath: configPath,
|
||||
}
|
||||
}
|
||||
|
||||
// SetEnv sets additional environment variables (e.g. MTX_HLSVARIANT) that are
|
||||
// passed to MediaMTX. Must be called before Start.
|
||||
func (m *MediaMTXManager) SetEnv(env []string) {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
m.extraEnv = env
|
||||
}
|
||||
|
||||
// Start launches the MediaMTX process. It auto-restarts on unexpected exit.
|
||||
func (m *MediaMTXManager) Start() error {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
|
||||
if m.cmd != nil && m.cmd.Process != nil {
|
||||
return fmt.Errorf("mediamtx already running (pid %d)", m.cmd.Process.Pid)
|
||||
}
|
||||
|
||||
return m.startLocked()
|
||||
}
|
||||
|
||||
func (m *MediaMTXManager) startLocked() error {
|
||||
_, err := exec.LookPath(m.binaryPath)
|
||||
if err != nil {
|
||||
m.lastError = fmt.Sprintf("binary not found: %s", m.binaryPath)
|
||||
return fmt.Errorf("mediamtx binary not found: %s", m.binaryPath)
|
||||
}
|
||||
|
||||
m.cmd = exec.Command(m.binaryPath, m.configPath)
|
||||
if len(m.extraEnv) > 0 {
|
||||
m.cmd.Env = append(os.Environ(), m.extraEnv...)
|
||||
}
|
||||
m.lastError = ""
|
||||
m.stopped = false
|
||||
m.stopCh = make(chan struct{})
|
||||
|
||||
// Capture stdout/stderr for logging
|
||||
stdout, _ := m.cmd.StdoutPipe()
|
||||
stderr, _ := m.cmd.StderrPipe()
|
||||
|
||||
if err := m.cmd.Start(); err != nil {
|
||||
m.lastError = err.Error()
|
||||
return fmt.Errorf("start mediamtx: %w", err)
|
||||
}
|
||||
|
||||
m.startTime = time.Now()
|
||||
log.Printf("[mediamtx] started with pid %d", m.cmd.Process.Pid)
|
||||
|
||||
go m.logOutput("stdout", stdout)
|
||||
go m.logOutput("stderr", stderr)
|
||||
|
||||
// Monitor in background and auto-restart on unexpected exit
|
||||
go m.monitor()
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *MediaMTXManager) logOutput(name string, r io.Reader) {
|
||||
scanner := bufio.NewScanner(r)
|
||||
for scanner.Scan() {
|
||||
log.Printf("[mediamtx:%s] %s", name, scanner.Text())
|
||||
}
|
||||
}
|
||||
|
||||
func (m *MediaMTXManager) monitor() {
|
||||
err := m.cmd.Wait()
|
||||
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
|
||||
// Check if this was a deliberate stop
|
||||
select {
|
||||
case <-m.stopCh:
|
||||
log.Println("[mediamtx] stopped")
|
||||
return
|
||||
default:
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
m.lastError = err.Error()
|
||||
log.Printf("[mediamtx] exited unexpectedly: %v — restarting in 2s", err)
|
||||
} else {
|
||||
log.Println("[mediamtx] exited unexpectedly (status 0) — restarting in 2s")
|
||||
}
|
||||
|
||||
m.cmd = nil
|
||||
|
||||
// Auto-restart after a brief delay (without lock held)
|
||||
go func() {
|
||||
time.Sleep(2 * time.Second)
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
if m.stopped {
|
||||
return
|
||||
}
|
||||
if m.cmd != nil {
|
||||
return // already restarted
|
||||
}
|
||||
if err := m.startLocked(); err != nil {
|
||||
log.Printf("[mediamtx] auto-restart failed: %v", err)
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
// Stop kills the MediaMTX process.
|
||||
func (m *MediaMTXManager) Stop() error {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
|
||||
m.stopped = true
|
||||
|
||||
if m.cmd == nil || m.cmd.Process == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if m.stopCh != nil {
|
||||
close(m.stopCh)
|
||||
}
|
||||
|
||||
if err := m.cmd.Process.Kill(); err != nil {
|
||||
return fmt.Errorf("kill mediamtx: %w", err)
|
||||
}
|
||||
|
||||
m.cmd = nil
|
||||
log.Println("[mediamtx] killed")
|
||||
return nil
|
||||
}
|
||||
|
||||
// Restart stops and restarts the MediaMTX process.
|
||||
func (m *MediaMTXManager) Restart() error {
|
||||
if err := m.Stop(); err != nil {
|
||||
return err
|
||||
}
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
return m.Start()
|
||||
}
|
||||
|
||||
// Status returns the current process status.
|
||||
func (m *MediaMTXManager) Status() models.ProcessInfo {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
|
||||
info := models.ProcessInfo{
|
||||
Error: m.lastError,
|
||||
}
|
||||
|
||||
if m.cmd != nil && m.cmd.Process != nil {
|
||||
info.Running = true
|
||||
info.PID = m.cmd.Process.Pid
|
||||
info.Uptime = time.Since(m.startTime).Truncate(time.Second).String()
|
||||
}
|
||||
|
||||
return info
|
||||
}
|
||||
242
backend/stream/hub.go
Normal file
242
backend/stream/hub.go
Normal file
@@ -0,0 +1,242 @@
|
||||
// Package stream implements a single-upstream, many-client fan-out hub for
|
||||
// raw MPEG-TS streams. Only one connection is ever opened to the upstream IPTV
|
||||
// source at a time; all connected browsers receive a copy of the same bytes.
|
||||
package stream
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"log"
|
||||
"net/http"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
// chunkSize is the read buffer size for pulling from the upstream source.
|
||||
const chunkSize = 64 * 1024
|
||||
|
||||
// subscriberBuffer is how many chunks may queue per client before it is
|
||||
// considered too slow and dropped (prevents one slow client stalling others).
|
||||
const subscriberBuffer = 256
|
||||
|
||||
// Subscriber receives copies of upstream TS chunks.
|
||||
type subscriber struct {
|
||||
ch chan []byte
|
||||
closed chan struct{}
|
||||
}
|
||||
|
||||
// Hub manages a single shared upstream connection and fans its bytes out to
|
||||
// any number of subscribers. Switching channels tears down the current
|
||||
// upstream and starts a new one.
|
||||
type Hub struct {
|
||||
mu sync.Mutex
|
||||
|
||||
streamURL string
|
||||
cancel context.CancelFunc
|
||||
subscribers map[*subscriber]struct{}
|
||||
running bool
|
||||
|
||||
// gotData is closed once the first upstream bytes arrive after a switch;
|
||||
// used to detect upstream-down conditions.
|
||||
gotData bool
|
||||
startedAt time.Time
|
||||
|
||||
client *http.Client
|
||||
}
|
||||
|
||||
// NewHub creates an empty hub.
|
||||
func NewHub() *Hub {
|
||||
return &Hub{
|
||||
subscribers: make(map[*subscriber]struct{}),
|
||||
client: &http.Client{
|
||||
// No overall timeout: this is a long-lived stream. Per-attempt
|
||||
// dial/response-header timeouts are set on the transport.
|
||||
Transport: &http.Transport{
|
||||
ResponseHeaderTimeout: 15 * time.Second,
|
||||
IdleConnTimeout: 30 * time.Second,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// SetChannel switches the shared upstream to streamURL. If the same URL is
|
||||
// already active, it is a no-op. An empty URL stops streaming.
|
||||
func (h *Hub) SetChannel(streamURL string) {
|
||||
h.mu.Lock()
|
||||
defer h.mu.Unlock()
|
||||
|
||||
if streamURL == h.streamURL && h.running {
|
||||
return
|
||||
}
|
||||
|
||||
// Tear down existing upstream
|
||||
h.stopLocked()
|
||||
|
||||
h.streamURL = streamURL
|
||||
if streamURL == "" {
|
||||
return
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
h.cancel = cancel
|
||||
h.running = true
|
||||
h.gotData = false
|
||||
h.startedAt = time.Now()
|
||||
|
||||
go h.run(ctx, streamURL)
|
||||
log.Printf("[hub] switched upstream to %s", streamURL)
|
||||
}
|
||||
|
||||
// Stop closes the upstream connection and clears the active channel.
|
||||
func (h *Hub) Stop() {
|
||||
h.mu.Lock()
|
||||
defer h.mu.Unlock()
|
||||
h.streamURL = ""
|
||||
h.stopLocked()
|
||||
}
|
||||
|
||||
func (h *Hub) stopLocked() {
|
||||
if h.cancel != nil {
|
||||
h.cancel()
|
||||
h.cancel = nil
|
||||
}
|
||||
h.running = false
|
||||
}
|
||||
|
||||
// GotData reports whether upstream bytes have been received since the last
|
||||
// channel switch, plus how long ago the switch occurred.
|
||||
func (h *Hub) GotData() (bool, time.Duration) {
|
||||
h.mu.Lock()
|
||||
defer h.mu.Unlock()
|
||||
if !h.running {
|
||||
return false, 0
|
||||
}
|
||||
return h.gotData, time.Since(h.startedAt)
|
||||
}
|
||||
|
||||
// Subscribe registers a new client. Returns a subscriber and an unsubscribe
|
||||
// function the caller must invoke when done.
|
||||
func (h *Hub) Subscribe() (*subscriber, func()) {
|
||||
sub := &subscriber{
|
||||
ch: make(chan []byte, subscriberBuffer),
|
||||
closed: make(chan struct{}),
|
||||
}
|
||||
|
||||
h.mu.Lock()
|
||||
h.subscribers[sub] = struct{}{}
|
||||
count := len(h.subscribers)
|
||||
h.mu.Unlock()
|
||||
|
||||
log.Printf("[hub] client subscribed (%d total)", count)
|
||||
|
||||
var once sync.Once
|
||||
unsub := func() {
|
||||
once.Do(func() {
|
||||
h.mu.Lock()
|
||||
delete(h.subscribers, sub)
|
||||
remaining := len(h.subscribers)
|
||||
h.mu.Unlock()
|
||||
close(sub.closed)
|
||||
log.Printf("[hub] client unsubscribed (%d remaining)", remaining)
|
||||
})
|
||||
}
|
||||
return sub, unsub
|
||||
}
|
||||
|
||||
// Chan exposes the subscriber's chunk channel.
|
||||
func (s *subscriber) Chan() <-chan []byte { return s.ch }
|
||||
|
||||
// Closed signals the subscriber has been removed by the hub.
|
||||
func (s *subscriber) Done() <-chan struct{} { return s.closed }
|
||||
|
||||
// broadcast sends a chunk to all subscribers, dropping any that are too slow.
|
||||
func (h *Hub) broadcast(chunk []byte) {
|
||||
h.mu.Lock()
|
||||
if !h.gotData {
|
||||
h.gotData = true
|
||||
}
|
||||
subs := make([]*subscriber, 0, len(h.subscribers))
|
||||
for s := range h.subscribers {
|
||||
subs = append(subs, s)
|
||||
}
|
||||
h.mu.Unlock()
|
||||
|
||||
for _, s := range subs {
|
||||
select {
|
||||
case s.ch <- chunk:
|
||||
default:
|
||||
// Slow client: drop this chunk for them rather than blocking everyone.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// run maintains the upstream connection, reconnecting on failure until the
|
||||
// context is cancelled (channel switch/stop).
|
||||
func (h *Hub) run(ctx context.Context, streamURL string) {
|
||||
backoff := time.Second
|
||||
for {
|
||||
if ctx.Err() != nil {
|
||||
return
|
||||
}
|
||||
err := h.pull(ctx, streamURL)
|
||||
if ctx.Err() != nil {
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
log.Printf("[hub] upstream error (%s), retrying in %s: %v", streamURL, backoff, err)
|
||||
}
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-time.After(backoff):
|
||||
}
|
||||
if backoff < 10*time.Second {
|
||||
backoff *= 2
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// pull opens a single upstream connection and copies bytes to subscribers
|
||||
// until the stream ends or the context is cancelled.
|
||||
func (h *Hub) pull(ctx context.Context, streamURL string) error {
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, streamURL, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req.Header.Set("User-Agent", "VLC/3.0.20 LibVLC/3.0.20")
|
||||
|
||||
resp, err := h.client.Do(req)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return &httpError{status: resp.StatusCode}
|
||||
}
|
||||
|
||||
buf := make([]byte, chunkSize)
|
||||
for {
|
||||
n, err := resp.Body.Read(buf)
|
||||
if n > 0 {
|
||||
chunk := make([]byte, n)
|
||||
copy(chunk, buf[:n])
|
||||
h.broadcast(chunk)
|
||||
}
|
||||
if err != nil {
|
||||
if err == io.EOF {
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
}
|
||||
if ctx.Err() != nil {
|
||||
return ctx.Err()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
type httpError struct{ status int }
|
||||
|
||||
func (e *httpError) Error() string {
|
||||
return "upstream returned HTTP status " + http.StatusText(e.status)
|
||||
}
|
||||
Reference in New Issue
Block a user