* 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>
751 lines
33 KiB
Go
751 lines
33 KiB
Go
// Package abs implements the Audiobookshelf-mobile-app compatibility surface.
|
|
// It mints self-contained JWTs signed with a per-deployment secret and serves
|
|
// the /abs/api/* and /abs/public/* routes, as well as the canonical
|
|
// root-level paths real ABS clients build against (e.g. /login, /api/items).
|
|
//
|
|
// Stage 1 lands the package skeleton: Handler struct, interface stubs for
|
|
// silo-side dependencies, and an empty Mount() method. Real route handlers
|
|
// are added in subsequent stages (auth, file serving, progress, browse).
|
|
package abs
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"log/slog"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
|
|
"github.com/Silo-Server/silo-server/internal/catalog"
|
|
"github.com/Silo-Server/silo-server/internal/models"
|
|
)
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Dependency interfaces
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// AudiobookLibrary is the narrow library view the ABS handlers expose.
|
|
// The production adapter (Stage 7) builds these from media_folders WHERE
|
|
// type = 'audiobooks'.
|
|
type AudiobookLibrary struct {
|
|
ID int64
|
|
Name string
|
|
Type string // always "audiobooks" for this surface
|
|
}
|
|
|
|
// MediaStore is the slice of silo's catalog the ABS handler reads.
|
|
// Real impl: catalog.ItemRepository + scanner.FileRepository wrapped in
|
|
// a small adapter struct added in a later stage.
|
|
type MediaStore interface {
|
|
GetAudiobookByID(ctx context.Context, contentID string, access catalog.AccessFilter) (*models.MediaItem, error)
|
|
// ListAudiobooks returns a page of audiobooks. When libraryID is non-zero
|
|
// it filters to items in that media_folder; 0 means all audiobook items.
|
|
ListAudiobooks(ctx context.Context, libraryID int64, limit, offset int, access catalog.AccessFilter) ([]*models.MediaItem, int, error)
|
|
GetMediaFiles(ctx context.Context, contentID string, access catalog.AccessFilter) ([]*models.MediaFile, error)
|
|
// GetMediaFileByID fetches a single media file by its integer PK.
|
|
// Used by the ABS file-streaming handler when a caller supplies a
|
|
// raw file ID instead of an ino.
|
|
GetMediaFileByID(ctx context.Context, fileID int) (*models.MediaFile, error)
|
|
// ListAudiobookLibraries returns media_folder rows with type='audiobooks'.
|
|
ListAudiobookLibraries(ctx context.Context, access catalog.AccessFilter) ([]AudiobookLibrary, error)
|
|
// SearchAudiobooks does a fuzzy title/author/narrator match for the ABS
|
|
// /libraries/{id}/search endpoint. Hydrates People so the mapper has
|
|
// author/narrator names.
|
|
SearchAudiobooks(ctx context.Context, libraryID int64, query string, limit int, access catalog.AccessFilter) ([]*models.MediaItem, error)
|
|
// ListContinueListening returns books that the given user has progress
|
|
// on but hasn't finished — feeds the Home tab's continue shelf.
|
|
ListContinueListening(ctx context.Context, userID, profileID string, libraryID int64, limit int, access catalog.AccessFilter) ([]*models.MediaItem, error)
|
|
// ListRecentlyAdded returns the most recently added audiobooks for the
|
|
// Home tab's recently-added shelf.
|
|
ListRecentlyAdded(ctx context.Context, libraryID int64, limit int, access catalog.AccessFilter) ([]*models.MediaItem, error)
|
|
// ListDiscover returns a randomized sampling of audiobooks for the
|
|
// Home tab's discover shelf (helps new users browse the library).
|
|
ListDiscover(ctx context.Context, libraryID int64, limit int, access catalog.AccessFilter) ([]*models.MediaItem, error)
|
|
// ListLibraryAuthors returns distinct authors of audiobooks in the
|
|
// library along with each author's book count.
|
|
ListLibraryAuthors(ctx context.Context, libraryID int64, limit int, access catalog.AccessFilter) ([]AuthorSummary, error)
|
|
// ListLibrarySeries returns distinct series (from audiobook_series)
|
|
// represented in the library, ordered by name.
|
|
ListLibrarySeries(ctx context.Context, libraryID int64, limit int, access catalog.AccessFilter) ([]SeriesSummary, error)
|
|
// GetAuthorByID returns the author with the given people.id plus
|
|
// their audiobook list, sorted by title. Returns ErrNotFound when
|
|
// no people row matches.
|
|
GetAuthorByID(ctx context.Context, authorID string, access catalog.AccessFilter) (Author, error)
|
|
// GetSeriesByName returns the canonical series (case-insensitive
|
|
// match on audiobook_series.series_name) with its books ordered
|
|
// by series_index ASC (NULLS LAST), title fallback. Returns
|
|
// ErrNotFound when no rows match.
|
|
GetSeriesByName(ctx context.Context, seriesName string, access catalog.AccessFilter) (Series, error)
|
|
}
|
|
|
|
// AuthorSummary is an aggregated author entry for /libraries/{id}/authors.
|
|
type AuthorSummary struct {
|
|
ID string
|
|
Name string
|
|
NumBooks int
|
|
}
|
|
|
|
// SeriesSummary is an aggregated series entry for /libraries/{id}/series.
|
|
//
|
|
// Books carries up to ~4 cover-preview entries for the LazySeriesCard
|
|
// GroupCover stack — the ABS mobile client reads
|
|
// `series.books[i].media.coverPath` to render each cover, and a card
|
|
// with no books renders only the series name as a fallback.
|
|
type SeriesSummary struct {
|
|
ID string
|
|
Name string
|
|
NumBooks int
|
|
Books []SeriesBookPreview
|
|
}
|
|
|
|
// SeriesBookPreview is a single book id+title pair returned alongside
|
|
// each SeriesSummary. The /libraries/{id}/series handler expands these
|
|
// into full minified LibraryItem entries (with cover URLs) on the wire.
|
|
type SeriesBookPreview struct {
|
|
ContentID string
|
|
Title string
|
|
UpdatedAt time.Time
|
|
}
|
|
|
|
// Author is the detail-shape author with embedded books list.
|
|
type Author struct {
|
|
ID string
|
|
Name string
|
|
PosterPath string // resolved via CoverResolver on emit
|
|
Books []*models.MediaItem
|
|
}
|
|
|
|
// Series is the detail-shape series with books ordered by series_index.
|
|
type Series struct {
|
|
ID string // lowercased series_name
|
|
Name string // canonical series_name
|
|
Books []*models.MediaItem
|
|
}
|
|
|
|
// TokenStore persists and validates the ABS JWT JTIs that back the
|
|
// revocable-token surface (login, refresh, logout, bearerAuth).
|
|
// Real impl: a thin repo over the abs_tokens table added in Stage 2.
|
|
type TokenStore interface {
|
|
// InsertToken persists a newly minted JTI.
|
|
InsertToken(ctx context.Context, tok ABSToken) error
|
|
// GetTokenByJTI looks up a token by its JTI; returns ErrNotFound if absent.
|
|
GetTokenByJTI(ctx context.Context, jti string) (ABSToken, error)
|
|
// RevokeTokenByJTI marks a JTI as revoked (sets revoked_at).
|
|
RevokeTokenByJTI(ctx context.Context, jti string) error
|
|
// RevokeTokenIfActive atomically marks an unrevoked token as revoked and
|
|
// returns its previous row. Returns ErrNotFound when the token is absent or
|
|
// was already revoked.
|
|
RevokeTokenIfActive(ctx context.Context, jti string) (ABSToken, error)
|
|
// RevokeTokensForPrincipal revokes every active access/refresh token for a
|
|
// user profile. Logout uses this to invalidate refresh tokens as well as the
|
|
// presented access token.
|
|
RevokeTokensForPrincipal(ctx context.Context, userID, profileID string) error
|
|
// TouchToken extends last_seen_at for active-session bookkeeping.
|
|
TouchToken(ctx context.Context, jti string) error
|
|
}
|
|
|
|
// ABSToken is the in-memory representation of a persisted JTI row.
|
|
type ABSToken struct {
|
|
ID string
|
|
UserID string
|
|
ProfileID string
|
|
Type string
|
|
JTI string
|
|
ExpiresAt time.Time
|
|
RevokedAt *time.Time
|
|
}
|
|
|
|
// ProfileCredentialValidator validates a (username, password) pair against
|
|
// silo's auth backend. Implemented by an adapter over internal/auth in a
|
|
// later stage.
|
|
type ProfileCredentialValidator interface {
|
|
Validate(ctx context.Context, username, password string) (userID string, profileID string, displayName string, err error)
|
|
}
|
|
|
|
// AccessResolver resolves the ABS-authenticated user/profile into the same
|
|
// effective catalog access filter used by silo's native API.
|
|
type AccessResolver interface {
|
|
ResolveABSAccess(ctx context.Context, userID, profileID string) (catalog.AccessFilter, error)
|
|
}
|
|
|
|
// EventPublisher delivers a realtime event to Socket.io clients. May be nil;
|
|
// handlers guard with publish/broadcast nil-safe wrappers.
|
|
type EventPublisher interface {
|
|
Publish(userID, event string, payload any)
|
|
Broadcast(event string, payload any)
|
|
}
|
|
|
|
// SocketIOServer exposes the Socket.io HTTP handler. The concrete
|
|
// implementation lives in internal/audiobooks/abssocket. Keeping the
|
|
// interface here avoids a circular import: handler.go uses it, abssocket
|
|
// imports abs for ParseToken/EventPublisher, and the wiring is done by the
|
|
// caller (service.go or main.go) that imports both packages.
|
|
type SocketIOServer interface {
|
|
Handler() http.Handler
|
|
}
|
|
|
|
// Recommender powers /items/{id}/similar. nil → route returns an empty list.
|
|
type Recommender interface {
|
|
Similar(ctx context.Context, contentID string, limit int) ([]string, error)
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Config provider
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// ConfigProvider supplies runtime config values the ABS handler needs.
|
|
// Keeps the handler decoupled from any particular settings-store shape.
|
|
type ConfigProvider interface {
|
|
// JWTSecret returns the HMAC-SHA256 signing secret for ABS JWTs.
|
|
JWTSecret(ctx context.Context) ([]byte, error)
|
|
// AccessTTL / RefreshTTL are the default token lifetimes; zero means
|
|
// "use built-in default (24 h / 30 d)".
|
|
AccessTTL(ctx context.Context) (time.Duration, error)
|
|
RefreshTTL(ctx context.Context) (time.Duration, error)
|
|
// StandaloneLoginEnabled reports whether body-creds login is permitted
|
|
// (i.e., operator has not disabled it in settings).
|
|
StandaloneLoginEnabled(ctx context.Context) (bool, error)
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Dependencies + Handler
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// Dependencies bundles everything the Handler needs at construction time.
|
|
type Dependencies struct {
|
|
MediaStore MediaStore
|
|
TokenStore TokenStore
|
|
CredValidator ProfileCredentialValidator
|
|
AccessResolver AccessResolver
|
|
Config ConfigProvider
|
|
Publisher EventPublisher // may be nil
|
|
Recommender Recommender // may be nil
|
|
LoginLimiter *LoginLimiter // may be nil — one is created if absent
|
|
// InstallID returns the current plugin install ID for building
|
|
// host-proxy-routable URLs. Defaults to "silo.audiobooks" when nil.
|
|
InstallID func() string
|
|
// ProgressStore provides access to user_watch_progress for ABS
|
|
// progress endpoints. May be nil; handlers degrade gracefully.
|
|
ProgressStore ProgressStore
|
|
// PlaybackSessionStore persists abs_playback_sessions rows
|
|
// (migration 143) for /session/{sid}/sync and /session/{sid}/close.
|
|
// May be nil; handlers degrade gracefully.
|
|
PlaybackSessionStore ABSPlaybackSessionStore
|
|
// BookmarkStore persists ABS bookmark rows (migration 148) for the
|
|
// POST/PATCH/DELETE /me/item/{itemId}/bookmark endpoints. May be
|
|
// nil; handlers respond 503 when unset.
|
|
BookmarkStore BookmarkStore
|
|
// CollectionStore persists ABS user-collection rows (migrations 149 + 150).
|
|
// May be nil; handlers respond 503 when unset.
|
|
CollectionStore CollectionStore
|
|
// PlaylistStore persists ABS playlist rows (migrations 151 + 152).
|
|
// May be nil; handlers respond 503 when unset.
|
|
PlaylistStore PlaylistStore
|
|
// SmartCollectionStore persists user_personal_collections rows with
|
|
// collection_type='smart' (migration 156 unified the old
|
|
// abs_smart_collections table into the canonical store).
|
|
// May be nil; handlers respond 503 when unset.
|
|
SmartCollectionStore SmartCollectionStore
|
|
// RSSFeedStore persists abs_rss_feeds rows (migration 155).
|
|
// May be nil; handlers respond 503 when unset.
|
|
RSSFeedStore RSSFeedStore
|
|
// SocketIO is the Socket.io server mounted at /abs/socket.io/. May be nil;
|
|
// the route is only registered when a non-nil value is supplied.
|
|
SocketIO SocketIOServer
|
|
// CoverResolver translates a raw silo poster path (e.g.
|
|
// "local/audiobooks/.../original.webp") into a fully-qualified URL
|
|
// the ABS client can fetch. Optional; when nil, /api/items/{id}/cover
|
|
// 404s rather than redirecting to an unreachable relative path.
|
|
CoverResolver func(ctx context.Context, path, variant string) string
|
|
}
|
|
|
|
// Handler wires the /abs/api/* and canonical ABS-client paths.
|
|
type Handler struct {
|
|
deps Dependencies
|
|
}
|
|
|
|
// New constructs an ABS Handler. Sensible defaults are applied for optional
|
|
// fields (LoginLimiter, InstallID).
|
|
//
|
|
// MediaStore is required: many handlers (libraries, items, me, play) deref
|
|
// it unconditionally on the request hot path, and a nil store would panic
|
|
// the first time a real request hits them. Fail fast at construction so
|
|
// misconfigured deployments break at startup rather than silently passing
|
|
// /login and crashing on the next request.
|
|
func New(deps Dependencies) *Handler {
|
|
if deps.MediaStore == nil {
|
|
panic("abs.New: MediaStore is required")
|
|
}
|
|
if deps.LoginLimiter == nil {
|
|
deps.LoginLimiter = NewLoginLimiter()
|
|
}
|
|
if deps.InstallID == nil {
|
|
deps.InstallID = func() string { return "silo.audiobooks" }
|
|
}
|
|
return &Handler{deps: deps}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Mount
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// Mount registers the ABS-compatible routes on r. Stage 1 registers an empty
|
|
// /abs group with the access-log middleware attached; subsequent stages add
|
|
// real route handlers.
|
|
//
|
|
// The dual-mount design (routes at both /abs/api/* and /* roots) is preserved
|
|
// here so stage-by-stage handlers land in the right places without needing to
|
|
// revisit Mount later.
|
|
func (h *Handler) Mount(parent chi.Router) {
|
|
parent.Group(func(r chi.Router) {
|
|
r.Use(h.accessLog)
|
|
h.mountRoutes(r)
|
|
})
|
|
}
|
|
|
|
func (h *Handler) mountRoutes(r chi.Router) {
|
|
// Discovery + auth endpoints: real ABS exposes these at server ROOT
|
|
// (no /api or /abs/api prefix). Mobile clients do `${addr}/ping`,
|
|
// `${addr}/login`, etc. Designed to be mounted on a dedicated listener
|
|
// so the routes don't collide with silo's SPA catch-all.
|
|
for _, prefix := range []string{"", "/abs/api"} {
|
|
r.Get(prefix+"/ping", h.handleABSPing)
|
|
r.Get(prefix+"/healthcheck", h.handleABSPing) // same body as /ping
|
|
r.Get(prefix+"/init", h.handleABSInit)
|
|
r.Get(prefix+"/status", h.handleABSStatus)
|
|
}
|
|
|
|
// Stage 2: login (body credentials).
|
|
r.Post("/login", h.handleLogin)
|
|
r.Post("/abs/api/login", h.handleLogin)
|
|
// Token rotation — mobile clients call this every ~22h to avoid the
|
|
// 24h access-token interactive re-login trap.
|
|
r.Post("/auth/refresh", h.handleRefresh)
|
|
r.Post("/abs/api/auth/refresh", h.handleRefresh)
|
|
// Logout is mounted OUTSIDE bearerAuth so an expired-access client can
|
|
// still sign out (the primary "sign out" UX moment). The handler parses
|
|
// the bearer locally, revokes the JTI if parseable, and always returns
|
|
// 204 — matches the canonical continuum-plugin behavior.
|
|
r.Post("/logout", h.handleLogout)
|
|
r.Post("/api/logout", h.handleLogout)
|
|
r.Post("/abs/api/logout", h.handleLogout)
|
|
r.Post("/abs/api/auth/logout", h.handleLogout) // legacy path
|
|
|
|
// Unauthenticated cover + author-image routes. Real ABS serves covers
|
|
// without auth (getDoesServerImagesRequireToken returns false for our
|
|
// version), so mounting these outside bearerAuth avoids 401s.
|
|
for _, prefix := range []string{"/abs/api", "/api"} {
|
|
r.Get(prefix+"/items/{id}/cover", h.handleItemCover)
|
|
r.Get(prefix+"/authors/{id}/image", h.handleAuthorImage)
|
|
}
|
|
|
|
// Session-scoped audio streaming (ABS v2.22.0+ DirectPlay). The Android
|
|
// and iOS clients call this WITHOUT a bearer token — the session ID is
|
|
// the capability. Mounted at both /public/session and /abs/public/session
|
|
// for compatibility with clients that pin either prefix.
|
|
for _, prefix := range []string{"", "/abs"} {
|
|
r.Get(prefix+"/public/session/{sid}/track/{idx}", h.handlePublicTrack)
|
|
r.Head(prefix+"/public/session/{sid}/track/{idx}", h.handlePublicTrack)
|
|
}
|
|
|
|
// Public RSS feed routes — slug is the capability token, no auth.
|
|
r.Get("/feed/{slug}.xml", h.handlePublicFeed)
|
|
r.Get("/feed/{slug}", h.handlePublicFeed)
|
|
r.Get("/feed/{slug}/file/{ino}", h.handlePublicFeedFile)
|
|
|
|
// Server discovery — unauthenticated. Mounted at both /api and the
|
|
// canonical root so curl-style network probes, the official ABS app's
|
|
// connect-server flow, and AudioBooth's saved-server liveness check
|
|
// all land on the same response.
|
|
for _, prefix := range []string{"/abs", "/api"} {
|
|
r.Get(prefix+"/ping", h.handlePing)
|
|
r.Get(prefix+"/healthcheck", h.handleHealthcheck)
|
|
r.Get(prefix+"/init", h.handleInit)
|
|
r.Get(prefix+"/auth-settings", h.handleAuthSettings)
|
|
}
|
|
|
|
// Stage 3: playback session + file routes, registered under both the
|
|
// legacy /abs/api prefix and the canonical /api prefix that the official
|
|
// ABS mobile client builds against (no /abs prefix at server root).
|
|
r.Group(func(r chi.Router) {
|
|
r.Use(h.bearerAuth)
|
|
for _, prefix := range []string{"/abs/api", "/api"} {
|
|
// POST /api/items/{libraryItemId}/play — start a play session,
|
|
// get back a stream URL + ABS-shaped manifest.
|
|
r.Post(prefix+"/items/{libraryItemId}/play", h.handlePlayStart)
|
|
|
|
// GET /api/items/{libraryItemId}/file/{ino} — stream a specific audio file.
|
|
// /download variant is the same handler; Content-Disposition is set when
|
|
// the path ends in /download.
|
|
r.Get(prefix+"/items/{libraryItemId}/file/{ino}", h.handleFileStream)
|
|
r.Get(prefix+"/items/{libraryItemId}/file/{ino}/download", h.handleFileStream)
|
|
}
|
|
})
|
|
|
|
// Stage 4: progress + session tracking — requires bearerAuth.
|
|
r.Group(func(r chi.Router) {
|
|
r.Use(h.bearerAuth)
|
|
for _, prefix := range []string{"/abs/api", "/api"} {
|
|
// GET /me/progress — all audiobook progress for the caller
|
|
r.Get(prefix+"/me/progress", h.handleGetMyProgress)
|
|
// GET /me/progress/{id} — progress for one item
|
|
r.Get(prefix+"/me/progress/{libraryItemId}", h.handleGetItemProgress)
|
|
// POST /me/progress/{id} — set / update progress (ABS PATCH semantics)
|
|
r.Post(prefix+"/me/progress/{libraryItemId}", h.handleSetItemProgress)
|
|
// PATCH alias — AudioBooth and the canonical ABS server use
|
|
// PATCH for the same write; route both methods to the handler.
|
|
r.Patch(prefix+"/me/progress/{libraryItemId}", h.handleSetItemProgress)
|
|
// DELETE /me/progress/{id} — clear progress (Reset Progress)
|
|
r.Delete(prefix+"/me/progress/{libraryItemId}", h.handleDeleteItemProgress)
|
|
// PATCH /me/progress/{id}/{episodeId} — podcast episode
|
|
// progress; audiobook-only catalog, so this is a stub.
|
|
r.Patch(prefix+"/me/progress/{libraryItemId}/{episodeId}", h.handleSetEpisodeProgress)
|
|
// PATCH /session/{sid} — heartbeat: position + time_listening
|
|
r.Patch(prefix+"/session/{sid}", h.handleSessionSync)
|
|
// POST /session/{sid}/close — finalise the play session
|
|
r.Post(prefix+"/session/{sid}/close", h.handleSessionClose)
|
|
// Bookmarks — POST/PATCH both upsert; DELETE is idempotent.
|
|
r.Post(prefix+"/me/item/{itemId}/bookmark", h.handleUpsertBookmark("bookmark_created"))
|
|
r.Patch(prefix+"/me/item/{itemId}/bookmark", h.handleUpsertBookmark("bookmark_updated"))
|
|
r.Delete(prefix+"/me/item/{itemId}/bookmark/{time}", h.handleDeleteBookmark)
|
|
// Collections — owner-gated CRUD with cross-user public reads.
|
|
r.Get(prefix+"/collections", h.handleListCollections)
|
|
// Per-library collections list — bookshelf "Collections" tab
|
|
// hits this. Paged envelope with full-shape entries (books[]
|
|
// included) so the cover stack renders.
|
|
r.Get(prefix+"/libraries/{libraryId}/collections", h.handleListLibraryCollections)
|
|
r.Post(prefix+"/collections", h.handleCreateCollection)
|
|
r.Get(prefix+"/collections/{id}", h.handleGetCollection)
|
|
r.Patch(prefix+"/collections/{id}", h.handleUpdateCollection)
|
|
r.Delete(prefix+"/collections/{id}", h.handleDeleteCollection)
|
|
r.Post(prefix+"/collections/{id}/book/{bookId}", h.handleAddCollectionBook)
|
|
r.Delete(prefix+"/collections/{id}/book/{bookId}", h.handleRemoveCollectionBook)
|
|
// Playlists — owner-gated CRUD with cross-user public reads,
|
|
// realtime events on every mutation, batch endpoints.
|
|
r.Get(prefix+"/playlists", h.handleListPlaylists)
|
|
// Per-library playlist list — mobile create-playlist modal
|
|
// loads from here before opening the form. Emits
|
|
// `{results: [...]}` with full-shape entries.
|
|
r.Get(prefix+"/libraries/{libraryId}/playlists", h.handleListLibraryPlaylists)
|
|
r.Post(prefix+"/playlists", h.handleCreatePlaylist)
|
|
r.Get(prefix+"/playlists/{id}", h.handleGetPlaylist)
|
|
r.Patch(prefix+"/playlists/{id}", h.handleUpdatePlaylist)
|
|
r.Delete(prefix+"/playlists/{id}", h.handleDeletePlaylist)
|
|
r.Post(prefix+"/playlists/{id}/item", h.handleAddPlaylistItem)
|
|
r.Post(prefix+"/playlists/{id}/batch/add", h.handleBatchAddPlaylistItems)
|
|
r.Post(prefix+"/playlists/{id}/batch/remove", h.handleBatchRemovePlaylistItems)
|
|
r.Delete(prefix+"/playlists/{id}/item/{libraryItemId}", h.handleRemovePlaylistItem)
|
|
r.Delete(prefix+"/playlists/{id}/item/{libraryItemId}/{episodeId}", h.handleRemovePlaylistEpisode)
|
|
// Smart collections — rule-based dynamic groupings.
|
|
r.Get(prefix+"/me/smart-collections", h.handleListSmartCollections)
|
|
r.Post(prefix+"/me/smart-collections", h.handleCreateSmartCollection)
|
|
r.Get(prefix+"/me/smart-collections/{id}", h.handleGetSmartCollection)
|
|
r.Get(prefix+"/me/smart-collections/{id}/items", h.handleSmartCollectionItems)
|
|
r.Patch(prefix+"/me/smart-collections/{id}", h.handleUpdateSmartCollection)
|
|
r.Delete(prefix+"/me/smart-collections/{id}", h.handleDeleteSmartCollection)
|
|
// Phase 1 close-out: listening stats / author+series / continue / RSS auth.
|
|
r.Get(prefix+"/me/listening-stats", h.handleListeningStats)
|
|
r.Get(prefix+"/me/listening-sessions", h.handleListeningSessions)
|
|
r.Get(prefix+"/me/listening-sessions/{sid}", h.handleListeningSessionDetail)
|
|
r.Get(prefix+"/authors/{id}", h.handleAuthorDetail)
|
|
r.Get(prefix+"/series/{id}", h.handleSeriesDetail)
|
|
r.Get(prefix+"/me/progress/{itemId}/remove-from-continue-listening", h.handleRemoveFromContinueListening)
|
|
r.Get(prefix+"/me/progress/{itemId}/readd-to-continue-listening", h.handleReaddToContinueListening)
|
|
r.Get(prefix+"/feeds", h.handleListRSSFeeds)
|
|
r.Post(prefix+"/feeds/item/{itemId}/open", h.handleOpenItemFeed)
|
|
r.Post(prefix+"/feeds/{id}/close", h.handleCloseFeed)
|
|
// Year-in-review stats — AudioBooth's "Year Stats" widget on the
|
|
// profile screen. Synthesized from AggregateStats today.
|
|
r.Get(prefix+"/me/stats/year/{year}", h.handleYearStats)
|
|
// Ebook surface — stubs until the ebook scanner lands.
|
|
// Mobile clients call these but degrade cleanly on empty/404.
|
|
r.Get(prefix+"/items/{id}/ebook/{fileid}", h.handleEbookFile)
|
|
r.Patch(prefix+"/items/{id}/ebook/{fileid}/status", h.handleEbookStatus)
|
|
// E-reader devices + ebook email delivery — empty list / 503
|
|
// until SMTP integration is wired.
|
|
r.Get(prefix+"/me/ereader-devices", h.handleListEreaderDevices)
|
|
r.Post(prefix+"/emails/send-ebook-to-device", h.handleSendEbookToDevice)
|
|
// Podcast stubs — audiobook-only catalog in v1. Endpoints
|
|
// return empty-but-well-formed shapes so the mobile UI doesn't
|
|
// crash on the podcast surfaces.
|
|
r.Post(prefix+"/podcasts/feed", h.handlePodcastFeed)
|
|
r.Post(prefix+"/items/{libraryItemId}/play/{episodeId}", h.handlePlayEpisode)
|
|
r.Get(prefix+"/libraries/{libraryId}/recent-episodes", h.handleRecentEpisodes)
|
|
r.Get(prefix+"/search/podcast", h.handleSearchPodcast)
|
|
}
|
|
})
|
|
|
|
// Stage 5: browse routes (libraries, items, item detail, me, similar,
|
|
// continue-listening) + author/series/search/personalized stubs.
|
|
// Requires bearerAuth.
|
|
r.Group(func(r chi.Router) {
|
|
r.Use(h.bearerAuth)
|
|
for _, prefix := range []string{"/abs/api", "/api"} {
|
|
// Current user object.
|
|
r.Get(prefix+"/me", h.handleMe)
|
|
// Real-ABS /authorize: validates the bearer and re-mints the
|
|
// /me envelope so the client can resume without retyping creds.
|
|
r.Post(prefix+"/authorize", h.handleABSAuthorize)
|
|
// Continue Listening shelf.
|
|
r.Get(prefix+"/me/items-in-progress", h.handleItemsInProgress)
|
|
// Library list + detail.
|
|
r.Get(prefix+"/libraries", h.handleLibraries)
|
|
r.Get(prefix+"/libraries/{libraryId}", h.handleLibraryDetail)
|
|
// Browse items in a library.
|
|
r.Get(prefix+"/libraries/{libraryId}/items", h.handleLibraryItems)
|
|
// Author / series / search / personalized — stubbed.
|
|
r.Get(prefix+"/libraries/{libraryId}/authors", h.handleLibraryAuthors)
|
|
r.Get(prefix+"/libraries/{libraryId}/series", h.handleLibrarySeries)
|
|
r.Get(prefix+"/libraries/{libraryId}/search", h.handleLibrarySearch)
|
|
r.Get(prefix+"/libraries/{libraryId}/personalized", h.handlePersonalized)
|
|
// Single item detail.
|
|
r.Get(prefix+"/items/{id}", h.handleItem)
|
|
// Similar items (optional Recommender; empty list when nil).
|
|
r.Get(prefix+"/items/{id}/similar", h.handleSimilarItems)
|
|
}
|
|
})
|
|
|
|
// Stage 6: Socket.io realtime endpoint.
|
|
if h.deps.SocketIO != nil {
|
|
r.Mount("/socket.io", h.deps.SocketIO.Handler())
|
|
r.Mount("/abs/socket.io", h.deps.SocketIO.Handler())
|
|
}
|
|
|
|
// TODO: social / collection routes (bookmarks, smart-collections,
|
|
// collections, playlists, RSS feeds, author/series detail, listening stats)
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Auth context helpers (used by bearerAuth middleware + handlers)
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// ctxKey is the unexported ABS auth context key.
|
|
type ctxKey struct{}
|
|
|
|
// ctxAuth carries the decoded ABS JWT claims for the lifetime of a request.
|
|
type ctxAuth struct {
|
|
UserID string
|
|
ProfileID string
|
|
JTI string
|
|
Token string // raw bearer token
|
|
}
|
|
|
|
// absAuthFrom extracts ABS auth from the request context. Returns (zero, false)
|
|
// when bearerAuth middleware hasn't run (unauthenticated routes).
|
|
func absAuthFrom(r *http.Request) (ctxAuth, bool) {
|
|
a, ok := r.Context().Value(ctxKey{}).(ctxAuth)
|
|
return a, ok
|
|
}
|
|
|
|
func (h *Handler) accessFilterForAuth(ctx context.Context, a ctxAuth) (catalog.AccessFilter, error) {
|
|
if h.deps.AccessResolver != nil {
|
|
return h.deps.AccessResolver.ResolveABSAccess(ctx, a.UserID, a.ProfileID)
|
|
}
|
|
filter := catalog.AccessFilter{ProfileID: a.ProfileID}
|
|
if uid, err := strconv.Atoi(a.UserID); err == nil {
|
|
filter.UserID = uid
|
|
}
|
|
return filter, nil
|
|
}
|
|
|
|
func (h *Handler) accessFilterFromRequest(r *http.Request) (catalog.AccessFilter, bool, error) {
|
|
a, ok := absAuthFrom(r)
|
|
if !ok || a.UserID == "" {
|
|
return catalog.AccessFilter{}, false, nil
|
|
}
|
|
filter, err := h.accessFilterForAuth(r.Context(), a)
|
|
return filter, true, err
|
|
}
|
|
|
|
func emptyAccessFilter() catalog.AccessFilter {
|
|
return catalog.AccessFilter{}
|
|
}
|
|
|
|
func sameABSPrincipal(a ctxAuth, userID, profileID string) bool {
|
|
return a.UserID == userID && a.ProfileID == profileID
|
|
}
|
|
|
|
// bearerAuth is the authentication middleware for protected ABS routes.
|
|
// It reads the bearer token from the Authorization header or ?token= query
|
|
// param, validates the JWT, checks the JTI isn't revoked, and injects
|
|
// ctxAuth into the request context.
|
|
//
|
|
// Placeholder implementation — full validation logic lands in Stage 2 when
|
|
// TokenStore and ConfigProvider are wired to real backing stores.
|
|
func (h *Handler) bearerAuth(next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
raw := strings.TrimPrefix(r.Header.Get("Authorization"), "Bearer ")
|
|
if raw == "" {
|
|
raw = r.URL.Query().Get("token")
|
|
}
|
|
if raw == "" {
|
|
slog.Debug("abs bearerAuth: no token", "path", r.URL.Path, "remote", r.RemoteAddr)
|
|
http.Error(w, "unauthenticated", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
if h.deps.Config == nil || h.deps.TokenStore == nil {
|
|
slog.Warn("abs bearerAuth: deps not wired",
|
|
"have_config", h.deps.Config != nil,
|
|
"have_token_store", h.deps.TokenStore != nil,
|
|
"path", r.URL.Path)
|
|
http.Error(w, "auth not configured", http.StatusServiceUnavailable)
|
|
return
|
|
}
|
|
secret, err := h.deps.Config.JWTSecret(r.Context())
|
|
if err != nil {
|
|
slog.Error("abs bearerAuth: jwt secret fetch failed", "err", err, "path", r.URL.Path)
|
|
http.Error(w, "config unavailable", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
claims, err := ParseToken(secret, raw)
|
|
if err != nil {
|
|
slog.Debug("abs bearerAuth: parse failed", "err", err, "path", r.URL.Path)
|
|
http.Error(w, "invalid token", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
if claims.Type != "access" {
|
|
slog.Debug("abs bearerAuth: wrong token type", "type", claims.Type, "path", r.URL.Path)
|
|
http.Error(w, "invalid token", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
row, err := h.deps.TokenStore.GetTokenByJTI(r.Context(), claims.JTI)
|
|
if err != nil {
|
|
slog.Debug("abs bearerAuth: jti lookup failed",
|
|
"jti", claims.JTI, "err", err, "path", r.URL.Path)
|
|
http.Error(w, "token revoked", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
if row.RevokedAt != nil {
|
|
slog.Debug("abs bearerAuth: jti revoked", "jti", claims.JTI, "path", r.URL.Path)
|
|
http.Error(w, "token revoked", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
if row.UserID != "" && row.UserID != claims.UserID {
|
|
slog.Debug("abs bearerAuth: token user mismatch", "jti", claims.JTI, "path", r.URL.Path)
|
|
http.Error(w, "invalid token", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
if row.ProfileID != "" && row.ProfileID != claims.ProfileID {
|
|
slog.Debug("abs bearerAuth: token profile mismatch", "jti", claims.JTI, "path", r.URL.Path)
|
|
http.Error(w, "invalid token", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
if row.Type != "" && row.Type != "access" {
|
|
slog.Debug("abs bearerAuth: persisted token type mismatch", "type", row.Type, "path", r.URL.Path)
|
|
http.Error(w, "invalid token", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
if !row.ExpiresAt.IsZero() && time.Now().After(row.ExpiresAt) {
|
|
slog.Debug("abs bearerAuth: persisted token expired", "jti", claims.JTI, "path", r.URL.Path)
|
|
http.Error(w, "token expired", http.StatusUnauthorized)
|
|
return
|
|
}
|
|
_ = h.deps.TokenStore.TouchToken(r.Context(), claims.JTI)
|
|
ctx := context.WithValue(r.Context(), ctxKey{}, ctxAuth{
|
|
UserID: claims.UserID,
|
|
ProfileID: claims.ProfileID,
|
|
JTI: claims.JTI,
|
|
Token: raw,
|
|
})
|
|
next.ServeHTTP(w, r.WithContext(ctx))
|
|
})
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Publisher nil-safe wrappers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
func (h *Handler) publish(userID, event string, payload any) {
|
|
if h.deps.Publisher == nil {
|
|
return
|
|
}
|
|
h.deps.Publisher.Publish(userID, event, payload)
|
|
}
|
|
|
|
func (h *Handler) broadcast(event string, payload any) {
|
|
if h.deps.Publisher == nil {
|
|
return
|
|
}
|
|
h.deps.Publisher.Broadcast(event, payload)
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// URL helpers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// absBaseURL returns the server address prefix ABS clients should use to
|
|
// resolve response-embedded URLs.
|
|
//
|
|
// - Host-proxied (X-Silo-User-Id header present): returns the plugin-proxy
|
|
// path "<scheme>://<host>/api/v1/plugins/<installID>".
|
|
// - Standalone listener: returns "<scheme>://<host>" — origin only.
|
|
//
|
|
// Honors X-Forwarded-Proto / X-Forwarded-Host for TLS-terminating proxies.
|
|
func (h *Handler) absBaseURL(r *http.Request) string {
|
|
scheme := r.Header.Get("X-Forwarded-Proto")
|
|
if scheme == "" {
|
|
if r.TLS != nil {
|
|
scheme = "https"
|
|
} else {
|
|
scheme = "http"
|
|
}
|
|
}
|
|
host := r.Header.Get("X-Forwarded-Host")
|
|
if host == "" {
|
|
host = r.Host
|
|
}
|
|
if r.Header.Get("X-Silo-User-Id") != "" {
|
|
return scheme + "://" + host + "/api/v1/plugins/" + h.deps.InstallID()
|
|
}
|
|
return scheme + "://" + host
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Shared response helpers (used by handlers across multiple stages)
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// writeJSON serialises v as JSON and writes it with the given HTTP status.
|
|
func writeJSON(w http.ResponseWriter, status int, v any) {
|
|
w.Header().Set("Content-Type", "application/json")
|
|
w.WriteHeader(status)
|
|
_ = json.NewEncoder(w).Encode(v)
|
|
}
|
|
|
|
// readPagedQuery extracts `limit` and `page` from query params. Real ABS
|
|
// treats limit=0 as "return all" (not "return zero rows") — we surface that
|
|
// intent and let callers short-circuit pagination.
|
|
func readPagedQuery(r *http.Request, defaultLimit int) (limit, page int) {
|
|
limit = defaultLimit
|
|
if v := r.URL.Query().Get("limit"); v != "" {
|
|
if n, err := strconv.Atoi(v); err == nil && n >= 0 {
|
|
limit = n
|
|
}
|
|
}
|
|
if v := r.URL.Query().Get("page"); v != "" {
|
|
if n, err := strconv.Atoi(v); err == nil && n >= 0 {
|
|
page = n
|
|
}
|
|
}
|
|
return limit, page
|
|
}
|
|
|
|
// pagedEnvelope builds the standard ABS pagination response shape. All eight
|
|
// fields are always emitted (no omitempty) because ABS clients branch on
|
|
// their presence (sortBy, filterBy, minified).
|
|
func pagedEnvelope(results any, total, limit, page int, sortBy string, sortDesc bool, filterBy string, minified bool, include string) map[string]any {
|
|
return map[string]any{
|
|
"results": results,
|
|
"total": total,
|
|
"limit": limit,
|
|
"page": page,
|
|
"sortBy": sortBy,
|
|
"sortDesc": sortDesc,
|
|
"filterBy": filterBy,
|
|
"minified": minified,
|
|
"include": include,
|
|
}
|
|
}
|