feat: server-side TTS audio generation, audio queue panel, and home screen fix
Some checks failed
CI / Lint (push) Has been cancelled
CI / Test (push) Has been cancelled
CI / Build (push) Has been cancelled

- Add POST /ui/audio/{slug}/{n} endpoint: calls Kokoro-FastAPI server-side,
  writes MP3 atomically to disk, deduplicates concurrent requests via
  in-flight channel map, wraps route with 10-min TimeoutHandler
- Add GET /ui/audio-file/{slug}/{n} endpoint: serves cached MP3 with 1-day
  cache headers
- Add AudioDir/AudioPath helpers to writer.go
- Rewrite JS TTS: remove all MSE/blob/stream code; use plain fetch to
  generate endpoint then set audio.src to returned URL
- Add AbortController to generateAudio; abort on stop() and navigation
- Keep voice/speed controls disabled until setPlaying() fires
- Reset prefetchFired on voice/speed change
- Upgrade prefetch from fire-and-forget to promise chain updating queue badge
- Add sticky bottom audio queue panel: always-visible scrubber with timestamps,
  expandable rows for Now/Next/Dbg with color-coded state badges
- Fix iOS Reader Mode: header->nav aria-hidden, audio outside nav, role=main,
  visible h1 in content area, hover-only paragraph highlight
- Fix home screen Available books hidden: stop hiding cards in #books-grid
  when they appear in Continue Reading; Available always shows all books
This commit is contained in:
Admin
2026-03-01 20:44:03 +05:00
parent 79f5edf80c
commit 81e5d015b4
3 changed files with 641 additions and 503 deletions

View File

@@ -8,11 +8,14 @@
package server package server
import ( import (
"bytes"
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io"
"log/slog" "log/slog"
"net/http" "net/http"
"os"
"strconv" "strconv"
"sync" "sync"
"time" "time"
@@ -34,18 +37,26 @@ type Server struct {
rankingRunning bool rankingRunning bool
kokoroURL string // Kokoro-FastAPI base URL, e.g. http://kokoro:8880 kokoroURL string // Kokoro-FastAPI base URL, e.g. http://kokoro:8880
kokoroVoice string // default voice, e.g. af_bella kokoroVoice string // default voice, e.g. af_bella
// audioMu guards audioInFlight.
// audioInFlight maps an audio cache key to a channel that is closed when
// the in-flight Kokoro request for that key finishes (successfully or not).
// This prevents duplicate concurrent TTS generation for the same file.
audioMu sync.Mutex
audioInFlight map[string]chan struct{}
} }
// New creates a new Server. // New creates a new Server.
func New(addr string, oCfg orchestrator.Config, novel scraper.NovelScraper, log *slog.Logger, kokoroURL, kokoroVoice string) *Server { func New(addr string, oCfg orchestrator.Config, novel scraper.NovelScraper, log *slog.Logger, kokoroURL, kokoroVoice string) *Server {
return &Server{ return &Server{
addr: addr, addr: addr,
oCfg: oCfg, oCfg: oCfg,
novel: novel, novel: novel,
log: log, log: log,
writer: writer.New(oCfg.StaticRoot), writer: writer.New(oCfg.StaticRoot),
kokoroURL: kokoroURL, kokoroURL: kokoroURL,
kokoroVoice: kokoroVoice, kokoroVoice: kokoroVoice,
audioInFlight: make(map[string]chan struct{}),
} }
} }
@@ -69,6 +80,16 @@ func (s *Server) ListenAndServe(ctx context.Context) error {
mux.HandleFunc("GET /ui/ranking/status", s.handleRankingStatus) mux.HandleFunc("GET /ui/ranking/status", s.handleRankingStatus)
// Plain-text chapter content for browser-side TTS // Plain-text chapter content for browser-side TTS
mux.HandleFunc("GET /ui/chapter-text/{slug}/{n}", s.handleChapterText) mux.HandleFunc("GET /ui/chapter-text/{slug}/{n}", s.handleChapterText)
// Server-side audio generation and serving.
// Audio generation can take several minutes for long chapters, so wrap it
// in its own timeout handler instead of relying on the server WriteTimeout.
audioGenHandler := http.TimeoutHandler(
http.HandlerFunc(s.handleAudioGenerate),
10*time.Minute,
`{"error":"audio generation timed out"}`,
)
mux.Handle("POST /ui/audio/{slug}/{n}", audioGenHandler)
mux.HandleFunc("GET /ui/audio-file/{slug}/{n}", s.handleAudioFile)
srv := &http.Server{ srv := &http.Server{
Addr: s.addr, Addr: s.addr,
@@ -117,6 +138,201 @@ func (s *Server) handleChapterText(w http.ResponseWriter, r *http.Request) {
fmt.Fprint(w, stripMarkdown(raw)) fmt.Fprint(w, stripMarkdown(raw))
} }
// handleAudioGenerate handles POST /ui/audio/{slug}/{n}.
// It accepts an optional JSON body {voice, speed} (falling back to server
// defaults). If the MP3 is already cached on disk it returns immediately;
// otherwise it calls Kokoro-FastAPI to generate and save the file.
// Response: JSON {"url": "/ui/audio-file/{slug}/{n}?voice=…&speed=…"}
//
// Concurrent requests for the same (slug, n, voice, speed) are deduplicated:
// the first caller does the work; subsequent callers block until it finishes
// and then serve the cached file (or receive the same error).
func (s *Server) handleAudioGenerate(w http.ResponseWriter, r *http.Request) {
slug := r.PathValue("slug")
n, err := strconv.Atoi(r.PathValue("n"))
if err != nil || n < 1 {
http.Error(w, `{"error":"invalid chapter"}`, http.StatusBadRequest)
return
}
// Parse optional voice/speed from JSON body.
voice := s.kokoroVoice
speed := 1.0
var body struct {
Voice string `json:"voice"`
Speed float64 `json:"speed"`
}
if r.Body != nil {
_ = json.NewDecoder(r.Body).Decode(&body)
}
if body.Voice != "" {
voice = body.Voice
}
if body.Speed > 0 {
speed = body.Speed
}
audioPath := s.writer.AudioPath(slug, n, voice, speed)
// Idempotent: return immediately if already cached.
if _, err := os.Stat(audioPath); err == nil {
s.writeAudioURL(w, slug, n, voice, speed)
return
}
// Deduplicate concurrent generation requests for the same file.
// If another goroutine is already generating this file, wait for it and
// then serve the (now-cached) result.
cacheKey := fmt.Sprintf("%s/%d/%s/%.2f", slug, n, voice, speed)
s.audioMu.Lock()
if ch, ok := s.audioInFlight[cacheKey]; ok {
// Someone else is already generating — wait for them.
s.audioMu.Unlock()
select {
case <-ch:
case <-r.Context().Done():
http.Error(w, `{"error":"request cancelled"}`, http.StatusServiceUnavailable)
return
}
// Serve the cached file (or 404 if generation failed).
if _, err := os.Stat(audioPath); err == nil {
s.writeAudioURL(w, slug, n, voice, speed)
} else {
http.Error(w, `{"error":"audio generation failed"}`, http.StatusInternalServerError)
}
return
}
// Register ourselves as the in-flight generator.
ch := make(chan struct{})
s.audioInFlight[cacheKey] = ch
s.audioMu.Unlock()
// Always close the channel (unblocking waiters) and remove our entry.
defer func() {
s.audioMu.Lock()
delete(s.audioInFlight, cacheKey)
s.audioMu.Unlock()
close(ch)
}()
// Load chapter text.
raw, err := s.writer.ReadChapter(slug, n)
if err != nil {
http.Error(w, `{"error":"chapter not found"}`, http.StatusNotFound)
return
}
text := stripMarkdown(raw)
if text == "" {
http.Error(w, `{"error":"chapter text is empty"}`, http.StatusUnprocessableEntity)
return
}
if s.kokoroURL == "" {
http.Error(w, `{"error":"kokoro not configured"}`, http.StatusServiceUnavailable)
return
}
// Call Kokoro-FastAPI.
reqBody, _ := json.Marshal(map[string]interface{}{
"model": "kokoro",
"input": text,
"voice": voice,
"response_format": "mp3",
"speed": speed,
"stream": false,
})
kokoroReq, err := http.NewRequestWithContext(r.Context(), http.MethodPost,
s.kokoroURL+"/v1/audio/speech", bytes.NewReader(reqBody))
if err != nil {
http.Error(w, `{"error":"failed to build kokoro request"}`, http.StatusInternalServerError)
return
}
kokoroReq.Header.Set("Content-Type", "application/json")
resp, err := http.DefaultClient.Do(kokoroReq)
if err != nil {
s.log.Error("kokoro request failed", "err", err)
http.Error(w, `{"error":"kokoro unavailable"}`, http.StatusBadGateway)
return
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
body2, _ := io.ReadAll(resp.Body)
s.log.Error("kokoro returned error", "status", resp.StatusCode, "body", string(body2))
http.Error(w, fmt.Sprintf(`{"error":"kokoro error %d"}`, resp.StatusCode), http.StatusBadGateway)
return
}
// Ensure the audio directory exists.
if err := os.MkdirAll(s.writer.AudioDir(slug), 0o755); err != nil {
http.Error(w, `{"error":"failed to create audio dir"}`, http.StatusInternalServerError)
return
}
// Write to a temp file then rename atomically.
tmpPath := audioPath + ".tmp"
f, err := os.Create(tmpPath)
if err != nil {
http.Error(w, `{"error":"failed to create temp file"}`, http.StatusInternalServerError)
return
}
if _, err := io.Copy(f, resp.Body); err != nil {
f.Close()
os.Remove(tmpPath)
http.Error(w, `{"error":"failed to write audio"}`, http.StatusInternalServerError)
return
}
f.Close()
if err := os.Rename(tmpPath, audioPath); err != nil {
os.Remove(tmpPath)
http.Error(w, `{"error":"failed to save audio"}`, http.StatusInternalServerError)
return
}
s.log.Info("audio generated", "slug", slug, "chapter", n, "voice", voice, "speed", speed)
s.writeAudioURL(w, slug, n, voice, speed)
}
func (s *Server) writeAudioURL(w http.ResponseWriter, slug string, n int, voice string, speed float64) {
url := fmt.Sprintf("/ui/audio-file/%s/%d?voice=%s&speed=%.1f", slug, n, voice, speed)
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(map[string]string{"url": url})
}
// handleAudioFile handles GET /ui/audio-file/{slug}/{n}.
// Serves the cached MP3 file identified by voice and speed query params.
func (s *Server) handleAudioFile(w http.ResponseWriter, r *http.Request) {
slug := r.PathValue("slug")
n, err := strconv.Atoi(r.PathValue("n"))
if err != nil || n < 1 {
http.NotFound(w, r)
return
}
voice := r.URL.Query().Get("voice")
if voice == "" {
voice = s.kokoroVoice
}
speedStr := r.URL.Query().Get("speed")
speed := 1.0
if speedStr != "" {
if v, err := strconv.ParseFloat(speedStr, 64); err == nil && v > 0 {
speed = v
}
}
audioPath := s.writer.AudioPath(slug, n, voice, speed)
if _, err := os.Stat(audioPath); err != nil {
http.NotFound(w, r)
return
}
w.Header().Set("Content-Type", "audio/mpeg")
w.Header().Set("Cache-Control", "public, max-age=86400")
http.ServeFile(w, r, audioPath)
}
func (s *Server) handleScrapeCatalogue(w http.ResponseWriter, r *http.Request) { func (s *Server) handleScrapeCatalogue(w http.ResponseWriter, r *http.Request) {
cfg := s.oCfg cfg := s.oCfg
cfg.SingleBookURL = "" // full catalogue cfg.SingleBookURL = "" // full catalogue

File diff suppressed because it is too large Load Diff

View File

@@ -408,6 +408,26 @@ func (w *Writer) bookDir(slug string) string {
return filepath.Join(w.root, slug) return filepath.Join(w.root, slug)
} }
// AudioDir returns the directory used to cache generated MP3 files for a book.
func (w *Writer) AudioDir(slug string) string {
return filepath.Join(w.bookDir(slug), "audio")
}
// AudioPath returns the full path for a cached chapter audio file.
// The filename is keyed by chapter number, voice, and speed so that different
// settings never collide. Speed is formatted to one decimal place (e.g. "1.0").
func (w *Writer) AudioPath(slug string, n int, voice string, speed float64) string {
// Sanitise voice so it is safe as a filename component.
safeVoice := strings.Map(func(r rune) rune {
if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') || r == '_' || r == '-' {
return r
}
return '_'
}, voice)
filename := fmt.Sprintf("ch%d-%s-%.1f.mp3", n, safeVoice, speed)
return filepath.Join(w.AudioDir(slug), filename)
}
// chapterPath computes the full file path for a chapter. // chapterPath computes the full file path for a chapter.
// //
// vol-{volume}/{folderRange}/chapter-{number}.md // vol-{volume}/{folderRange}/chapter-{number}.md