0.2.50

server/internal/api/playback.go

@@ -92,16 +92,20 @@ type playbackReportResponse struct {
 // Emby's own item JSON, forwarded verbatim like every other item the gateway returns, so
 // the client decodes it into the same BaseItem it uses everywhere else.
 type nextEpisodeResponse struct {
-	Item               json.RawMessage    `json:"item"`
-	Title              string             `json:"title"`
-	URL                string             `json:"url"`
-	ResumePositionMs   int64              `json:"resumePositionMs"`
-	Subtitles          []playableSubtitle `json:"subtitles"`
-	SubtitlesEnabled   bool               `json:"subtitlesEnabled"`
-	SelectedSubtitleID string             `json:"selectedSubtitleId,omitempty"`
-	MediaSourceID      string             `json:"mediaSourceId"`
-	PlaySessionID      string             `json:"playSessionId"`
-	PlayMethod         string             `json:"playMethod"`
+	Item                      json.RawMessage    `json:"item"`
+	Title                     string             `json:"title"`
+	URL                       string             `json:"url"`
+	ResumePositionMs          int64              `json:"resumePositionMs"`
+	Subtitles                 []playableSubtitle `json:"subtitles"`
+	SubtitlesEnabled          bool               `json:"subtitlesEnabled"`
+	SelectedSubtitleID        string             `json:"selectedSubtitleId,omitempty"`
+	MediaSourceID             string             `json:"mediaSourceId"`
+	PlaySessionID             string             `json:"playSessionId"`
+	PlayMethod                string             `json:"playMethod"`
+	SubtitleDownloadAvailable bool               `json:"subtitleDownloadAvailable"`
+	TrickplayAvailable        bool               `json:"trickplayAvailable"`
+	SkipIntroAvailable        bool               `json:"skipIntroAvailable"`
+	EndCreditsAvailable       bool               `json:"endCreditsAvailable"`
 }
 
 // handlePlayback resolves what to actually play.
@@ -366,16 +370,20 @@ func (s *Server) handleNextEpisode(w http.ResponseWriter, r *http.Request, sess
 	)
 
 	writeJSON(w, http.StatusOK, nextEpisodeResponse{
-		Item:               raw,
-		Title:              title,
-		URL:                streamURL,
-		ResumePositionMs:   max64(next.UserData.PlaybackPositionTicks/ticksPerMillisecond, 0),
-		Subtitles:          subtitles,
-		SubtitlesEnabled:   subtitlesEnabled,
-		SelectedSubtitleID: selectedSubtitleID,
-		MediaSourceID:      mediaSourceID,
-		PlaySessionID:      playSessionID,
-		PlayMethod:         playMethod,
+		Item:                      raw,
+		Title:                     title,
+		URL:                       streamURL,
+		ResumePositionMs:          max64(next.UserData.PlaybackPositionTicks/ticksPerMillisecond, 0),
+		Subtitles:                 subtitles,
+		SubtitlesEnabled:          subtitlesEnabled,
+		SelectedSubtitleID:        selectedSubtitleID,
+		MediaSourceID:             mediaSourceID,
+		PlaySessionID:             playSessionID,
+		PlayMethod:                playMethod,
+		SubtitleDownloadAvailable: s.subtitleDownloadAvailable(ctx),
+		TrickplayAvailable:        s.trickplayEnabled(ctx),
+		SkipIntroAvailable:        s.skipIntroEnabled(ctx),
+		EndCreditsAvailable:       s.endCreditsEnabled(ctx),
 	})
 }
 
@@ -729,8 +737,15 @@ func (s *Server) handlePlaybackReport(w http.ResponseWriter, r *http.Request, se
 		max64(report.PositionMs, 0)*ticksPerMillisecond, report.IsPaused,
 	)
 	if err != nil {
-		// A dropped progress report is not worth failing playback over; log and accept.
 		log.Warn("playback report failed", "phase", phase, "error", err)
+		// Progress is advisory and another reading follows in ten seconds. A final stop is
+		// different: the television persists it in WorkManager specifically so an outage
+		// cannot lose the final resume position. Returning success here would consume that
+		// durable work and disable its bounded backoff.
+		if phase == "stopped" {
+			s.writeUpstreamError(r.Context(), w, err, "could not report playback stopped")
+			return
+		}
 	}
 
 	// Start and stop are the shape of an evening's viewing and belong in the normal log.