The web subtitle handler wrapped the downloaded-subtitle lookup in
`if err == nil { ... }`, so a real DB/backing-store failure from
ListDownloadedSubtitles was silently swallowed and control fell through
to a generic 404 ("Subtitle track not found") with no server-side signal.
This made genuine internal failures look like an intermittent client-side
"subtitles won't render" bug and left nothing in the logs to diagnose.
On error, log at ERROR (with file_id/track/error, matching the sibling
font-extraction path) and return 500 — mirroring the neighbouring error
handling in the same branch (S3 GetObject -> 502, ConvertToVTT -> 500).
The genuine not-found fall-through is preserved for the case where the
listing succeeds but the requested index is out of range.
Closes #248
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
208 lines
6.7 KiB
Go
208 lines
6.7 KiB
Go
package handlers
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
|
|
"github.com/Silo-Server/silo-server/internal/models"
|
|
"github.com/Silo-Server/silo-server/internal/playback"
|
|
)
|
|
|
|
type hookedSessionManager struct {
|
|
*playback.SessionManager
|
|
beginTransportHook func()
|
|
}
|
|
|
|
type errStreamFileResolver struct {
|
|
err error
|
|
}
|
|
|
|
func (r errStreamFileResolver) GetByID(context.Context, int) (*models.MediaFile, error) {
|
|
return nil, r.err
|
|
}
|
|
|
|
func (m *hookedSessionManager) BeginTransport(sessionID string) error {
|
|
if m.beginTransportHook != nil {
|
|
m.beginTransportHook()
|
|
}
|
|
return m.SessionManager.BeginTransport(sessionID)
|
|
}
|
|
|
|
func TestHandleStream_AbortsSessionWhenDirectPlayFileDisappearsAfterPreflight(t *testing.T) {
|
|
filePath := writePlaybackTestMediaFile(t, "movie.mkv")
|
|
file := &models.MediaFile{
|
|
ID: 42,
|
|
ContentID: "movie-1",
|
|
FilePath: filePath,
|
|
Duration: 3600,
|
|
}
|
|
baseMgr := playback.NewSessionManager(0, 0)
|
|
session, err := baseMgr.StartSession(1, "profile-1", 42, playback.PlayDirect, false)
|
|
if err != nil {
|
|
t.Fatalf("StartSession: %v", err)
|
|
}
|
|
|
|
adminStore := &recordingPlaybackAdminStore{}
|
|
syncer := &recordingSessionSyncer{}
|
|
marker := &recordingMissingMarker{}
|
|
sessionMgr := &hookedSessionManager{
|
|
SessionManager: baseMgr,
|
|
beginTransportHook: func() {
|
|
_ = os.Remove(filePath)
|
|
},
|
|
}
|
|
handler := NewStreamHandler(sessionMgr, testPlaybackFileResolver{file: file})
|
|
handler.AdminStore = adminStore
|
|
handler.SessionSyncer = syncer
|
|
handler.MissingMarker = marker
|
|
|
|
req := httptest.NewRequest(http.MethodGet, "/api/v1/stream/"+session.ID, nil)
|
|
req = req.WithContext(newAuthorizedPlaybackContext())
|
|
req = withPlaybackRouteParam(req, "session_id", session.ID)
|
|
|
|
rr := httptest.NewRecorder()
|
|
handler.HandleStream(rr, req)
|
|
|
|
if rr.Code != http.StatusNotFound {
|
|
t.Fatalf("status = %d, body = %s", rr.Code, rr.Body.String())
|
|
}
|
|
if _, err := baseMgr.GetSession(session.ID); !errors.Is(err, playback.ErrSessionNotFound) {
|
|
t.Fatalf("GetSession error = %v, want %v", err, playback.ErrSessionNotFound)
|
|
}
|
|
if len(marker.ids) != 1 || marker.ids[0] != 42 {
|
|
t.Fatalf("marked ids = %v, want [42]", marker.ids)
|
|
}
|
|
if len(adminStore.deleted) != 1 || adminStore.deleted[0] != session.ID {
|
|
t.Fatalf("deleted sessions = %v, want [%s]", adminStore.deleted, session.ID)
|
|
}
|
|
if len(adminStore.history) != 0 {
|
|
t.Fatalf("history entries = %d, want 0", len(adminStore.history))
|
|
}
|
|
if syncer.calls == 0 {
|
|
t.Fatal("expected session sync after abort")
|
|
}
|
|
}
|
|
|
|
func TestHandleStream_KeepsSessionWhenLookupFailsForNonMissingReason(t *testing.T) {
|
|
baseMgr := playback.NewSessionManager(0, 0)
|
|
session, err := baseMgr.StartSession(1, "profile-1", 42, playback.PlayDirect, false)
|
|
if err != nil {
|
|
t.Fatalf("StartSession: %v", err)
|
|
}
|
|
|
|
adminStore := &recordingPlaybackAdminStore{}
|
|
syncer := &recordingSessionSyncer{}
|
|
handler := NewStreamHandler(baseMgr, errStreamFileResolver{err: errors.New("db unavailable")})
|
|
handler.AdminStore = adminStore
|
|
handler.SessionSyncer = syncer
|
|
|
|
req := httptest.NewRequest(http.MethodGet, "/api/v1/stream/"+session.ID, nil)
|
|
req = req.WithContext(newAuthorizedPlaybackContext())
|
|
req = withPlaybackRouteParam(req, "session_id", session.ID)
|
|
|
|
rr := httptest.NewRecorder()
|
|
handler.HandleStream(rr, req)
|
|
|
|
if rr.Code != http.StatusInternalServerError {
|
|
t.Fatalf("status = %d, body = %s", rr.Code, rr.Body.String())
|
|
}
|
|
if _, err := baseMgr.GetSession(session.ID); err != nil {
|
|
t.Fatalf("GetSession error = %v, want live session", err)
|
|
}
|
|
if len(adminStore.deleted) != 0 {
|
|
t.Fatalf("deleted sessions = %v, want none", adminStore.deleted)
|
|
}
|
|
if syncer.calls != 0 {
|
|
t.Fatalf("sync calls = %d, want 0", syncer.calls)
|
|
}
|
|
}
|
|
|
|
// TestHandleSubtitle_ListDownloadedSubtitlesErrorReturns500 pins the fix for
|
|
// issue #248: a failure listing downloaded subtitles must surface as a 500 with
|
|
// an "internal_error" code, not be swallowed and reported to the client as a
|
|
// generic "Subtitle track not found" 404 (which made a real backing-store
|
|
// failure look like an intermittent client-side subtitle bug).
|
|
func TestHandleSubtitle_ListDownloadedSubtitlesErrorReturns500(t *testing.T) {
|
|
// No external or embedded tracks, so track index 0 falls through to the
|
|
// downloaded-subtitle branch that queries the repository.
|
|
file := &models.MediaFile{
|
|
ID: 42,
|
|
ContentID: "movie-1",
|
|
FilePath: "/tmp/movie.mkv",
|
|
Duration: 3600,
|
|
}
|
|
baseMgr := playback.NewSessionManager(0, 0)
|
|
session, err := baseMgr.StartSession(1, "profile-1", 42, playback.PlayDirect, false)
|
|
if err != nil {
|
|
t.Fatalf("StartSession: %v", err)
|
|
}
|
|
|
|
handler := NewStreamHandler(baseMgr, testPlaybackFileResolver{file: file})
|
|
handler.SubtitleRepo = &handlerMockSubtitleRepo{listErr: errors.New("db unavailable")}
|
|
handler.S3Client = newMockS3ClientForHandler()
|
|
handler.S3Bucket = "test-bucket"
|
|
|
|
req := httptest.NewRequest(http.MethodGet, "/api/v1/stream/"+session.ID+"/subtitles/0.vtt", nil)
|
|
req = req.WithContext(newAuthorizedPlaybackContext())
|
|
routeCtx := chi.NewRouteContext()
|
|
routeCtx.URLParams.Add("session_id", session.ID)
|
|
routeCtx.URLParams.Add("track", "0.vtt")
|
|
req = req.WithContext(context.WithValue(req.Context(), chi.RouteCtxKey, routeCtx))
|
|
|
|
rr := httptest.NewRecorder()
|
|
handler.HandleSubtitle(rr, req)
|
|
|
|
if rr.Code != http.StatusInternalServerError {
|
|
t.Fatalf("status = %d, body = %s", rr.Code, rr.Body.String())
|
|
}
|
|
var body struct {
|
|
Error string `json:"error"`
|
|
}
|
|
if err := json.Unmarshal(rr.Body.Bytes(), &body); err != nil {
|
|
t.Fatalf("decode error body: %v (body = %s)", err, rr.Body.String())
|
|
}
|
|
if body.Error != "internal_error" {
|
|
t.Fatalf("error code = %q, want %q (body = %s)", body.Error, "internal_error", rr.Body.String())
|
|
}
|
|
}
|
|
|
|
func TestHandleTransportStartFailure_KeepsSessionForNonMissingError(t *testing.T) {
|
|
filePath := writePlaybackTestMediaFile(t, "movie.mkv")
|
|
file := &models.MediaFile{
|
|
ID: 42,
|
|
ContentID: "movie-1",
|
|
FilePath: filePath,
|
|
Duration: 3600,
|
|
}
|
|
baseMgr := playback.NewSessionManager(0, 0)
|
|
session, err := baseMgr.StartSession(1, "profile-1", 42, playback.PlayDirect, false)
|
|
if err != nil {
|
|
t.Fatalf("StartSession: %v", err)
|
|
}
|
|
|
|
adminStore := &recordingPlaybackAdminStore{}
|
|
syncer := &recordingSessionSyncer{}
|
|
handler := NewStreamHandler(baseMgr, testPlaybackFileResolver{file: file})
|
|
handler.AdminStore = adminStore
|
|
handler.SessionSyncer = syncer
|
|
|
|
handler.handleTransportStartFailure(context.Background(), session, file, errors.New("ffmpeg unavailable"))
|
|
|
|
if _, err := baseMgr.GetSession(session.ID); err != nil {
|
|
t.Fatalf("GetSession error = %v, want live session", err)
|
|
}
|
|
if len(adminStore.deleted) != 0 {
|
|
t.Fatalf("deleted sessions = %v, want none", adminStore.deleted)
|
|
}
|
|
if syncer.calls != 0 {
|
|
t.Fatalf("sync calls = %d, want 0", syncer.calls)
|
|
}
|
|
}
|