* docs(audiobooks): design spec for plugin absorption Plan to absorb silo-plugin-audiobooks into silo-server as a first-party feature. Audiobooks land in silo's existing SPA; ABS clients connect directly. Hard constraints: reuse existing tables (media_items, media_files, user_watch_progress, user_playback_sessions, people, item_people, library_collections); only two new tables (abs_sessions, podcast_feeds) and at most one column add (media_libraries.kind); silo's main :8080 listener handles ABS Socket.io natively. Out of scope: audiobook requests flow, smart collections, share links, external recommender, custom metadata providers, separate audiobook SPA. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(audiobooks): implementation plan sub-plan 1 (discovery + schema) First of six sub-plans for the absorption. Six tasks: a discovery audit that resolves the spec's Risk questions, four idempotent SQL migrations (abs_sessions, podcast_feeds, media_libraries.kind, audiobooks.enabled feature flag), and an empty-but-compiling internal/audiobooks package scaffolded into cmd/silo. Lands as a strict no-op for users (feature flag defaults to false). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(audiobooks): discovery findings for absorption sub-plan 1 Locks schema/code decisions for migrations 139-142 and downstream sub-plans. Resolves open Risk questions from the absorption design spec. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): migration 139 add abs_sessions table Parallel of jellycompat_sessions for Audiobookshelf-compatible clients. Lets ABS mobile/desktop apps maintain a device-bound session that silo's audiobooks/abs handlers will validate. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * style(audiobooks): match codebase conventions in migration 139 Lowercases type keywords in the abs_sessions CREATE TABLE body to match neighboring migrations, fixes the client_version column alignment, and replaces the misleading "parallel to jellycompat_sessions" header comment with a more accurate description of the table's role. Cosmetic only — the running schema is unchanged. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): migration 140 add podcast_feeds table Side table on media_items for RSS-subscribed podcasts. Holds feed URL, ETag/Last-Modified for conditional fetches, last-refresh timestamp, and the per-feed refresh interval consumed by the upcoming podcastfeed.Refresher scheduled task. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * style(audiobooks): uppercase PRIMARY KEY in migration 140 Aligns with the codebase convention (type keywords lowercase, constraint keywords uppercase) established in migration 139's post-style-fix form. Cosmetic only — running schema is unchanged. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(audiobooks): migration 141 no-op for media_folders.type Sub-plan 1 originally reserved migration 141 to add a 'kind' column to media_libraries discriminating audiobook/podcast libraries. Discovery audit (sub-plan 1 Task 1) found that the actual table is media_folders and it already has a type text NOT NULL column with no CHECK constraint or enum, so 'audiobooks' and 'podcasts' can be added as future values without DDL. Landing this migration as a documented no-op preserves the version numbering audit trail and pins the decision in git history. The matching down migration is also a no-op. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): migration 142 add audiobooks.enabled flag Server-settings row that gates the absorbed audiobooks feature. Defaults to 'false' so sub-plan 1 lands as a strict no-op; subsequent sub-plans branch on this flag and operators flip it to 'true' at cutover. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): scaffold internal/audiobooks package Empty-but-compiling Service that reads the audiobooks.enabled feature flag from server_settings. Wired into cmd/silo so the package is referenced from the binary; no routes mounted, no scheduled tasks registered, no DB writes. Subsequent sub-plans hang scanner branches, ABS handlers, Socket.io, podcast refresher, and SPA pages off this Service. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * style(audiobooks): cosmetic cleanups in scaffolded package Two pre-emptive cleanups flagged by code review before sub-plan 2 copies the patterns: 1. Sort the internal/audiobooks import after internal/adminjob in cmd/silo/main.go (alphabetical). 2. Drop the redundant "audiobooks: " prefix from the Enabled() error wrap; matches how every other top-level service package (watchstate, scanqueue, metadata, etc.) formats errors. No behavior change. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(audiobooks): implementation plan sub-plan 2 (scanner) Second of six sub-plans. 10 tasks: PersonKind constants for Author and Narrator, audio-extension recognizer, library-type helpers, a walkLogicalTree refactor (movieLibrary bool -> typed walkMode), chapter extraction via ffprobe, single-file and multi-file audiobook parsers, scanner write path producing media_items.type='audiobook', and a filesystem podcast parser (RSS deferred to sub-plan 5). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): add Author and Narrator PersonKind constants Discovery audit confirmed item_people.kind is unconstrained smallint with values 1-6 in use. Reserve 7 = Author, 8 = Narrator for audiobook people-links written by the upcoming scanner branches. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): add audio-extension recognizer for scanner Mirrors the existing videoExtensions/SupportsVideoFile pair. Used by upcoming audiobook and podcast scanner branches to filter directory walks. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): library-type recognizers for scanner dispatch isAudiobookLibraryType and isPodcastLibraryType match singular and plural forms case-insensitively, mirroring isMovieLibraryType. Used by upcoming scanner walk branches (Task 4) that filter audio files into audiobook and podcast libraries. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(scanner): replace movieLibrary bool with typed walkMode Lets walkLogicalTree dispatch on multiple library shapes (video, movie, audiobook, podcast) without proliferating boolean flags. Behavior for existing video and movie libraries is unchanged; audiobook and podcast modes will be consumed by the upcoming audiobook.go and podcast.go parsers in later tasks of this sub-plan. walkModeFor() derives the mode from a media_folders.type string; unknown types default to walkModeVideo to preserve prior behavior for any caller still passing a raw type. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): expose ffprobe format tags on ProbeData The audiobook scanner needs format-level tags (title, artist, album, date) for media_items metadata; ffprobe already parses them in ffprobeFormat.Tags but ProbeData previously discarded them. Add FormatTags map[string]string to ProbeData, populate it in convertProbeData via a new normalizeFormatTags helper that lowercases keys and trims values. Adds a fixture audiobook .m4b with embedded chapters (Intro/Outro) and format tags, and a test that verifies ProbeFile() returns both correctly. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): parser for single-file audiobook folders parseAudiobookFolder reads tags + chapters via the existing ProbeFile (now that Task 5 exposes FormatTags on ProbeData) and produces a parsedAudiobook struct. Title falls back from "title" tag to "album"; author from "artist" -> "album_artist" -> "composer"; series from "album" -> "series" -> "mvnm" (Movement Name, used by some MP4 tools). Year parsed from "date" or "year" tags, tolerating ISO dates and parenthesized forms. Single-file case only; multi-file folders (one audio file per chapter) return a placeholder error and arrive in Task 7. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): multi-file audiobook folder support Folders containing N audio files (one per chapter/part) get one parsedAudiobookFile per file; each file's chapter list is synthesized as a single chapter with title = filename stem. Title/author/series/ year come from the first file's tags. Also drops the duplicate pickFirstNonEmpty helper added in Task 6 in favor of the existing firstNonEmpty already in probe.go. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): scanner write path produces audiobook media_items ScanAudiobookFolder walks an audiobooks-typed media folder and treats each immediate subdirectory as one audiobook. For each parsed audiobook it upserts: - one media_items row with type='audiobook' - one media_files row per audio file (with chapters JSONB) - author/narrator links in item_people (kind=7, kind=8) Adds itemRepo and personRepo to the Scanner struct, wired from fileRepo.Pool() in NewScanner — no constructor signature change needed. ScanFolder dispatches to this path when folder.Type='audiobooks', bypassing the per-file movie/TV pipeline because audiobooks are folder-scoped entities. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): filesystem podcast scanner ScanPodcastFolder walks a podcasts-typed media folder, treating each subdirectory as a podcast show and each audio file inside as an episode. Writes media_items.type='podcast' + episodes rows + media_files rows. RSS-subscribed feeds (podcast_feeds table) arrive in sub-plan 5; this task covers filesystem-only ingestion. ScanFolder dispatches to this path when folder.Type='podcasts'. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs(audiobooks): implementation plan sub-plan 5 (podcasts) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): expose audiobooks/podcasts library types in admin UI Adds 'Audiobooks' and 'Podcasts' options to the library-type dropdown in the admin libraries page so operators can flag a folder as an audiobook or podcast library. Extends contentLevelsForType() so the admin UI's downstream filtering treats those types correctly (audiobook -> ['audiobook'], podcasts -> ['podcast', 'podcast_episode']). Backend scanner branches for these types were already wired in sub-plan 2. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(migrations): renumber 139_abs_sessions to 147 for origin/main merge origin/main adds 139_media_requests at the same number our local audiobook branch had used for abs_sessions. Renumber ours to 147 to free up 139 for the upstream migration. The schema_versions row is updated in lockstep on the running database so the migrator sees the abs_sessions migration as already applied at its new version. Migrations 140-146 (podcast feeds, media_folders kind noop, audiobook feature flag, abs playback sessions, podcast episode guid, audiobook series, audiobook title cleanup) stay where they are — they don't collide with anything on origin/main. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(migrations): renumber 140_podcast_feeds to 157 for origin/main merge origin/main added 140_user_permissions at the same version this branch had used for podcast_feeds. Renumber ours to 157 (next free above the collections-unify migration at 156) so 140 is free for the upstream migration. schema_versions on the running database is updated in lockstep so the migrator sees podcast_feeds as already applied at its new version. Same pattern asd59c1cb(renumber 139_abs_sessions to 147 for the prior main merge). Pending migrations after this rename: 132 (downloaded subtitles admin index, main), 140 (user_permissions, main), and 156 (unify_user_collections, this branch). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(migrations): renumber 141_media_folders_kind_noop to 159 for origin/main merge Same shape aseb8f67d(the 140→157 renumber from the previous main merge). origin/main added 141_episode_title_sort_index at the same version this branch had used for media_folders_kind_noop. Renumber ours to 159 (next free above the audiobook_series truncate at 158) so 141 is open for the upstream migration. schema_versions on the running database is updated in lockstep so the migrator sees media_folders_kind_noop as already applied at its new version. Pending migrations on silo-prod after this rename: 141 (episode_title_sort_index, main) and any other newer ones from main that the branch hasn't picked up yet. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(migrations): renumber 142_audiobooks_feature_flag to 160 for origin/main merge Companion to 3c6f062's 141 renumber — origin/main also added 142_episode_catalog_entries (alongside 141_episode_title_sort_index) at a version this branch had used for the audiobooks feature flag. Renumber ours to 160 so 142 is open for the upstream migration; schema_versions on silo-prod is updated in lockstep so the migrator sees audiobooks_feature_flag as already applied at its new version. This was the only remaining collision (verified by checking for duplicate version prefixes across migrations/). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(audiobooks): address foundation review comments * fix(audiobooks): tighten scanner identity handling * fix(audiobooks): propagate scanner cancellation * chore(audiobooks): adopt goose migration layout * docs(audiobooks): implementation plan sub-plan 3 (API + frontend MVP) Third of six sub-plans. 9 tasks: three REST endpoints (list/detail/ progress), TanStack Query hooks + types, three React pages (Library/Detail/Player), and navigation integration. Scoped to MVP — author/series indices, smart collections, share links, and other nice-to-haves from the spec are deferred. Streaming reuses silo's existing /api/v1/stream/{session_id}; no new transcode code. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): list endpoint at GET /api/v1/audiobooks Paginated list of media_items with type='audiobook' scoped to the caller's accessible libraries via the existing access filter. Mirrors silo's existing list-style handlers for movies and series. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): detail endpoint at GET /api/v1/audiobooks/{id} Returns the media_items row, its media_files (with chapters JSONB), author/narrator extracted from item_people (kinds 7/8), and the caller's per-profile listening progress from user_watch_progress. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): progress endpoint at POST /api/v1/audiobooks/{id}/progress UPSERTs user_watch_progress for the caller's (user_id, profile_id, content_id). Body carries position_seconds; clients are expected to post every 5-10s during playback plus on pause/seek (matching silo's existing video progress cadence). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): frontend types and TanStack Query hooks TypeScript types match the JSON shapes from the new /api/v1/audiobooks endpoints (list, detail, progress). Three hooks: useAudiobookLibrary (list), useAudiobook (detail), and useReportAudiobookProgress (mutation that invalidates the detail query on success so progress updates reflect immediately). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): library grid page at /audiobooks Renders a paginated grid of audiobook cards using the useAudiobookLibrary hook. Each card links to /audiobooks/book/{id}. Cards show poster, title, and year; falls back to a "No cover" placeholder when the audiobook has no poster_url. Empty state hints to operators that they need to set a library's type to 'audiobooks'. Routes themselves are wired in Task 8 (navigation integration). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): detail page with chapter list Renders cover, title, author, narrator, year, and overview alongside a chapter list. Clicking a chapter opens an inline sticky AudiobookPlayer at that chapter's start. A "Resume" button restarts playback at the saved progress position if present. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): HTML5 audio player with chapter navigation Single-file audiobook playback for MVP. Multi-file queuing arrives in a follow-up. Streams via the existing /api/v1/direct-download GET endpoint. Position is reported to /api/v1/audiobooks/{id}/progress every 10s while playing plus on pause/seek/end. Skip-30s, playback rate select, chapter list panel. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(audiobooks): wire navigation and routes Adds an Audiobooks entry to the sidebar and registers the two new routes (/audiobooks for the library grid, /audiobooks/book/:id for detail). The player renders inline inside the detail page; no dedicated player route is required for MVP. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(audiobooks): address native API review comments * feat(audiobooks): add ABS compatibility and polish * fix(audiobooks): stabilize ABS playback progress reporting * fix(audiobooks): clean up ABS branch review fixes * chore(audiobooks): adopt goose layout for ABS migrations * fix(audiobooks): align player seek bar props * feat(audiobooks): make libraries first-class catalog items * feat(admin): add server restart endpoint * fix(audiobooks): address review comment findings --------- Co-authored-by: RXWatcher <14085001+RXWatcher@users.noreply.github.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
443 lines
16 KiB
Go
443 lines
16 KiB
Go
package abs
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
)
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Interfaces
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// ProgressStore is the narrow slice of user_watch_progress access the ABS
|
|
// handlers need. Implemented by ABSProgressStore in
|
|
// internal/audiobooks/abs_progress_store.go.
|
|
type ProgressStore interface {
|
|
// GetProgress returns the progress row for (userID, profileID, contentID).
|
|
// Returns (nil, nil) when no row exists (not an error).
|
|
GetProgress(ctx context.Context, userID, profileID, contentID string) (*ProgressRow, error)
|
|
// ListProgressForAudiobooks returns all progress rows for (userID, profileID)
|
|
// that correspond to audiobooks (media_items.type = 'audiobook').
|
|
// Capped at limit rows (most-recently-updated first).
|
|
ListProgressForAudiobooks(ctx context.Context, userID, profileID string, limit int) ([]ProgressRow, error)
|
|
// UpsertProgress writes a progress row. Fields not set in the body
|
|
// (currentTime/duration/isFinished/progress) should be merged by the
|
|
// caller before invoking this.
|
|
UpsertProgress(ctx context.Context, row ProgressRow) error
|
|
// UpdateProgressPosition updates only the position_seconds field for
|
|
// (userID, profileID, contentID). Used by session sync to avoid overwriting
|
|
// is_finished / progress_pct that the user set explicitly.
|
|
UpdateProgressPosition(ctx context.Context, userID, profileID, contentID string, positionSeconds float64) error
|
|
// SetHideFromContinue toggles the hide_from_continue flag on a
|
|
// progress row. Idempotent — succeeds even when no row matches.
|
|
SetHideFromContinue(ctx context.Context, userID, profileID, contentID string, hide bool) error
|
|
// DeleteProgress removes the progress row for (userID, profileID, contentID).
|
|
// Idempotent — succeeds even when no row matches. Used by the ABS
|
|
// "Reset Progress" affordance: DELETE /api/me/progress/{libraryItemId}.
|
|
DeleteProgress(ctx context.Context, userID, profileID, contentID string) error
|
|
}
|
|
|
|
// ABSPlaybackSessionStore tracks the active /abs/api/items/{id}/play sessions
|
|
// for per-session listening-time accounting (migration 143).
|
|
// Implemented by ABSPlaybackSessionStore in
|
|
// internal/audiobooks/abs_playback_session_store.go.
|
|
type ABSPlaybackSessionStore interface {
|
|
// InsertPlaybackSession creates the session row at play-start.
|
|
InsertPlaybackSession(ctx context.Context, sess ABSPlaybackSession) error
|
|
// GetPlaybackSession fetches a session by its ULID. Returns ErrNotFound
|
|
// when absent.
|
|
GetPlaybackSession(ctx context.Context, id string) (ABSPlaybackSession, error)
|
|
// SyncPlaybackSession updates position + accumulated listening time.
|
|
SyncPlaybackSession(ctx context.Context, id string, currentPositionSeconds float64, timeListeningSeconds int) error
|
|
// ClosePlaybackSession sets closed_at to now().
|
|
ClosePlaybackSession(ctx context.Context, id string) error
|
|
// CloseOpenSessionsForPrincipal closes all active sessions for a user
|
|
// profile, used when logout revokes that profile's tokens.
|
|
CloseOpenSessionsForPrincipal(ctx context.Context, userID, profileID string) error
|
|
// AggregateStats returns aggregated listening stats for (user, profile).
|
|
AggregateStats(ctx context.Context, userID, profileID string) (Stats, error)
|
|
// ListClosedSessions returns paginated closed sessions for (user, profile)
|
|
// ordered by started_at DESC. Returns (rows, totalRowCount, error).
|
|
ListClosedSessions(ctx context.Context, userID, profileID string, limit, offset int) ([]ABSPlaybackSession, int, error)
|
|
}
|
|
|
|
// Stats is the aggregated /me/listening-stats response shape.
|
|
type Stats struct {
|
|
TotalTime int // seconds
|
|
Items int // distinct content_ids listened to
|
|
Days []DayStat // recent days (most-recent first)
|
|
DayOfWeek [7]int // index 0 = Sunday
|
|
Monthly []MonthStat
|
|
}
|
|
|
|
type DayStat struct {
|
|
Date string
|
|
Seconds int
|
|
}
|
|
|
|
type MonthStat struct {
|
|
Month string
|
|
Seconds int
|
|
}
|
|
|
|
// ProgressRow is the in-memory representation of a user_watch_progress row
|
|
// as the ABS handlers use it. Intentionally narrow — only the fields the ABS
|
|
// wire format cares about.
|
|
type ProgressRow struct {
|
|
UserID string
|
|
ProfileID string
|
|
ContentID string
|
|
CurrentSeconds float64
|
|
DurationSeconds float64
|
|
ProgressPct float64
|
|
IsFinished bool
|
|
UpdatedAt time.Time
|
|
}
|
|
|
|
// ABSPlaybackSession is the in-memory representation of an abs_playback_sessions row.
|
|
type ABSPlaybackSession struct {
|
|
ID string
|
|
UserID string
|
|
ProfileID string
|
|
ContentID string
|
|
MediaFileID *int
|
|
TimeListeningSeconds int
|
|
CurrentPositionSeconds float64
|
|
StartedAt time.Time
|
|
LastSyncAt time.Time
|
|
ClosedAt *time.Time
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Handlers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// handleGetMyProgress — GET /abs/api/me/progress
|
|
// Lists all progress rows for the caller that belong to audiobooks.
|
|
// The ABS mobile client reads this on startup to seed resume positions.
|
|
func (h *Handler) handleGetMyProgress(w http.ResponseWriter, r *http.Request) {
|
|
a, ok := absAuthFrom(r)
|
|
if !ok || a.UserID == "" {
|
|
http.Error(w, "unauthorized", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
if h.deps.ProgressStore == nil {
|
|
writeJSON(w, http.StatusOK, map[string]any{"mediaProgress": []any{}})
|
|
return
|
|
}
|
|
rows, err := h.deps.ProgressStore.ListProgressForAudiobooks(r.Context(), a.UserID, a.ProfileID, 500)
|
|
if err != nil {
|
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
access, err := h.accessFilterForAuth(r.Context(), a)
|
|
if err != nil {
|
|
http.Error(w, "resolve access: "+err.Error(), http.StatusForbidden)
|
|
return
|
|
}
|
|
out := make([]map[string]any, 0, len(rows))
|
|
for _, p := range rows {
|
|
item, err := h.deps.MediaStore.GetAudiobookByID(r.Context(), p.ContentID, access)
|
|
if err != nil || item == nil {
|
|
continue
|
|
}
|
|
out = append(out, progressRowToABS(p))
|
|
}
|
|
writeJSON(w, http.StatusOK, map[string]any{"mediaProgress": out})
|
|
}
|
|
|
|
// handleGetItemProgress — GET /abs/api/me/progress/{libraryItemId}
|
|
// Returns the progress row for one item. 404 when no progress exists.
|
|
func (h *Handler) handleGetItemProgress(w http.ResponseWriter, r *http.Request) {
|
|
a, ok := absAuthFrom(r)
|
|
if !ok || a.UserID == "" {
|
|
http.Error(w, "unauthorized", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
contentID := chi.URLParam(r, "libraryItemId")
|
|
if h.deps.ProgressStore == nil {
|
|
http.Error(w, "progress not found", http.StatusNotFound)
|
|
return
|
|
}
|
|
access, err := h.accessFilterForAuth(r.Context(), a)
|
|
if err != nil {
|
|
http.Error(w, "resolve access: "+err.Error(), http.StatusForbidden)
|
|
return
|
|
}
|
|
item, err := h.deps.MediaStore.GetAudiobookByID(r.Context(), contentID, access)
|
|
if err != nil || item == nil {
|
|
http.Error(w, "progress not found", http.StatusNotFound)
|
|
return
|
|
}
|
|
p, err := h.deps.ProgressStore.GetProgress(r.Context(), a.UserID, a.ProfileID, contentID)
|
|
if err != nil {
|
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
if p == nil {
|
|
http.Error(w, "progress not found", http.StatusNotFound)
|
|
return
|
|
}
|
|
writeJSON(w, http.StatusOK, progressRowToABS(*p))
|
|
}
|
|
|
|
// progressBody is the JSON body for POST/PATCH /api/me/progress/{libraryItemId}.
|
|
// All fields are optional — only present fields update the row (PATCH semantics).
|
|
//
|
|
// EbookProgress / EbookLocation are emitted by the ABS clients (AudioBooth's
|
|
// BooksService writes them on every page turn). silo's audiobook-first catalog
|
|
// doesn't yet persist ebook position; the fields are accepted-and-ignored so
|
|
// the client write succeeds and the user isn't shown a sync error. They will
|
|
// flow into a dedicated ebook progress column when the ebook scanner lands.
|
|
type progressBody struct {
|
|
CurrentTime *float64 `json:"currentTime"`
|
|
Duration *float64 `json:"duration"`
|
|
IsFinished *bool `json:"isFinished"`
|
|
Progress *float64 `json:"progress"`
|
|
EbookProgress *float64 `json:"ebookProgress"`
|
|
EbookLocation *string `json:"ebookLocation"`
|
|
}
|
|
|
|
// handleSetItemProgress — POST /abs/api/me/progress/{libraryItemId}
|
|
// UPSERTs the progress row. Merges body fields over any existing row so a
|
|
// partial body (only currentTime) doesn't reset duration/isFinished.
|
|
//
|
|
// This matches sub-plan 3's HandleReportAudiobookProgress in intent but uses
|
|
// the ABS wire format and calls ProgressStore directly so the two code paths
|
|
// don't need a shared helper — their thresholds/semantics differ enough that
|
|
// keeping them separate is cleaner.
|
|
func (h *Handler) handleSetItemProgress(w http.ResponseWriter, r *http.Request) {
|
|
a, ok := absAuthFrom(r)
|
|
if !ok || a.UserID == "" {
|
|
http.Error(w, "unauthorized", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
contentID := chi.URLParam(r, "libraryItemId")
|
|
var body progressBody
|
|
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
|
http.Error(w, "invalid body", http.StatusBadRequest)
|
|
return
|
|
}
|
|
if h.deps.ProgressStore == nil {
|
|
http.Error(w, "progress store unavailable", http.StatusServiceUnavailable)
|
|
return
|
|
}
|
|
access, err := h.accessFilterForAuth(r.Context(), a)
|
|
if err != nil {
|
|
http.Error(w, "resolve access: "+err.Error(), http.StatusForbidden)
|
|
return
|
|
}
|
|
item, err := h.deps.MediaStore.GetAudiobookByID(r.Context(), contentID, access)
|
|
if err != nil || item == nil {
|
|
http.Error(w, "item not found", http.StatusNotFound)
|
|
return
|
|
}
|
|
|
|
// Read existing row to merge (PATCH semantics).
|
|
var cur ProgressRow
|
|
if existing, err := h.deps.ProgressStore.GetProgress(r.Context(), a.UserID, a.ProfileID, contentID); err == nil && existing != nil {
|
|
cur = *existing
|
|
}
|
|
|
|
next := ProgressRow{
|
|
UserID: a.UserID,
|
|
ProfileID: a.ProfileID,
|
|
ContentID: contentID,
|
|
CurrentSeconds: cur.CurrentSeconds,
|
|
DurationSeconds: cur.DurationSeconds,
|
|
ProgressPct: cur.ProgressPct,
|
|
IsFinished: cur.IsFinished,
|
|
UpdatedAt: time.Now(),
|
|
}
|
|
if body.CurrentTime != nil {
|
|
next.CurrentSeconds = *body.CurrentTime
|
|
}
|
|
if body.Duration != nil {
|
|
next.DurationSeconds = *body.Duration
|
|
}
|
|
if body.Progress != nil {
|
|
next.ProgressPct = *body.Progress
|
|
}
|
|
if body.IsFinished != nil {
|
|
next.IsFinished = *body.IsFinished
|
|
}
|
|
if err := h.deps.ProgressStore.UpsertProgress(r.Context(), next); err != nil {
|
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
updated, err := h.deps.ProgressStore.GetProgress(r.Context(), a.UserID, a.ProfileID, contentID)
|
|
if err != nil || updated == nil {
|
|
// Best-effort: return the in-memory merged row rather than failing.
|
|
h.publish(a.UserID, "user_item_progress_updated", map[string]any{"data": progressRowToABS(next)})
|
|
writeJSON(w, http.StatusOK, progressRowToABS(next))
|
|
return
|
|
}
|
|
payload := progressRowToABS(*updated)
|
|
h.publish(a.UserID, "user_item_progress_updated", map[string]any{"data": payload})
|
|
writeJSON(w, http.StatusOK, payload)
|
|
}
|
|
|
|
// syncPayload is the JSON body for PATCH /abs/api/session/{sid}/sync.
|
|
type syncPayload struct {
|
|
CurrentTime float64 `json:"currentTime"`
|
|
// Accept both spellings: real ABS clients send "timeListening"; an older
|
|
// silo-plugin draft used "timeListened". UnmarshalJSON merges them.
|
|
TimeListening float64 `json:"timeListening"`
|
|
TimeListened float64 `json:"timeListened"`
|
|
}
|
|
|
|
// timeDelta returns the accumulated listening time from whichever spelling
|
|
// the client used. Both fields are tried; non-zero wins.
|
|
func (p syncPayload) timeDelta() float64 {
|
|
if p.TimeListening != 0 {
|
|
return p.TimeListening
|
|
}
|
|
return p.TimeListened
|
|
}
|
|
|
|
// handleSessionSync — PATCH /abs/api/session/{sid}/sync
|
|
// Heartbeat endpoint the ABS mobile client calls every ~10 s during playback.
|
|
// Updates current position in user_watch_progress and accumulates
|
|
// time_listening_seconds in abs_playback_sessions.
|
|
//
|
|
// IDOR guard: the session must belong to the calling user (404 otherwise
|
|
// so session existence isn't leaked to other users).
|
|
//
|
|
// Uses UpdateProgressPosition (not UpsertProgress) to avoid overwriting
|
|
// is_finished / progress_pct that the user set explicitly — a sync tick
|
|
// that arrives after the user marks a book finished must not un-finish it.
|
|
func (h *Handler) handleSessionSync(w http.ResponseWriter, r *http.Request) {
|
|
a, ok := absAuthFrom(r)
|
|
if !ok {
|
|
http.Error(w, "unauthorized", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
sid := chi.URLParam(r, "sid")
|
|
var p syncPayload
|
|
if err := json.NewDecoder(r.Body).Decode(&p); err != nil {
|
|
http.Error(w, "invalid body", http.StatusBadRequest)
|
|
return
|
|
}
|
|
if h.deps.PlaybackSessionStore == nil {
|
|
// No session store wired yet — accept the sync but return success
|
|
// rather than blocking the player.
|
|
writeJSON(w, http.StatusOK, map[string]any{"ok": true})
|
|
return
|
|
}
|
|
|
|
// Ownership gate.
|
|
sess, err := h.deps.PlaybackSessionStore.GetPlaybackSession(r.Context(), sid)
|
|
if err != nil || !sameABSPrincipal(a, sess.UserID, sess.ProfileID) {
|
|
http.Error(w, "session not found", http.StatusNotFound)
|
|
return
|
|
}
|
|
access, err := h.accessFilterForAuth(r.Context(), a)
|
|
if err != nil {
|
|
http.Error(w, "resolve access: "+err.Error(), http.StatusForbidden)
|
|
return
|
|
}
|
|
item, err := h.deps.MediaStore.GetAudiobookByID(r.Context(), sess.ContentID, access)
|
|
if err != nil || item == nil {
|
|
http.Error(w, "session not found", http.StatusNotFound)
|
|
return
|
|
}
|
|
|
|
// Accumulate listening time and update position in abs_playback_sessions.
|
|
if err := h.deps.PlaybackSessionStore.SyncPlaybackSession(
|
|
r.Context(), sid, p.CurrentTime, int(p.timeDelta()),
|
|
); err != nil {
|
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
// Update position in user_watch_progress. Must NOT be a full upsert —
|
|
// see comment in handleSetItemProgress re: not overwriting is_finished.
|
|
if h.deps.ProgressStore != nil {
|
|
_ = h.deps.ProgressStore.UpdateProgressPosition(
|
|
r.Context(), a.UserID, a.ProfileID, sess.ContentID, p.CurrentTime,
|
|
)
|
|
}
|
|
|
|
// Realtime push to other connected clients.
|
|
h.publish(a.UserID, "user_item_progress_updated", map[string]any{
|
|
"data": map[string]any{
|
|
"libraryItemId": sess.ContentID,
|
|
"currentTime": p.CurrentTime,
|
|
"sessionId": sid,
|
|
},
|
|
})
|
|
h.publish(a.UserID, "user_session_updated", map[string]any{
|
|
"id": sid,
|
|
"libraryItemId": sess.ContentID,
|
|
"currentTime": p.CurrentTime,
|
|
"timeListening": p.timeDelta(),
|
|
})
|
|
writeJSON(w, http.StatusOK, map[string]any{"ok": true})
|
|
}
|
|
|
|
// handleSessionClose — POST /abs/api/session/{sid}/close
|
|
// Finalises a play session. Sets closed_at on the abs_playback_sessions row.
|
|
// Only the owning user may close their session (IDOR guard).
|
|
func (h *Handler) handleSessionClose(w http.ResponseWriter, r *http.Request) {
|
|
a, ok := absAuthFrom(r)
|
|
if !ok {
|
|
http.Error(w, "unauthorized", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
sid := chi.URLParam(r, "sid")
|
|
if h.deps.PlaybackSessionStore == nil {
|
|
// No store wired — accept close gracefully.
|
|
w.WriteHeader(http.StatusNoContent)
|
|
return
|
|
}
|
|
|
|
// Ownership gate.
|
|
sess, err := h.deps.PlaybackSessionStore.GetPlaybackSession(r.Context(), sid)
|
|
if err != nil || !sameABSPrincipal(a, sess.UserID, sess.ProfileID) {
|
|
http.Error(w, "session not found", http.StatusNotFound)
|
|
return
|
|
}
|
|
|
|
if err := h.deps.PlaybackSessionStore.ClosePlaybackSession(r.Context(), sid); err != nil {
|
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
h.publish(a.UserID, "user_session_closed", map[string]any{
|
|
"id": sid,
|
|
"libraryItemId": sess.ContentID,
|
|
})
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Serialisation helpers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// progressRowToABS shapes a ProgressRow into the ABS /me/progress wire format.
|
|
// The `id` field uses the real-ABS convention of "<userID>-<libraryItemId>".
|
|
func progressRowToABS(p ProgressRow) map[string]any {
|
|
lastMs := p.UpdatedAt.UnixMilli()
|
|
out := map[string]any{
|
|
"id": p.UserID + "-" + p.ContentID,
|
|
"libraryItemId": p.ContentID,
|
|
"mediaItemId": p.ContentID,
|
|
"currentTime": p.CurrentSeconds,
|
|
"duration": p.DurationSeconds,
|
|
"isFinished": p.IsFinished,
|
|
"progress": p.ProgressPct,
|
|
"startedAt": lastMs,
|
|
"finishedAt": nil,
|
|
"lastUpdate": lastMs,
|
|
}
|
|
if p.IsFinished {
|
|
out["finishedAt"] = lastMs
|
|
}
|
|
return out
|
|
}
|