Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 hnzio
|
21c0de7dd9 | ||
|
hnzio
|
d5b1c58ba2 | ||
|
hnzio
|
64f55a8b1f | ||
|
hnzio
|
a08b02c34b | ||
|
hnzio
|
6d96900d81 | ||
|
hnzio
|
d586fbd8ce | ||
|
hnzio
|
b80dded55d | ||
|
hnzio
|
fd47910d09 | ||
|
hnzio
|
01b5606a3b | ||
|
hnzio
|
fa17187af4 | ||
|
hnzio
|
b1474bc33d |
No files matched your search
@@ -6,6 +6,7 @@ BODY_SIZE_LIMIT=6M
|
||||
|
||||
# Generate this locally and insert it here as described in README.md. Never commit .env.
|
||||
SENDEWERK_SETUP_TOKEN=
|
||||
# Public production origins must use HTTPS; loopback HTTP remains available locally.
|
||||
SENDEWERK_APP_ORIGIN=http://localhost:5173
|
||||
|
||||
# "local" writes messages to the outbox and never contacts a mail server.
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"title": "Sendewerk",
|
||||
"description": "Redaktionelle Planung und Durchführung von heinzlive-Sendungen.",
|
||||
"tagline": "Vom Fundstück bis zur Livesendung",
|
||||
"version": "0.5.12",
|
||||
"version": "0.7.3",
|
||||
"healthCheckPath": "/healthz",
|
||||
"httpPort": 3000,
|
||||
"addons": {
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
Sendewerk ist die redaktionelle Webanwendung für den Weg vom vorbereiteten
|
||||
Inhalt bis zur moderierten und archivierten Sendung. Der aktuelle Stand umfasst
|
||||
Etappe 1 bis 5: technisches Grundgerüst, Anmeldung und Rollen, einen
|
||||
persistenten Fundus, den Sendungsbaukasten sowie Live-Steuerung und eine
|
||||
abgesicherte Präsentationsausgabe. Abschluss und Archivierung folgen in Etappe 6.
|
||||
Etappe 1 bis 7: technisches Grundgerüst, Anmeldung und Rollen, Fundus,
|
||||
Sendungsbau, Live-Steuerung, Präsentationsausgabe, Abschluss, Archiv,
|
||||
Freigaben, RSS sowie technische REST- und MCP-Zugänge.
|
||||
|
||||
## Voraussetzungen
|
||||
|
||||
@@ -62,6 +62,9 @@ enthält bewusst kein Konto und kein Standardpasswort.
|
||||
Relative Sendewerk-Pfade werden vom Projektverzeichnis aus aufgelöst. In
|
||||
Cloudron liegen Datenbank und Uploads unter `/app/data`.
|
||||
|
||||
Eine öffentliche Produktions-Origin muss HTTPS verwenden. Nur für lokale
|
||||
Loopback-Adressen bleibt HTTP zulässig.
|
||||
|
||||
Der Vorgabemodus `local` baut keine Netzwerkverbindung auf. Einladungen und
|
||||
Passwort-Resets landen als JSON-Dateien in `.data/mail-outbox`; die enthaltenen
|
||||
Links sind Geheimnisse und dürfen nicht veröffentlicht werden. Echter Versand
|
||||
@@ -151,6 +154,53 @@ DNS-, Redirect-, Zeit- und Größenlimits abgerufen. Private und lokale
|
||||
Netzwerkziele sind gesperrt. Eingebettetes HTML oder Skripte einer Quellseite
|
||||
werden nicht übernommen.
|
||||
|
||||
## MCP und ChatGPT
|
||||
|
||||
Der lesende Streamable-HTTP-Endpunkt liegt unter `/mcp`. Seine konkrete
|
||||
Adresse ist die konfigurierte Anwendungs-Origin mit angehängtem Pfad:
|
||||
|
||||
```text
|
||||
https://<Cloudron-App-Domain>/mcp
|
||||
```
|
||||
|
||||
Beispiel: Bei `SENDEWERK_APP_ORIGIN=https://sendewerk.example.org` lautet die
|
||||
MCP-URL `https://sendewerk.example.org/mcp`. Niemals einen technischen
|
||||
REST-Token an die URL hängen oder in ChatGPT eintragen. MCP verwendet einen
|
||||
eigenen OAuth-2.1-Flow mit Authorization Code, PKCE und kurzlebigen Tokens.
|
||||
|
||||
Die Verbindung stellt ausschließlich lesende Werkzeuge bereit:
|
||||
|
||||
- `get_profile` identifiziert das verbundene Sendewerk-Konto ohne E-Mail-Adresse.
|
||||
- `list_pieces` und `get_piece` lesen Fundus-Pieces.
|
||||
- `list_shows` und `get_show_rundown` lesen Sendungen und deren Abläufe.
|
||||
|
||||
Die Detailwerkzeuge können private Recherche, Moderationsnotizen, Quellen,
|
||||
eigene Notizen und Reserveinhalte liefern. Der angemeldete Nutzer muss diesem
|
||||
Umfang ausdrücklich zustimmen. Sperrung oder Passwortwechsel widerrufen
|
||||
bestehende OAuth-Tokens; jede MCP-Anfrage prüft Konto, Scope, Ablauf und
|
||||
Zielressource erneut. MCP kann keine Inhalte schreiben.
|
||||
|
||||
### In ChatGPT einrichten
|
||||
|
||||
1. Zuerst Version `0.7.3` unter der endgültigen öffentlichen HTTPS-Origin
|
||||
bereitstellen. Lokalhost ohne öffentliches HTTPS ist für eine direkte
|
||||
ChatGPT-Verbindung nicht erreichbar.
|
||||
2. In [ChatGPT Plugins](https://chatgpt.com/plugins) das Plus wählen und
|
||||
**Add custom MCP server** öffnen.
|
||||
3. Einen Namen und eine Beschreibung vergeben und unter **Connection** die
|
||||
vollständige URL `https://<Cloudron-App-Domain>/mcp` eintragen.
|
||||
4. OAuth als Authentifizierung verwenden, den Risikohinweis prüfen und
|
||||
**Create as a plugin** wählen. ChatGPT entdeckt die OAuth-Endpunkte und
|
||||
registriert einen öffentlichen PKCE-Client dynamisch.
|
||||
5. Im geöffneten Sendewerk-Fenster mit dem eigenen Konto anmelden, Clientname
|
||||
und Rücksprung-Domain prüfen und den lesenden Zugriff ausdrücklich erlauben.
|
||||
6. Die gefundenen fünf Werkzeuge kontrollieren, das Plugin installieren und in
|
||||
einer neuen Unterhaltung über `@` auswählen.
|
||||
|
||||
Eine erfolgreich lokale OAuth- und MCP-Prüfung beweist noch keine reale
|
||||
ChatGPT-Verbindung. Diese muss nach dem Cloudron-Update separat in der
|
||||
jeweiligen ChatGPT-Workspace-Konfiguration durchgeführt werden.
|
||||
|
||||
## Befehle
|
||||
|
||||
| Befehl | Zweck |
|
||||
@@ -210,6 +260,12 @@ Umgebungsvariable gesetzt werden. `CLOUDRON_APP_ORIGIN` liefert dort die feste
|
||||
HTTPS-Origin. SMTP-Zugangsdaten werden ebenfalls ausschließlich als
|
||||
Laufzeitvariablen gesetzt, nicht in Manifest oder Image geschrieben.
|
||||
|
||||
Für MCP sind keine zusätzlichen Geheimnisse erforderlich. Nach einem Update
|
||||
auf `0.7.3` führt der bestehende Startprozess Migration `0020_oauth_mcp.sql`
|
||||
aus. Anschließend muss die von Cloudron gelieferte HTTPS-Origin mit der in
|
||||
ChatGPT eingetragenen MCP-Domain übereinstimmen. Reverse Proxy und öffentliche
|
||||
Erreichbarkeit wurden ohne Cloudron-Zugang nicht geprüft.
|
||||
|
||||
Das ersetzt keinen Test auf einem echten Cloudron. Insbesondere Addon-Backup,
|
||||
Restore, Proxy-Origin und das read-only Laufzeitdateisystem können erst dort
|
||||
abschließend geprüft werden.
|
||||
|
||||
+209
-6
@@ -1,5 +1,121 @@
|
||||
# Abnahme
|
||||
|
||||
## Lesender MCP-Zugang 0.7.3
|
||||
|
||||
| Bereich | Nachweis | Stand |
|
||||
| ------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | --------------------- |
|
||||
| OAuth-Discovery und anonymer Schutz | Reale lokale HTTP-Anfrage erhält 401 mit `resource_metadata`; Discovery-Routen sind im Produktionsbuild enthalten | erfüllt am 27.10.2026 |
|
||||
| DCR, Zustimmung und PKCE | Isolierter HTTP-Ablauf registriert Client, lädt Zustimmung, erhält Code mit `state`/`iss` und tauscht per S256 | erfüllt am 27.10.2026 |
|
||||
| Nutzer-, Scope- und Ressourcenbindung | Ausgestellter Token ist gehasht persistiert und wird bei jedem Aufruf gegen Nutzer, Scope, Ablauf und `/mcp` geprüft | erfüllt am 27.10.2026 |
|
||||
| MCP-Kompatibilität | Legacy-Initialisierung `2025-11-25` sowie `server/discover` und `tools/list` mit `2026-07-28` über HTTP | erfüllt am 27.10.2026 |
|
||||
| Tatsächliche Leseanfrage | `tools/call` auf `list_pieces` liefert aus einer temporären Seed-Datenbank reale Pieces | erfüllt am 27.10.2026 |
|
||||
| Schreibschutz und Datenminimierung | Nur fünf Lese-Tools; Positivprojektionen ohne E-Mail, Uploadnamen, Dateipfade und Werkzeug-Arbeitsdaten | erfüllt am 27.10.2026 |
|
||||
| ChatGPT- und Cloudron-Verbindung | Kein Deployment und keine externe Clientumgebung vorhanden | offen |
|
||||
|
||||
- `npm run check`: 0 Fehler und 0 Warnungen.
|
||||
- Gezielter isolierter HTTP-Ablauf: OAuth Code Flow, PKCE, anonymer Challenge,
|
||||
Legacy-Initialisierung, aktuelle Discovery, Toolliste und echte
|
||||
`list_pieces`-Anfrage erfolgreich.
|
||||
- `npm run build`: erfolgreich mit `@sveltejs/adapter-node`.
|
||||
- Keine weitere Verhaltenstest- oder Browsermatrix gemäß Auftrag ausgeführt;
|
||||
die Zustimmungsseite wurde im HTTP-Ablauf geladen, aber nicht visuell geprüft.
|
||||
- Echte ChatGPT-Verbindung, öffentliche HTTPS-Erreichbarkeit und Cloudron-
|
||||
Reverse-Proxy-Verhalten bleiben bis zu einem ausdrücklich freigegebenen
|
||||
Deployment offen.
|
||||
|
||||
## Wartungsrelease 0.7.2
|
||||
|
||||
| Bereich | Nachweis | Stand |
|
||||
| ---------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
|
||||
| RSS-Auswahl im Eingang (#16) | Chromium wählt zwei Beiträge über Quellenfilter und zwei Seiten, öffnet den Originallink ohne Umschalten und importiert nur die Auswahl | erfüllt am 26.10.2026 |
|
||||
| Live-Menü nach Nutzerabsicht (#18) | Chromium prüft laufenden, pausierten und beendeten Zustand, direkte Timersteuerung, eingeklappte Ausgabe und erreichbare Navigation | erfüllt am 26.10.2026 |
|
||||
| RSS-/API-Verwaltung im Katalogstil (#21) | Chromium legt einen Feed an und bearbeitet ihn; API-Zugang, einmaliges Tokenkopieren und Berechtigungsänderung geprüft | erfüllt am 26.10.2026 |
|
||||
| Responsive Gestaltung und Farbschemata | RSS-Auswahl und Feed-Dialog mobil/dunkel, Verwaltung desktop/hell, Live-Menü mobil und bei 670 × 450 Pixeln geprüft | erfüllt am 26.10.2026 |
|
||||
| Erhalt von Daten, Rechten und Sicherheitslogik | 13 gezielte Feed-/Live-/Zugangstests sowie vollständiger Verhaltenstestlauf; keine Schemaänderung | erfüllt am 26.10.2026 |
|
||||
|
||||
- `npm test`: 60 von 60 Verhaltenstests erfolgreich.
|
||||
- `npm run lint`: erfolgreich.
|
||||
- `npm run check`: 0 Fehler und 0 Warnungen.
|
||||
- `npm run build`: erfolgreich mit `@sveltejs/adapter-node`.
|
||||
- `npm run test:e2e`: 20 von 20 Chromium-Abläufen erfolgreich.
|
||||
- Andere Browser und echte Mobilgeräte: offen.
|
||||
|
||||
## Wartungsrelease 0.7.1
|
||||
|
||||
| Bereich | Nachweis | Stand |
|
||||
| ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------- |
|
||||
| Abschnittsdauer und Rückkehr zu früheren Pieces (#1) | Live-Verhaltenstests für geänderte Plandauer, Wiederaufnahme, Abschnittslaufzeit und Gesamtzeit; Chromium-Ablauf | erfüllt am 26.10.2026 |
|
||||
| Mobiler Live-Ablauf und Metadaten (#3, #13) | mobile Live-Regie ohne horizontalen Überlauf; viewportgebundenes Sheet, Safe-Area-/Standalone-Basis und Fokus in Chromium | Chromium erfüllt; Safari und installierte iOS-Webapp offen |
|
||||
| Mobile Sendungskarten (#5) | responsive Karten im vollständigen Chromium-Lauf bei 390 Pixeln geöffnet | erfüllt am 26.10.2026 |
|
||||
| Vorbereitung nach Einplanung (#6, #15) | Migration und Servertest für konkrete Usage-Snapshots; Chromium öffnet die Usage und entfernt sie nach „sendefertig“ | erfüllt am 26.10.2026 |
|
||||
| Kontextabhängige Präsentation (#8) | vier serverseitig getrennte Modi; Fundus-/Usage-Vorschauen sowie Link-, Video-, Text-/Bildausgabe in Chromium | erfüllt am 26.10.2026 |
|
||||
| Gastansicht und Freigaben (#11, #12) | gestalteter Einzeldialog, Verwaltungsreihenfolge und Kartenpadding per Chromium; Tokenersatz mit Invalidierungstest | erfüllt am 26.10.2026 |
|
||||
| Iconsuche (#14) | Suchfokus innerhalb der öffnenden Bedienaktion; Chromium bei mobilen und breiten Ansichten | erfüllt am 26.10.2026 |
|
||||
|
||||
- `npm test`: 60 von 60 Verhaltenstests erfolgreich.
|
||||
- `npm run lint`: erfolgreich.
|
||||
- `npm run check`: 0 Fehler und 0 Warnungen.
|
||||
- `npm run build`: erfolgreich mit `@sveltejs/adapter-node`.
|
||||
- `npm run test:e2e`: 19 von 19 Chromium-Abläufen erfolgreich.
|
||||
- Safari auf echtem iOS-Gerät: offen.
|
||||
- Installierte Webapp auf echtem iOS-Gerät: separat offen.
|
||||
|
||||
## Etappe 7
|
||||
|
||||
| Kriterium | Nachweis | Stand |
|
||||
| -------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- | --------------------- |
|
||||
| Feedverwaltung und geplanter/manueller Abruf | Barkeeper-Oberfläche, Prozess-Scheduler und gemeinsame Abruffunktion | erfüllt am 25.10.2026 |
|
||||
| Getrennter Vorschau-Eingang | RSS-Beiträge erscheinen separat und werden nur nach Mehrfachauswahl zu Pieces | erfüllt am 25.10.2026 |
|
||||
| Kategoriezuordnung und Herkunft | Auswahlkategorien oder Feed-Standard sowie Original-URL als Piece-Quelle im Verhaltenstest | erfüllt am 25.10.2026 |
|
||||
| Dubletten und dauerhaftes Verwerfen | wiederholter Testabruf erzeugt keinen zweiten Eintrag und stellt Verworfenes nicht wieder her | erfüllt am 25.10.2026 |
|
||||
| HTML-Bereinigung und Abrufgrenzen | Testfeed entfernt fremdes HTML; Loopback wird vor Request blockiert; Größe, Zeit, Redirects und Eintragszahl sind begrenzt | erfüllt am 25.10.2026 |
|
||||
| Fehlerisolation | defekter lokaler Testfeed wird protokolliert, weiterer fälliger Feed trotzdem importiert | erfüllt am 25.10.2026 |
|
||||
| Versionierte REST-API und OpenAPI | `/api/v1` für Pieces, Sendungen und Einplanungen; `/api/v1/openapi.json` | erfüllt am 25.10.2026 |
|
||||
| Begrenzte und widerrufbare Zugänge | gehashte Tokens; Verhaltenstest für Lesen, verweigertes Schreiben und sofortigen Widerruf | erfüllt am 25.10.2026 |
|
||||
| Änderungsnachweis und Idempotenz | Audit-Ereignisse und persistente Idempotenz; identische Wiederholung liefert dasselbe Ergebnis | erfüllt am 25.10.2026 |
|
||||
| API-Rundlauf | echter HTTP-Test: lesen, anlegen, ändern, erneut lesen, einplanen und sortieren | erfüllt am 25.10.2026 |
|
||||
| Nutzung ohne KI | RSS und API sind optional; bestehende Redaktion funktioniert unverändert ohne externen Client | erfüllt am 25.10.2026 |
|
||||
| Konkrete ChatGPT-/Codex-Anbindung | keine Clientumgebung oder Zugangsdaten vorhanden | offen |
|
||||
|
||||
- `npm run check`: 0 Fehler und 0 Warnungen.
|
||||
- `npm test`: 58 von 58 Verhaltenstests erfolgreich.
|
||||
- Gezielte Etappe-7-Tests: 6 von 6 erfolgreich.
|
||||
- `npm run build`: erfolgreich mit `@sveltejs/adapter-node`.
|
||||
- `npm audit --omit=dev`: 0 gemeldete Schwachstellen.
|
||||
- Gezielte Chromium-Prüfung: Desktop-Verwaltung, mobiler Eingang und kompletter
|
||||
HTTP-API-Rundlauf erfolgreich, keine Konsolenfehler.
|
||||
- `npm run test:e2e`: auf dem Standardport wegen eines bereits laufenden fremden
|
||||
Prozesses nicht startbar; identische temporäre Konfiguration auf Port 4188 mit
|
||||
16 von 18 erfolgreichen Abläufen. Bekannte Fehler bleiben bei Live-Zeitanzeige
|
||||
und Abschluss/Freigabe bestehen.
|
||||
- `npm run lint`: nicht erfolgreich wegen acht bereits vorhandener
|
||||
Prettier-Abweichungen außerhalb der Etappe-7-Dateien; geänderte Dateien wurden
|
||||
separat formatiert.
|
||||
- Dokumentationsstatus: **API/MCP getestet, Client-Anbindung offen**. Konkret ist
|
||||
die REST-API getestet; ein zusätzlicher MCP-Adapter wurde nicht benötigt und
|
||||
keine echte ChatGPT-/Codex-Verbindung hergestellt.
|
||||
|
||||
## Wartungsrelease 0.6.1
|
||||
|
||||
| Bereich | Stand |
|
||||
| ---------------------------------------------------- | ------------------------------------------------------------------------------------------- |
|
||||
| Live-Timer, Kopfzeile, Drawer und Positionsanzeige | behoben |
|
||||
| Mobile Formulare und Iconsuche | behoben |
|
||||
| Vorbereitungsaufwand und Übersicht | behoben |
|
||||
| Bild-Präsentationsmodus | behoben |
|
||||
| Twitch-Tags je Abschnitt | behoben |
|
||||
| Sendungskarten und Gastabstände | behoben |
|
||||
| Gemeinsamer Freigabedialog einschließlich Live-Regie | behoben |
|
||||
| Editorzustand und Drag-and-drop | bestehende zustandserhaltende bzw. alternative Bedienwege unverändert; Browserprüfung offen |
|
||||
|
||||
- `npm run check`: 0 Fehler und 0 Warnungen.
|
||||
- `npm test`: 52 von 52 Verhaltenstests erfolgreich.
|
||||
- `npm run build`: erfolgreich.
|
||||
- `npm run test:e2e`: zweiter Lauf mit 14 erfolgreichen Abläufen; Live-Regie und
|
||||
Abschluss/Freigaben schlugen fehl, zwei nachfolgende Abläufe wurden wegen des
|
||||
120-Sekunden-Zeitlimits nicht mehr ausgeführt. Die Browsermatrix ist offen.
|
||||
- Safari auf echtem iOS-Gerät: nicht verfügbar.
|
||||
|
||||
## Etappe 1
|
||||
|
||||
| Kriterium | Nachweis | Stand |
|
||||
@@ -425,31 +541,118 @@
|
||||
## Kompakte Live-Regie 0.5.12
|
||||
|
||||
| Kriterium | Nachweis | Stand |
|
||||
| ------------------------------------------- | ------------------------------------------------------------------------------------------------ | --------------------- |
|
||||
| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | --------------------- |
|
||||
| Globale Navigation bleibt aus der Regie | Chromium findet weder Seitenleiste noch mobilen App-Header oder Bottomnavigation | erfüllt am 24.10.2026 |
|
||||
| Kleines Desktopfenster bleibt zweispaltig | Chromium prüft Moderation, Ablauf und feste Aktionen bei 900 × 450 Pixeln | erfüllt am 24.10.2026 |
|
||||
| Niedrige Desktophöhe wird berücksichtigt | 900 × 450 aktiviert kompakte Abstände ohne Transform oder CSS-Zoom | erfüllt am 24.10.2026 |
|
||||
| Zweizeiliger Kopf gewinnt Inhaltsfläche | Chromium begrenzt die Kopfhöhe bei 670 × 450 und prüft die unveränderte feste Aktionsleiste | erfüllt am 24.10.2026 |
|
||||
| Lange Kopftitel bleiben kontrolliert | Abschnitt und Folgetitel kürzen einzeilig und öffnen vollständig per Klick, Enter und Escape | erfüllt am 24.10.2026 |
|
||||
| Regiemenü bleibt sichtbar und erreichbar | Browser prüft Viewportgrenzen, Scrollzugang, Sendungsname und Aktionen bei 1280, 670 und 390 Pixeln | erfüllt am 24.10.2026 |
|
||||
| Menü schließt zugänglich | Escape und Außenklick schließen das Popover und führen den Fokus zum Auslöser zurück | erfüllt am 24.10.2026 |
|
||||
| Lange Inhalte scrollen innerhalb der Fläche | Synthetischer Langtext und zusätzliche Ablaufabschnitte erzeugen zwei unabhängige Scroller | erfüllt am 24.10.2026 |
|
||||
| Mobile Regie verwendet ein Ablauf-Sheet | 390 × 700 prüft Endlage, Fokus, Escape, Aktionsschließen und Wechsel auf 900 Pixel | erfüllt am 24.10.2026 |
|
||||
| Leseposition bleibt am Piece | Nach tiefem Scrollen beginnt ein direkt gewähltes anderes Piece am oberen Rand | erfüllt am 24.10.2026 |
|
||||
| Zustände sind ausgeschrieben | Ablauf prüft Kommend, Aktuell, Erledigt und Übersprungen | erfüllt am 24.10.2026 |
|
||||
| Erstes und letztes Piece direkt wählbar | Browser wechselt per stabiler Usage-ID auf Desktop und aus dem mobilen Sheet in beide Richtungen | erfüllt am 24.10.2026 |
|
||||
| Navigation veröffentlicht nicht automatisch | Öffentliche Ausgabe bleibt bei direkter Auswahl unverändert | erfüllt am 24.10.2026 |
|
||||
| Zurück ist reine Betrachtungsnavigation | Browser prüft unverändertes aktuelles Piece, Countdown und Ausgabe sowie gesperrte Fortschrittsaktionen | erfüllt am 24.10.2026 |
|
||||
| Timer und Livezustand überleben Reload | Aktuelles Piece und laufender Abschnittscountdown bleiben nach Neuladen erhalten | erfüllt am 24.10.2026 |
|
||||
| Wiederaufnahme nur bei Unterbrechung | Während eines aktiven Pieces fehlt die Aktion; nach unterbrochenem Stand ist sie prominent | erfüllt am 24.10.2026 |
|
||||
| Sendungsende ist eindeutig | Letztes Piece zeigt Endaktion ohne horizontalen Überlauf; danach fehlen Weiter-Aktionen | erfüllt am 24.10.2026 |
|
||||
| Liste und Kalender nutzen dieselben Daten | Chromium wechselt zwischen beiden Ansichten; Sendungslinks bleiben identisch erreichbar | erfüllt am 24.10.2026 |
|
||||
| Kalenderpräferenz bleibt am Konto | Service- und Browsertest prüfen Standardwert, Speicherung und Reload | erfüllt am 24.10.2026 |
|
||||
| Monat und Berliner Tage sind korrekt | Unit-Tests prüfen Monatsgrenzen und UTC-Zuordnung; Browser prüft Monatswechsel und heutigen Tag | erfüllt am 24.10.2026 |
|
||||
| Mehrere und terminlose Sendungen bleiben sichtbar | Desktopkalender und mobile Agenda zeigen zwei Termine am Tag; eigener Bereich zeigt offenen Termin | erfüllt am 24.10.2026 |
|
||||
|
||||
## Ausgeführte Prüfungen 0.5.12
|
||||
|
||||
- `npm run lint`: erfolgreich
|
||||
- `npm run check`: 0 Fehler und 0 Warnungen
|
||||
- `npm test`: 40 Tests in 7 Dateien erfolgreich
|
||||
- gezielter Live-Regie-Lauf: 1 von 1 Chromium-Test erfolgreich
|
||||
- `npm run test:e2e`: 16 von 16 Chromium-Browsertests erfolgreich
|
||||
- Screenshots der Live-Regie bei 1440 × 900, 900 × 450 und 390 × 700 Pixeln
|
||||
einschließlich mobilem Ablauf-Sheet visuell kontrolliert
|
||||
- `npm test`: 44 Tests in 8 Dateien erfolgreich
|
||||
- gezielte Kalender- und Live-Regie-Läufe: 2 von 2 Chromium-Tests erfolgreich
|
||||
- `npm run test:e2e`: 17 von 17 Chromium-Browsertests erfolgreich
|
||||
- Browserprüfungen der Live-Regie bei 1440 × 900, 900 × 450, 670 × 450 und
|
||||
390 × 700 Pixeln sowie des Kalenders bei 1440 × 1000 und 390 × 844 Pixeln
|
||||
erfolgreich
|
||||
- `npm run build`: erfolgreich mit `@sveltejs/adapter-node`
|
||||
- Versionsgleichheit `0.5.12` in Paket, Lockdatei und Cloudron-Manifest geprüft
|
||||
- `bash -n start.sh` und `git diff --check`: erfolgreich
|
||||
- reale OBS-Browserquelle, echte YouTube-/TikTok-Wiedergabe und Safari auf einem
|
||||
iOS-Gerät nicht ausgeführt; Anbieterrequests wurden lokal abgefangen
|
||||
|
||||
## Erweiterte Live-Steuerung 0.5.12
|
||||
|
||||
| Kriterium | Stand |
|
||||
| ---------------------------------------------- | ---------------------------- |
|
||||
| Gemeinsame persistente Pause | implementiert, nicht geprüft |
|
||||
| Abschnitts- und Gesamtreset bleiben unabhängig | implementiert, nicht geprüft |
|
||||
| Gesamt-/Restzeit ohne Doppelerfassung | implementiert, nicht geprüft |
|
||||
| Ende, Wiederaufnahme und neuer Lauf getrennt | implementiert, nicht geprüft |
|
||||
| Privates Feld „Interaktion“ durch alle Kopien | implementiert, nicht geprüft |
|
||||
| Öffentliche Positivliste unverändert | implementiert, nicht geprüft |
|
||||
| Classic-Regular-Icons und Drawer-Schließen | gezielt im Browser geprüft |
|
||||
|
||||
Für die ursprüngliche Erweiterung wurden auf ausdrücklichen Auftrag zunächst
|
||||
keine Prüfungen ausgeführt. Die nachfolgenden Korrekturen weisen inzwischen
|
||||
Migration, Typen, Build, bestehendes Liveverhalten und die betroffenen
|
||||
Oberflächen gezielt nach; die übrigen neuen Timer- und Statusfälle bleiben ohne
|
||||
vollständige erneute Matrix.
|
||||
|
||||
## Live-500-Korrektur 0.5.12
|
||||
|
||||
- Ursache auf einer schreibgeschützt untersuchten lokalen Datenbank bestätigt:
|
||||
`0013` war protokolliert, `live_show_timer_runs` fehlte jedoch.
|
||||
- `0014_live_show_timer_repair.sql` auf einer Kopie dieser Datenbank angewendet
|
||||
und erneut ausgeführt; Tabelle und Indizes wurden angelegt, 13 bestehende
|
||||
Intervalle genau einmal übernommen und ein offenes Intervall erhalten.
|
||||
- `npm run check`: 0 Fehler und 0 Warnungen.
|
||||
- `npm run test:unit -- --run src/lib/server/live.spec.ts`: 6 Tests erfolgreich.
|
||||
- `npm run build`: erfolgreich mit `@sveltejs/adapter-node`.
|
||||
|
||||
## Live-Icons und kompakte Sendungskarten 0.5.12
|
||||
|
||||
- `npm run check`: 0 Fehler und 0 Warnungen.
|
||||
- `npm run test:unit -- --run src/lib/server/live.spec.ts`: 6 Tests erfolgreich.
|
||||
- `npm run build`: erfolgreich mit `@sveltejs/adapter-node`.
|
||||
- Gezielter Chromium-Ablauf der Sendungsübersicht mit Desktopkalender, mobiler
|
||||
Agenda und Rückkehr zur Liste: erfolgreich.
|
||||
- Vollständiger bestehender Live-Regie-Ablauf einschließlich 900 × 450,
|
||||
670 × 450 und 390 × 700 Pixeln: erfolgreich; Iconleiste, Kopfhöhe,
|
||||
Viewportgrenzen und horizontaler Überlauf geprüft.
|
||||
- Zusätzliche visuelle Chromium-Prüfung bei 656 × 400 und 390 × 700 Pixeln:
|
||||
Sendungskarte unter 130 Pixel hoch, Menü-/Ausgabe-/Timericons sichtbar und
|
||||
Pausebutton wechselt bedienbar zu Fortsetzen.
|
||||
|
||||
## Etappe 6
|
||||
|
||||
| Kriterium | Nachweis | Stand |
|
||||
| -------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------- | --------------------- |
|
||||
| Spätere Originaländerung verändert Historie nicht | Verhaltenstest ändert Piece und Abschnittskategorie nach Abschluss; historische Snapshots bleiben gleich | erfüllt am 25.10.2026 |
|
||||
| Abschluss nicht doppelt; übersprungen ist nicht gesendet | idempotente Befehlswiederholung, fremde Befehls-ID und materialisierte Usage-Historie im Verhaltenstest | erfüllt am 25.10.2026 |
|
||||
| Bewusste Auswahl archiviert nur gewählte Originale | Abschlusskandidaten und explizite Archivauswahl im Service; Dialog trennt gesendet, übersprungen und offen | erfüllt am 25.10.2026 |
|
||||
| Archivierte Sendung stabil und duplizierbar | Service- und Browsertest prüfen Nur-Lese-Ansicht sowie neuen Entwurf ohne Live-, Historien- oder Freigabedaten | erfüllt am 25.10.2026 |
|
||||
| Gast sieht genau eine Sendung und nur erlaubte Felder | anonymer Chromium-Kontext und Scope-Verhaltenstests für Ablauf, Moderation und Recherche | erfüllt am 25.10.2026 |
|
||||
| Gast-Schreibzugriff und fremde IDs abgelehnt | anonymer direkter POST erhält 403; fremde Medien-ID erhält 404 | erfüllt am 25.10.2026 |
|
||||
| Passwort, Ablauf und Widerruf schützen direkte Aufrufe | Service- und Browsertests prüfen Seite, Gast-Sitzung und direkten Medienrequest vor und nach Widerruf | erfüllt am 25.10.2026 |
|
||||
| Barkeeper verwaltet Freigaben | Anlage, Bearbeitung und Löschung direkt in der Sendung sowie gruppiert in der Verwaltung im Browser geprüft | erfüllt am 25.10.2026 |
|
||||
| Offene Sendungen sind sicher freigebbar | Service und anonymer Browser prüfen aktuellen Plan vor Abschluss und stabilen Stand danach | erfüllt am 25.10.2026 |
|
||||
| Bestehende Abschlüsse werden einmalig übernommen | Upgrade-Test wendet `0015` auf einen Stand bis `0014` zweimal an und findet genau eine Historie | erfüllt am 25.10.2026 |
|
||||
| Bestehende Freigaben bleiben bei Erweiterung erhalten | Migration `0016` ersetzt nur die Fremdschlüsselgrenze und kopiert Freigaben sowie Gast-Sitzungen | erfüllt am 25.10.2026 |
|
||||
|
||||
## Ausgeführte Prüfungen Etappe 6
|
||||
|
||||
- `npm run check`: 0 Fehler und 0 Warnungen
|
||||
- `npm test`: 52 Tests in 11 Dateien erfolgreich
|
||||
- gezielter Chromium-Ablauf für Abschluss, Archiv, historische Ansicht,
|
||||
offene und abgeschlossene Freigabe, Bearbeitung und Löschung in beiden
|
||||
Barkeeper-Oberflächen, Passwort, privaten Scope, Reserve-Medienschutz, fremde
|
||||
ID und Gast-POST: 1 von 1 erfolgreich
|
||||
- `npm run test:e2e`: nach Korrektur eines bestehenden, auf den 24. Oktober
|
||||
festgelegten „Heute“-Fixtures 18 von 18 Chromium-Browsertests erfolgreich
|
||||
- Browserprüfung von Sendungsfreigabe und Gastansicht bei 390 × 844 Pixeln sowie
|
||||
der Verwaltung bei 1280 × 900 Pixeln ohne horizontalen Überlauf; Screenshots
|
||||
visuell kontrolliert
|
||||
- `npm run build`: erfolgreich mit `@sveltejs/adapter-node`
|
||||
- `npm run lint`: Prettier und ESLint erfolgreich
|
||||
- Versionsgleichheit `0.6.0` in Paket, Lockdatei und Cloudron-Manifest geprüft
|
||||
- `bash -n start.sh` und `git diff --check`: erfolgreich
|
||||
+210
-17
@@ -3,7 +3,7 @@
|
||||
## Systemgrenze
|
||||
|
||||
Sendewerk ist ein einzelner SvelteKit-Prozess. Browserseiten, serverseitige
|
||||
Actions, spätere REST-Endpunkte und Hintergrundaufgaben verwenden dieselbe
|
||||
Actions, REST-Endpunkte und Hintergrundaufgaben verwenden dieselbe
|
||||
Geschäftslogik. SQLite und ein lokales Upload-Verzeichnis sind die einzigen
|
||||
persistenten Laufzeitabhängigkeiten. Externe Mail-, RSS- oder KI-Dienste sind
|
||||
nicht Voraussetzung für Kernfunktionen.
|
||||
@@ -11,7 +11,7 @@ nicht Voraussetzung für Kernfunktionen.
|
||||
```text
|
||||
Browser -> SvelteKit-Routen -> Anwendungsdienste -> SQLite
|
||||
| -> Upload-Verzeichnis
|
||||
+-> später: Mail/RSS über Adapter
|
||||
+-> Mail/RSS über begrenzte Adapter
|
||||
```
|
||||
|
||||
Servercode lebt unter `src/lib/server` und darf nicht in Browser-Bundles
|
||||
@@ -33,17 +33,17 @@ spätere API dieselben Regeln verwenden.
|
||||
|
||||
## Gesamtdatenmodell
|
||||
|
||||
Die ersten fünf Etappen materialisieren Identität, Inhaltsverwaltung,
|
||||
Sendungsplanung und Live-Durchführung. Folgende Grenzen gelten für umgesetzte
|
||||
und spätere Bereiche.
|
||||
Die ersten sieben Etappen materialisieren Identität, Inhaltsverwaltung,
|
||||
Sendungsplanung, Live-Durchführung, Historie, Lesefreigaben, RSS-Import und eine
|
||||
technische API. Folgende Grenzen gelten für umgesetzte und spätere Bereiche.
|
||||
|
||||
| Bereich | Geplante Entitäten und Beziehungen |
|
||||
| ----------- | ----------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| Identität | `users`, Rollen, Sessions, Einladungen, Reset-Tokens und Sperren sind umgesetzt; technische Zugänge folgen später |
|
||||
| ----------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| Identität | `users`, Rollen, Sessions, Einladungen, Reset-Tokens und Sperren sowie getrennte technische Zugänge |
|
||||
| Taxonomie | getrennte `section_categories`, `formats`, `topics` samt optionalem Themenicon; Pieces und Vorschläge mehrfach verknüpft |
|
||||
| Inhalt | `pieces` mit Status, Soft Delete, Favorit, Revision, Texten, Quellen, Werkzeugen und privaten Medien; Vorlagen speichern Snapshots |
|
||||
| Sendungsbau | `shows`, geordnete `show_sections`, `piece_usages` samt Quellen-/Werkzeug-/Themen-/Mediensnapshots, Reservebank und Vorlagen |
|
||||
| Live | expliziter Live-Stand, aktuelles Element, tatsächliche Piece-Zeiten, persistente Abschnittstimer und getrennte Präsentationsausgabe |
|
||||
| Live | expliziter Live-Stand, aktuelles Element, tatsächliche Piece-Zeiten, persistente Abschnitts-/Gesamttimer und getrennte Präsentationsausgabe |
|
||||
| Historie | unveränderliche Abschluss-Snapshots und Verwendungshistorie; Übersprungenes zählt nicht als gesendet |
|
||||
| Freigaben | widerrufbare, gehashte Lesetokens mit Sendung, Umfang, Passwortoption und Ablaufzeit |
|
||||
| RSS | Feedquellen, Abrufläufe und externe Einträge mit stabiler Herkunfts-ID sowie Status neu/übernommen/verworfen |
|
||||
@@ -68,6 +68,10 @@ Ein Live-Abschnittstimer entsteht ausschließlich beim tatsächlichen Eintritt i
|
||||
einen Abschnitt mit positiver expliziter Dauer. Er speichert dieses Soll als
|
||||
unveränderlichen Wert und summiert eigene Laufintervalle; Piece-Wechsel im
|
||||
selben Abschnitt erzeugen deshalb weder Reset noch doppelte Piece-Laufzeit.
|
||||
Der Gesamttimer speichert ebenfalls mehrere Laufintervalle. Eine gemeinsame
|
||||
Pause schließt die offenen Piece-, Abschnitts- und Gesamtintervalle; Fortsetzen
|
||||
öffnet neue Intervalle, ohne die Pause als Laufzeit zu zählen. Abschnitts- und
|
||||
Gesamtreset ersetzen ausschließlich die jeweilige Zeitbasis.
|
||||
|
||||
## Anmeldung und Rechte
|
||||
|
||||
@@ -95,6 +99,43 @@ konfigurierten Outbox-Pfad, `smtp` nutzt Nodemailer nur nach expliziter Auswahl.
|
||||
Die feste Anwendungs-Origin erzeugt Links und bestimmt den `Secure`-Status der
|
||||
Cookies; sie wird nicht aus ungeprüften Request-Headern übernommen.
|
||||
|
||||
Technische Zugänge sind keine Browsersitzungen. Sie besitzen zufällige
|
||||
Bearer-Tokens, von denen nur SHA-256-Hashes gespeichert werden, und genau einen
|
||||
der Umfänge `read` oder `read_write`. Widerruf wirkt beim nächsten Request.
|
||||
`/api/v1` umgeht lediglich den Browser-Loginredirect; jeder Endpunkt prüft Token
|
||||
und erforderlichen Umfang selbst. Schreibzugriffe hinterlassen ein
|
||||
`audit_event`; Neuanlage und Planungsänderungen verlangen zusätzlich einen je
|
||||
Zugang eindeutigen, persistent gespeicherten Idempotenzschlüssel.
|
||||
|
||||
## RSS-Import
|
||||
|
||||
`src/lib/server/feeds.ts` bildet Abruf, XML-Verarbeitung und Übernahme gemeinsam
|
||||
für manuelle Aktionen und den Prozess-Scheduler ab. Der Scheduler startet beim
|
||||
ersten Request und prüft minütlich höchstens zehn fällige aktive Feeds. Jeder
|
||||
Feed wird getrennt behandelt, sodass ein Fehler weitere Abrufe nicht stoppt.
|
||||
HTTP-Abrufe erlauben nur HTTP(S) auf Standardports, prüfen DNS sowie jedes
|
||||
Redirectziel gegen interne Adressen und begrenzen Laufzeit, Redirects und
|
||||
Antwortgröße. RSS/Atom wird mit deaktivierter Entity-Verarbeitung gelesen;
|
||||
höchstens 200 Einträge je Antwort werden berücksichtigt und fremdes HTML wird zu
|
||||
reinem Text reduziert.
|
||||
|
||||
`feed_entries` ist ein eigener Eingang. `(feed_id, external_id)` verhindert
|
||||
Dubletten; Aktualisierungen ändern den redaktionellen Status nicht. `discarded`
|
||||
bleibt deshalb auch nach späteren Abrufen erhalten. Erst die bewusste
|
||||
Mehrfachauswahl erzeugt innerhalb einer Transaktion normale Inbox-Pieces mit
|
||||
Kategorien und Original-URL als Quelle und setzt den Eintrag auf `imported`.
|
||||
|
||||
## Technische REST-API
|
||||
|
||||
Die Routen unter `/api/v1` bilden keine zweite Fachlogik, sondern rufen
|
||||
`content.ts` und `shows.ts` auf. Piece- und Sendungsrevisionen schützen weiterhin
|
||||
vor verlorenen Änderungen. `api_idempotency` speichert Request-Hash, Status und
|
||||
JSON-Antwort, sodass wiederholte Schreibbefehle dasselbe Ergebnis liefern und
|
||||
ein gleicher Schlüssel mit verändertem Inhalt abgewiesen wird. Die OpenAPI-3.1-
|
||||
Beschreibung ist unter `/api/v1/openapi.json` erreichbar. Ein MCP-Adapter oder
|
||||
produktspezifischer KI-Client gehört nicht zur Laufzeit und ist nicht
|
||||
Voraussetzung für die Bedienung.
|
||||
|
||||
## Inhalte, Markdown und Medien
|
||||
|
||||
Etappe 3 führt die Inhaltslogik in `src/lib/server/content.ts` zusammen. Listen
|
||||
@@ -156,7 +197,7 @@ erhöht sie atomar. Abgeschlossene Sendungen sind bereits an dieser Grenze gegen
|
||||
weitere Bearbeitung geschützt.
|
||||
|
||||
Beim Einplanen werden Titel, Dauer, Einleitung, Recherche, Moderation,
|
||||
Überleitung und der vollständige Präsentationszustand aus dem sendefertigen
|
||||
Interaktion, Überleitung und der vollständige Präsentationszustand aus dem sendefertigen
|
||||
Piece kopiert. Dazu gehören Modus, ausgewählte Quelladresse samt Zeitmarke,
|
||||
Metadaten und validierte Anbieter-ID. Zusätzlich speichern eigene geordnete
|
||||
Tabellen alle Quellen, Werkzeugnamen samt Start-/Arbeitslink und Notiz, die
|
||||
@@ -192,6 +233,13 @@ Sendungsvorlagen und ihre Abschnitte sind eigene Tabellen. Beim Anlegen werden
|
||||
die Abschnitte mit neuen IDs kopiert; spätere Änderungen an der Sendung können
|
||||
die Vorlage deshalb nicht verändern.
|
||||
|
||||
Die Sendungsübersicht leitet Liste, Desktop-Monatsraster und mobile Monatsagenda
|
||||
aus derselben `listShows()`-Abfrage ab. UTC-Zeitpunkte werden erst für Gruppierung
|
||||
und Anzeige nach `Europe/Berlin` in zivile Kalendertage übersetzt. Sendungen ohne
|
||||
Startzeit bleiben in einem eigenen Bereich sichtbar. `users.show_overview_view`
|
||||
speichert ausschließlich die kontobezogene Darstellungspräferenz; der gewählte
|
||||
Monat bleibt URL-Zustand und verändert keine Sendungsdaten.
|
||||
|
||||
Die Direktanlage aus einer Sendung erzeugt Piece und Verwendung innerhalb einer
|
||||
verschachtelbaren SQLite-Transaktion. `planning_commands` speichert die
|
||||
Befehls-ID und das Ergebnis, sodass ein wiederholter Request dieselben IDs
|
||||
@@ -226,6 +274,14 @@ liegen als mehrere Start-/Endintervalle je Verwendung vor. Damit bleiben
|
||||
Zurückgehen, Wiederaufnahme und bereits abgeschlossene Laufzeit getrennt von der
|
||||
geplanten Dauer nachvollziehbar.
|
||||
|
||||
`live_show_timer_runs` hält die unabhängige Gesamtzeit. Pause und Fortsetzen
|
||||
behandeln Gesamt-, Abschnitts- und Piece-Intervalle gemeinsam. Beenden schließt
|
||||
laufende Intervalle und setzt `ended_at_utc`, finalisiert die Sendung aber noch
|
||||
nicht. Eine ausdrückliche Wiederaufnahme bewahrt Zeiten und Fortschritt; nur
|
||||
„Neuer Durchlauf“ verwirft Laufintervalle und setzt die Piece-Status zurück. Die
|
||||
Restzeitschätzung verwendet je Abschnitt entweder die positive Abschnittsdauer
|
||||
oder die verbleibenden Piece-Dauern und zählt beide nie zusammen.
|
||||
|
||||
Die interne Route `/live` benötigt weiterhin eine aktive Sitzung und darf
|
||||
Recherche, Moderation und eigene Arbeitsdaten lesen. Die separate Ausgabe nutzt
|
||||
den stabilen Kanal `/heinzlive/default` in einem reduzierten Layout ohne
|
||||
@@ -236,15 +292,20 @@ rohen Schlüssel, weil die angemeldete Steuerung dieselbe stabile OBS-Adresse
|
||||
erneut ausgeben können muss. Datenbank und Sicherungen sind deshalb Teil der
|
||||
Geheimnisgrenze. Eine Rotation widerruft den bisherigen Schlüssel, normales
|
||||
erneutes Öffnen behält ihn bei.
|
||||
Page, Polling-JSON und Proxyrouten leiten ihre Daten aus einer eigenen
|
||||
Das private Markdownfeld „Interaktion“ wird am Original und als
|
||||
Verwendungssnapshot gespeichert und ausschließlich in der authentifizierten
|
||||
Live-Regie gerendert. Page, Polling-JSON und Proxyrouten leiten ihre Daten aus einer eigenen
|
||||
Positivliste ab. Private Quellen-/Werkzeug-Snapshots, Arbeitslinks, Notizen und
|
||||
Uploads werden nicht veröffentlicht; nur Themennamen sowie die ausdrücklich
|
||||
gewählte Link- oder Videoquelle und deren erlaubte Vorschau-URL können die
|
||||
Grenze passieren.
|
||||
Normale Auswahl, Fortschaltung oder Wiederaufnahme verändern den
|
||||
Präsentationsstand nicht. Die öffentliche Projektion liest ausschließlich den
|
||||
gespeicherten Verwendungssnapshot; spätere Änderungen am Original erscheinen
|
||||
erst nach einer ausdrücklichen Snapshot-Aktualisierung.
|
||||
Lokale Betrachtungsnavigation, Fortschaltung oder Wiederaufnahme verändern den
|
||||
Präsentationsstand nicht. Zurück und die Auswahl einer Ablaufzeile wechseln nur
|
||||
den im Browser betrachteten Verwendungssnapshot; tatsächliches Live-Piece,
|
||||
Status, Timer und Ausgabe bleiben serverseitig unverändert. Die öffentliche
|
||||
Projektion liest ausschließlich den ausdrücklich präsentierten
|
||||
Verwendungssnapshot; spätere Änderungen am Original erscheinen erst nach einer
|
||||
ausdrücklichen Snapshot-Aktualisierung.
|
||||
|
||||
Linkmetadaten werden nur auf ausdrückliche Aktion durch
|
||||
`src/lib/server/presentation.ts` geladen. Jeder HTTP(S)-Abruf löst den Zielhost
|
||||
@@ -270,6 +331,52 @@ sichtbar; die Oberfläche kennzeichnet den Abbruch und versucht die Verbindung
|
||||
mit verlangsamtem Intervall erneut. Private Live-Daten werden nicht Teil dieses
|
||||
Zustandsobjekts.
|
||||
|
||||
## Abschluss, Historie und Lesefreigaben
|
||||
|
||||
`src/lib/server/completion.ts` ist die Transaktionsgrenze des endgültigen
|
||||
Sendungsabschlusses. Er verlangt einen beendeten Live-Lauf sowie passende Show-
|
||||
und Live-Revisionen. Eine Befehls-ID in `show_finalizations` macht Wiederholungen
|
||||
idempotent. In derselben Transaktion werden offene Intervalle geschlossen,
|
||||
Abschnittskategorien eingefroren, ausschließlich erledigte Verwendungen außerhalb
|
||||
der Reservebank in `piece_usage_history` materialisiert, bewusst gewählte
|
||||
Fundus-Originale archiviert und die Sendung auf `completed` gesetzt. Jede normale
|
||||
Planungs- und Live-Mutation sperrt diesen Zustand.
|
||||
|
||||
Die eigentlichen Sendungstexte, Quellen, Werkzeuge, Themen und Medien liegen
|
||||
weiterhin in den beim Einplanen erzeugten Usage-Snapshots. Finalisierung friert
|
||||
die zuvor noch katalogabhängige Abschnittskategorie ein. Abgeschlossene
|
||||
Sendungen werden ausschließlich gelesen oder vollständig in einen neuen Entwurf
|
||||
dupliziert. Das Duplikat erhält neue Show-, Abschnitts-, Usage- und Relations-IDs,
|
||||
offene Usage-Status und weder Live-, Historien- noch Freigabedaten.
|
||||
|
||||
`src/lib/server/shares.ts` erzeugt für Barkeeper zufällige 256-Bit-Lesetokens;
|
||||
SQLite speichert nur SHA-256-Hashes. Eine Freigabe verweist direkt auf eine
|
||||
Sendung und darf deshalb bereits im Entwurf, im bereiten oder im laufenden
|
||||
Zustand entstehen. Der Umfang ist eine Positivliste aus `rundown`, `moderation`
|
||||
oder `research`. Optionale Passwörter liegen als Argon2id-Hash vor. Nach
|
||||
erfolgreicher Prüfung entsteht eine höchstens zwölf Stunden gültige, ebenfalls
|
||||
nur gehashte Gast-Sitzung; Fehlversuche werden pro Link und Clientadresse
|
||||
begrenzt. Änderungen an Umfang, Passwort oder Ablauf invalidieren bestehende
|
||||
Gast-Sitzungen. Ablauf und Löschung werden bei jedem HTML-, Seitendaten- und
|
||||
Medienrequest erneut geprüft.
|
||||
|
||||
Die öffentliche Route `/freigabe/[token]` erhält keine interne Sendungs-ID und
|
||||
keinen ungefilterten `Show`-Datensatz. Sie projiziert genau die am Token gebundene
|
||||
Sendung und nur die Felder ihres Umfangs. Vor dem Abschluss werden aktuelle
|
||||
Sendungs- und Usage-Snapshots bei jedem Aufruf neu gelesen; danach liefert
|
||||
dieselbe Projektion die durch die Finalisierung stabilisierten Snapshots. Die
|
||||
separate Medienroute akzeptiert ausschließlich das ausdrücklich gewählte
|
||||
Präsentationsmedium einer eingeplanten Nicht-Reserve-Verwendung derselben
|
||||
Sendung. Private `/media`-Dateien bleiben weiterhin an eine Redaktionssitzung
|
||||
gebunden.
|
||||
|
||||
Die wiederverwendbare Barkeeper-Komponente `ShareManagement.svelte` liegt direkt
|
||||
in der Sendungsbearbeitung und in der Verwaltung. Beide Routen verwenden
|
||||
dieselben Servicefunktionen für Anlage, Bearbeitung und Löschung; die
|
||||
Sendungsroute bindet Mutationen zusätzlich an ihre eigene Sendungs-ID. Die
|
||||
Verwaltung gruppiert bestehende Freigaben nach Sendung und zeigt deren aktuellen
|
||||
Status und Termin.
|
||||
|
||||
## Oberflächenstruktur
|
||||
|
||||
Die Hauptnavigation umfasst Eingang, Fundus, Sendungen, Archiv und Verwaltung.
|
||||
@@ -279,6 +386,10 @@ die untere Hauptnavigation die Seitenleiste vollständig. Auf breiten Ansichten
|
||||
stehen Fundus und Ablauf nebeneinander. Bis einschließlich `72rem` werden sie
|
||||
über eine gut erreichbare Umschaltung einzeln gezeigt, damit auch schmale
|
||||
Desktopfenster ohne horizontalen Überlauf bedienbar bleiben.
|
||||
Die Sendungsübersicht schaltet über zwei gleichwertige Formularaktionen zwischen
|
||||
Liste und Kalender um. Auf breiten Ansichten erscheint ein siebenspaltiges
|
||||
Monatsraster ohne Termin-Drag-and-drop; bis `52rem` ersetzt es eine lineare,
|
||||
touchfreundliche Agenda desselben Monats.
|
||||
Der Live-Modus ist eine eigene, fokussierte Arbeitsansicht. Die
|
||||
Präsentationsausgabe verwendet eine separate, strikt reduzierte Datenansicht
|
||||
ohne interne Anwendungsnavigation.
|
||||
@@ -292,9 +403,18 @@ Sheet; eine geringe Desktophöhe verdichtet zusätzlich Abstände und Leisten,
|
||||
ohne Schrift oder Oberfläche zu skalieren. Unterhalb des schmalen Breakpoints
|
||||
wird ausschließlich die Ablaufspalte als modales Sheet mit Fokusbegrenzung
|
||||
eingeblendet; beim Wechsel auf einen breiteren Viewport wird dieser Modalzustand
|
||||
aufgehoben. Dieser Layoutmodus ändert weder die Live-Actions noch die getrennte
|
||||
öffentliche `/heinzlive`-Projektion. Lokale Lesepositionen sind an die jeweilige
|
||||
Verwendung gebunden und werden nicht zwischen Pieces übertragen.
|
||||
aufgehoben. Die lokale Betrachtungsnavigation ist keine Live-Action; erst
|
||||
Präsentieren, Überspringen und Erledigen schreiben den jeweiligen getrennten
|
||||
Zustand. Die öffentliche `/heinzlive`-Projektion bleibt unverändert. Lokale
|
||||
Lesepositionen sind an die jeweilige Verwendung gebunden und werden nicht
|
||||
zwischen Pieces übertragen.
|
||||
|
||||
Der Live-Kopf besteht aus zwei regulären Rasterzeilen. Abschnitt und folgendes
|
||||
Piece sind einzeilig gekürzte, fokussierbare Schaltflächen, die ihren vollständigen
|
||||
Text lokal aufklappen. Das Regiemenü wird bei Bedarf als fest am Viewport
|
||||
positionierter Dialog neben dem Kopf gerendert. Dadurch unterliegt es weder dem
|
||||
Overflow der Regiefläche noch dem durch Glasfilter erzeugten Stacking Context;
|
||||
seine maximale Höhe bleibt an den Viewport gebunden und intern scrollbar.
|
||||
|
||||
Icons werden aus dem lokalen Font-Awesome-Classic-Regular-Sprite unter
|
||||
`static/icons` gerendert. Die Verwaltung lädt zusätzlich die durchsuchbaren
|
||||
@@ -321,3 +441,76 @@ betroffenen Route und Action geprüft. Markdown und fremdes HTML werden vor
|
||||
Ausgabe bereinigt. Uploadzugriff folgt denselben Rechten. Netzwerkabrufe für
|
||||
Präsentationsmetadaten und Vorschaubilder schützen interne Ziele auch nach
|
||||
DNS-Auflösung und Redirects und besitzen Größen-, Zeit- und Redirectlimits.
|
||||
|
||||
## Wartungsfelder 0.6.1
|
||||
|
||||
Migration `0017` ergänzt den optionalen Vorbereitungsaufwand am Original und
|
||||
kommagetrennt validierte Twitch-Tags am Abschnitt. Der Bildmodus wird wegen der
|
||||
bestehenden SQLite-Check-Constraints als zusätzliches Kennzeichen an Original
|
||||
und Usage-Snapshot gespeichert; nach außen bleibt er der eindeutige Modus
|
||||
`image`. Öffentlich passiert weiterhin nur das ausdrücklich gewählte
|
||||
Präsentationsmedium.
|
||||
|
||||
## Wartungskorrekturen 0.7.1
|
||||
|
||||
Migration `0019` ergänzt `preparation_status_snapshot` und
|
||||
`preparation_effort_snapshot` an `piece_usages` und übernimmt für vorhandene
|
||||
Einplanungen einmalig die damaligen Originalwerte. Danach ist ausschließlich die
|
||||
konkrete Sendungsfassung maßgeblich. Einplanen, Duplizieren und bewusstes
|
||||
Aktualisieren aus dem Fundus kopieren beide Werte; der Usage-Editor ändert sie
|
||||
unabhängig. Die Übersicht berücksichtigt vorbereitende Nicht-Reserve-Usages
|
||||
aktiver Sendungen, priorisiert zuerst deren Termin und führt direkt zum Editor.
|
||||
|
||||
Ein Freigabe-Ersatzlink rotiert ausschließlich den gehashten Token derselben
|
||||
Freigabe. Umfang, Passwort-Hash und Ablauf bleiben erhalten, der alte Token und
|
||||
alle bisherigen Gastsitzungen werden in derselben Transaktion ungültig. Der neue
|
||||
Klartexttoken wird weiterhin nur in der Action-Antwort ausgegeben.
|
||||
|
||||
## Bedienkorrekturen 0.7.2
|
||||
|
||||
Der RSS-Auswahldialog erhält weiterhin ausschließlich `new`-Einträge aus
|
||||
`listFeedEntries`. Quellenfilter, Seiteneinteilung und noch nicht bestätigte
|
||||
Auswahl sind flüchtiger Browserzustand. Erst das Formular im erreichbaren
|
||||
Dialogfuß übergibt die gewählten IDs an die unveränderte transaktionale
|
||||
Übernahme; dadurch bleiben persistenter Dublettenschutz, Herkunft und
|
||||
Standardkategorien die einzige fachliche Wahrheit.
|
||||
|
||||
Feed- und Zugangsdialoge verwenden dieselben globalen Management-Dialog- und
|
||||
Katalogstile wie Werkzeuge. Das Bearbeiten eines technischen Zugangs ändert nur
|
||||
Name und Umfang des bestehenden gehashten Tokens und wird auditiert. Die
|
||||
Live-Route projiziert zusätzlich nur, ob der feste Ausgabekanal getrennt, mit
|
||||
dieser oder mit einer anderen Sendung verbunden ist. Das Öffnen von Menü und
|
||||
Ausgabedetails führt selbst keine Mutation aus.
|
||||
|
||||
## Lesender MCP-Zugang 0.7.3
|
||||
|
||||
`/mcp` ist ein stateless Streamable-HTTP-Adapter über `content.ts` und
|
||||
`shows.ts`. Er unterstützt die aktuelle per Request deklarierte MCP-Fassung
|
||||
`2026-07-28` einschließlich `server/discover`, Header-/Body-Abgleich und
|
||||
`resultType`. Für derzeitige OpenAI-Clients bleiben die Initialisierungsfassungen
|
||||
`2025-11-25`, `2025-06-18` und `2025-03-26` verfügbar. Es gibt keine
|
||||
MCP-Sitzung und keinen unabhängigen SSE-Strom; jede Anfrage trägt erneut ihre
|
||||
Authentifizierung.
|
||||
|
||||
Die fünf Werkzeuge sind ausschließlich lesend. Eigene Positivprojektionen
|
||||
lassen Mediennamen, interne Speicherpfade und Werkzeug-Arbeitsdaten aus. Die
|
||||
Detailprojektionen dürfen nach ausdrücklicher Zustimmung redaktionell private
|
||||
Recherche, Moderation, eigene Notizen, Quellen und Reserveinhalte enthalten.
|
||||
Keine MCP-Methode ruft Mutationsdienste auf.
|
||||
|
||||
Sendewerk ist zugleich OAuth-Autorisierungs- und Ressourcenserver. Geschützte
|
||||
Ressourcen- und Authorization-Server-Metadaten verweisen ausschließlich auf die
|
||||
konfigurierte Origin. Öffentliche PKCE-Clients werden per begrenztem DCR
|
||||
registriert; die Autorisierung verlangt exakte Redirect-URI, `S256`, den Scope
|
||||
`sendewerk:read` und den exakten Ressourcenindikator `<Origin>/mcp`. Codes sind
|
||||
fünf Minuten, Zugriffstokens eine Stunde gültig. SQLite speichert nur SHA-256-
|
||||
Hashes. Tokens sind direkt an Nutzer, Client, Scope und Ressource gebunden;
|
||||
Kontosperre und Passwortwechsel widerrufen sie, und jeder MCP-Aufruf verbindet
|
||||
erneut den aktuellen Nutzerzustand.
|
||||
|
||||
DCR ist für die von OpenAI weiterhin unterstützte Kompatibilität vorhanden,
|
||||
aber pro Quelladresse und insgesamt begrenzt. Clientnamen sind nicht verifiziert;
|
||||
der Zustimmungsdialog kennzeichnet dies und zeigt die genaue Rücksprung-Domain.
|
||||
Öffentliche Produktion verlangt HTTPS, während HTTP nur an Loopback-Adressen
|
||||
zulässig bleibt. Der bestehende technische REST-Token wird weder gelesen noch
|
||||
weitergereicht.
|
||||
+199
-5
@@ -371,8 +371,202 @@ breites, niedriges Desktopfenster weiterhin zwei Spalten verwendet. Die Höhe
|
||||
steuert dort unabhängig die Dichte von Abständen und Bedienleisten. Textgröße
|
||||
und Gesamtoberfläche werden nicht skaliert.
|
||||
|
||||
Diese Darstellung ist keine neue Live-Zustandsgrenze. Start, direkte Auswahl,
|
||||
Erledigen, Überspringen, Reserveeinfügung und Präsentation bleiben unveränderte
|
||||
serverseitige Actions mit ihren bisherigen Revisions- und Idempotenzregeln. Ein
|
||||
Piece-Wechsel veröffentlicht daher weiterhin nichts; nur die ausdrückliche
|
||||
Präsentationsaction verändert die getrennte öffentliche Ausgabe.
|
||||
Der Kopf verwendet genau zwei kompakte Informationszeilen. Lange Kontexttitel
|
||||
bleiben im Ruhezustand einzeilig und werden auf bewusste Klick- oder
|
||||
Tastaturaktion lokal vollständig sichtbar. Das Regiemenü ist kein verschachteltes
|
||||
`details` innerhalb der Glasfläche, sondern ein explizit gesteuertes,
|
||||
viewportgebundenes Popover. So bleiben Z-Index, Maximalhöhe, Escape,
|
||||
Außenklick und Fokus-Rückkehr unabhängig von Overflow und Filter-Stacking-
|
||||
Contexts kontrollierbar.
|
||||
|
||||
Diese Darstellung ist keine neue Live-Zustandsgrenze. Zurück und die direkte
|
||||
Auswahl im Ablauf sind reine lokale Betrachtungsnavigation. Sie verändern weder
|
||||
aktuelles Live-Piece noch Status, Zeitintervalle, Abschnittstimer oder Ausgabe.
|
||||
Während ein anderes Piece betrachtet wird, bleiben Fortschrittsaktionen
|
||||
gesperrt; Präsentieren darf dagegen weiterhin ausdrücklich genau das betrachtete
|
||||
Piece ausgeben. Start, Erledigen, Überspringen, Reserveeinfügung und Präsentation
|
||||
bleiben serverseitige Actions mit ihren bisherigen Revisions- und
|
||||
Idempotenzregeln.
|
||||
|
||||
## D-025: Gemeinsame Sendungsdaten für Liste und Kalender
|
||||
|
||||
Listenansicht, Desktop-Monatsraster und mobile Monatsagenda werden aus derselben
|
||||
kompakten Sendungsliste abgeleitet. Es gibt kein zweites Kalenderdatenmodell und
|
||||
keine Bibliothek für Terminverwaltung. UTC-Zeitpunkte werden mit
|
||||
`Europe/Berlin` einem zivilen Tag zugeordnet; der ausgewählte Monat bleibt als
|
||||
URL-Parameter navigierbar. Mehrere Sendungen eines Tages werden vollständig und
|
||||
chronologisch gezeigt, Sendungen ohne Startzeit separat.
|
||||
|
||||
Die Präferenz `list` oder `calendar` gehört zum angemeldeten Konto und wird als
|
||||
kleines geprüftes Feld an `users` gespeichert. Sie ist weder Bestandteil einer
|
||||
Sendung noch Browserzustand. Der Kalender dient nur der Navigation und erhält
|
||||
bewusst kein Drag-and-drop, damit eine Terminänderung ausschließlich über die
|
||||
bestehende serverseitig validierte Sendungsbearbeitung erfolgt.
|
||||
|
||||
## D-026: Gemeinsame Live-Pause und getrennte Zeitbasen
|
||||
|
||||
Piece-Laufzeit, Abschnittszeit und Gesamtzeit bleiben getrennte persistente
|
||||
Intervallmengen. Pause schließt in einer Live-Transaktion alle offenen
|
||||
Intervalle, Fortsetzen eröffnet sie am gespeicherten Fortschritt erneut. Dadurch
|
||||
zählt weder Browserwechsel noch eine beliebig lange Pause zur Sendezeit. Ein
|
||||
Abschnittsreset ersetzt nur den aktiven Abschnittstimer; ein Gesamtreset löscht
|
||||
nur die Gesamtlaufintervalle. Beide ändern weder Piece-Status noch Reihenfolge,
|
||||
Restplanung oder Präsentationsstand.
|
||||
|
||||
Die Restzeit ist eine Ableitung, kein zweiter Ablaufplan. Für jeden verbleibenden
|
||||
Abschnitt gilt entweder dessen positive explizite Dauer oder die Summe seiner
|
||||
verbleibenden Piece-Dauern. Bereits abgeschlossene Abschnitte werden ausgelassen,
|
||||
ungeplante Abschnitte werden sichtbar gezählt und eine Überziehung reduziert
|
||||
nicht die geplante Zeit kommender Inhalte.
|
||||
|
||||
`ended_at_utc` beendet einen Durchlauf, nicht automatisch dessen offene Pieces.
|
||||
Wiederaufnahme und neuer Durchlauf sind deshalb getrennte Befehle: Erstere
|
||||
bewahrt Intervalle und Fortschritt, letzterer setzt beides ausdrücklich zurück.
|
||||
Das private Markdownfeld „Interaktion“ folgt derselben Original-/Snapshotgrenze
|
||||
wie Moderation und Überleitung, ist aber nicht Teil der öffentlichen
|
||||
Präsentations-Positivliste.
|
||||
|
||||
## D-027: Abschlusszustand und Freigaben als eigene Sicherheitsgrenzen
|
||||
|
||||
Ein beendeter Live-Lauf ist wiederaufnehmbar und deshalb nicht identisch mit
|
||||
einer historischen Sendung. Erst eine eigene transaktionale Finalisierung setzt
|
||||
`shows.status` auf `completed`. Eine dauerhaft gespeicherte Befehls-ID verhindert
|
||||
Doppelverbuchung; Usage-Historie enthält nur `done`, nie `skipped` oder Reserve.
|
||||
Bestehende Usage-Snapshots bleiben Inhaltsquelle, während Abschnittskategorien
|
||||
beim Abschluss zusätzlich eingefroren werden. Historische Sendungen werden nicht
|
||||
erneut bearbeitet, sondern mit neuen IDs und zurückgesetztem Laufzustand kopiert.
|
||||
|
||||
Lesefreigaben sind keine abgeschwächten Redaktionssitzungen. Sie verwenden eine
|
||||
eigene Positivprojektion mit drei kumulativen Umfängen. Roh-Tokens und
|
||||
Gast-Sitzungstokens stehen nie in SQLite, optionale Passwörter verwenden Argon2id.
|
||||
Passwort, Ablauf und Widerruf werden zentral vor Seite, Seitendaten und Medium
|
||||
geprüft. Präsentationsmedien sind an Freigabe, Sendung und Usage-Snapshot
|
||||
gebunden; beliebige Fundus-Dateien bleiben ausgeschlossen.
|
||||
|
||||
Freigaben verweisen auf `shows` statt ausschließlich auf Finalisierungen. Damit
|
||||
kann ein Barkeeper bereits einen Entwurf oder eine laufende Planung teilen. Die
|
||||
Gastprojektion liest bei jedem Aufruf die aktuellen Sendungssnapshots; der
|
||||
spätere Abschluss stabilisiert genau diese bestehende Datenquelle, ohne Token
|
||||
oder URL zu wechseln. Bearbeitungen behalten den Link, invalidieren aber
|
||||
vorhandene Passwortsitzungen. Vollständiges Löschen ist der unmittelbare
|
||||
Widerruf. Die Sendungsbearbeitung und die zentrale Verwaltung verwenden dieselbe
|
||||
Geschäftslogik und bleiben Barkeepern vorbehalten.
|
||||
|
||||
## D-028: Additive Wartungsfelder und gemeinsamer Freigabedialog
|
||||
|
||||
Vorbereitungsaufwand und Twitch-Tags sind optionale additive Felder. Der neue
|
||||
Bildmodus verwendet ein separates boolesches Kennzeichen, damit bestehende
|
||||
Tabellen und Daten trotz älterer Modus-Check-Constraints ohne riskanten
|
||||
Tabellenumbau erhalten bleiben. Freigabeverwaltung bleibt eine gemeinsame
|
||||
Komponente und öffnet in allen drei internen Einstiegen als nativer Dialog.
|
||||
|
||||
## D-029: RSS als persistenter Eingang mit begrenztem Abruf
|
||||
|
||||
Externe Feeds schreiben nie direkt in den Fundus. Quelle und stabiler
|
||||
Eintragsschlüssel werden in einem eigenen Eingang gespeichert; dessen Zustand
|
||||
`discarded` oder `imported` wird bei einem erneuten Abruf nicht zurückgesetzt.
|
||||
Erst eine bewusste Auswahl erzeugt über `content.ts` ein normales Piece samt
|
||||
Originalquelle und gewählten Kategorien. Dadurch bleiben redaktionelle
|
||||
Entscheidung, Dublettenschutz und Herkunft nachvollziehbar.
|
||||
|
||||
Manueller und geplanter Abruf verwenden denselben Adapter. Wie bei
|
||||
Linkmetadaten werden private Ziele, Nichtstandardports und ungeprüfte Redirects
|
||||
gesperrt; zusätzlich gelten enge Zeit-, Größen- und Mengenlimits. XML-Entities
|
||||
bleiben deaktiviert und fremdes HTML wird nicht gespeichert. Ein Fehler wird am
|
||||
betroffenen Feed persistiert und unterbricht keine weiteren fälligen Feeds.
|
||||
|
||||
## D-030: Technische Tokens, Scopes und persistente Idempotenz
|
||||
|
||||
Externe Assistenz erhält keine simulierte Redaktionssitzung und keine
|
||||
Sonderrechte. Eigene zufällige Bearer-Tokens liegen nur gehasht vor, sind sofort
|
||||
widerrufbar und erlauben entweder Lesen oder Lesen und Schreiben. REST-Routen
|
||||
unter `/api/v1` verwenden die bestehenden Inhalts- und Sendungsdienste, damit
|
||||
Validierung, Revisionen und Transaktionen identisch bleiben. Jede erfolgreiche
|
||||
Mutation wird mit technischem Akteur, Aktion und Ziel protokolliert.
|
||||
|
||||
Neuanlage, Einplanung und Sortierung verlangen einen `Idempotency-Key`.
|
||||
Zugang, Schlüssel, Hash des Requestinhalts und vollständige Antwort werden in
|
||||
derselben SQLite-Transaktion gespeichert. Eine identische Wiederholung erhält
|
||||
dieselbe Antwort; ein veränderter Request mit demselben Schlüssel wird
|
||||
abgewiesen. OpenAPI 3.1 beschreibt diese Grenze maschinenlesbar. Ein MCP-Adapter
|
||||
oder ein bestimmter KI-Client wird nicht vorgetäuscht: Die Anwendung bleibt ohne
|
||||
KI vollständig nutzbar und eine konkrete Client-Verbindung muss separat geprüft
|
||||
werden.
|
||||
|
||||
## D-031: Usage-basierte Vorbereitung und rotierende Freigabelinks
|
||||
|
||||
Die Sendungsübersicht erzeugt keinen zusätzlichen Vorbereitungszustand. Sie
|
||||
projiziert konkrete Usage-Snapshots aktiver Sendungen, deren Fundus-Original noch
|
||||
`preparing` ist. So bleiben bestehende Daten und Snapshots unverändert, während
|
||||
ungeplante Fundus-Arbeit aus der Sendungsübersicht verschwindet.
|
||||
|
||||
Weil Freigabetokens nur gehasht gespeichert werden, kann ein bestehender Link
|
||||
nicht erneut angezeigt werden. Ein Ersatzlink rotiert deshalb den Token derselben
|
||||
Freigabe transaktional und löscht alle Gastsitzungen; Sichtumfang, Passwort und
|
||||
Ablauf werden nicht stillschweigend verändert.
|
||||
|
||||
## D-032: Vorbereitung als Eigenschaft der konkreten Einplanung
|
||||
|
||||
Die erste 0.7.1-Umsetzung aus D-031 leitete den Vorbereitungszustand noch vom
|
||||
veränderlichen Fundus-Original ab. Das widerspricht der bestehenden Kopierregel
|
||||
für Sendungsfassungen und verhindert unterschiedliche Arbeitsstände bei
|
||||
Mehrfachverwendung. D-032 ersetzt deshalb diesen Teil von D-031: Status und
|
||||
Aufwand werden mit Migration `0019` additiv an `piece_usages` gespeichert.
|
||||
|
||||
Vorbereitende und sendefertige Originale dürfen eingeplant werden. Einplanung,
|
||||
Duplikation und ausdrückliches Aktualisieren kopieren den Zustand, während der
|
||||
Usage-Editor ihn danach unabhängig ändert. `piece_usages.status` bleibt davon
|
||||
getrennt und beschreibt weiterhin ausschließlich den Livezustand `open`,
|
||||
`current`, `done` oder `skipped`.
|
||||
|
||||
## D-033: Auswahlzustand flüchtig, Verwaltungslogik gemeinsam
|
||||
|
||||
Quellenfilter, Pagination und Mehrfachauswahl des RSS-Dialogs bleiben lokaler
|
||||
UI-Zustand. Persistiert wird erst durch die bestehende transaktionale
|
||||
Importaktion, damit Blättern oder Öffnen eines externen Links niemals
|
||||
redaktionelle Inhalte erzeugt. Die Verwaltung ruft weiterhin dieselben Feed-
|
||||
und Zugangsdienste auf; neue Dialoge ersetzen nur die dauerhaft ausgebreiteten
|
||||
Formulare. Ein technischer Zugang darf Name und Umfang ändern, behält dabei aber
|
||||
seinen ausschließlich gehasht gespeicherten Token und erzeugt ein Auditereignis.
|
||||
|
||||
Das Live-Menü zeigt einen rein gelesenen Verbindungsstatus des Ausgabekanals.
|
||||
Nur die bereits vorhandenen expliziten Verbinden-, Rotieren- und Trennenaktionen
|
||||
verändern öffentliche Ausgabe. Navigation zur Planung bleibt davon getrennt.
|
||||
|
||||
## D-034: Nutzergebundener OAuth-Zugang statt Token-Passthrough
|
||||
|
||||
Der bestehende technische REST-Zugang kann und darf nicht für ChatGPT
|
||||
weitergereicht werden: Sein Klartexttoken ist nach der Erstellung nicht mehr
|
||||
verfügbar, und MCP verbietet Token-Passthrough. Sendewerk stellt deshalb einen
|
||||
eigenen OAuth-2.1-Authorization-Code-Flow für öffentliche Clients bereit. PKCE
|
||||
`S256`, exakte Redirect-URIs und der auf `<Origin>/mcp` gebundene
|
||||
Ressourcenindikator sind verpflichtend. Codes und einstündige Zugriffstokens
|
||||
liegen ausschließlich gehasht vor und sind direkt an ein aktives Nutzerkonto
|
||||
gebunden.
|
||||
|
||||
Die Autorisierungsserver-Metadaten bieten das von OpenAI unterstützte Dynamic
|
||||
Client Registration als Kompatibilitätsweg an. Die aktuelle MCP-Fassung stuft
|
||||
DCR zugunsten von Client ID Metadata Documents als veraltet ein. Ein allgemeiner
|
||||
CIMD-Abruf würde jedoch eine neue SSRF- und Cache-Sicherheitsgrenze eröffnen;
|
||||
für diese private Anwendung bleibt DCR deshalb eng mengen- und ratenbegrenzt.
|
||||
Der Zustimmungsdialog behandelt den selbst gemeldeten Clientnamen ausdrücklich
|
||||
als unverifiziert und zeigt dessen Rücksprung-Domain.
|
||||
|
||||
Der MCP-Adapter unterstützt sowohl die aktuelle stateless Fassung `2026-07-28`
|
||||
als auch die von OpenAI weiterhin dokumentierten Initialisierungsfassungen bis
|
||||
`2025-03-26`. Tooldaten werden aus bestehenden Diensten positiv projiziert.
|
||||
Der einzige Scope `sendewerk:read` ist im Dialog ausdrücklich einschließlich
|
||||
privater redaktioneller Recherche beschrieben; E-Mail, Uploadnamen,
|
||||
Speicherpfade und Werkzeug-Arbeitsdaten werden nicht ausgegeben. Alle Werkzeuge
|
||||
sind als lesend markiert und haben keinen Pfad zu Mutationsdiensten.
|
||||
|
||||
Quellen, geprüft am 27. Oktober 2026:
|
||||
|
||||
- <https://developers.openai.com/apps-sdk/build/auth>
|
||||
- <https://developers.openai.com/apps-sdk/deploy/connect-chatgpt>
|
||||
- <https://platform.openai.com/docs/mcp>
|
||||
- <https://modelcontextprotocol.io/specification/2026-07-28/basic/authorization>
|
||||
- <https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/streamable-http>
|
||||
- <https://modelcontextprotocol.io/specification/2026-07-28/basic/versioning>
|
||||
- <https://modelcontextprotocol.io/specification/2026-07-28/server/discover>
|
||||
- <https://modelcontextprotocol.io/specification/2026-07-28/server/tools>
|
||||
+257
-22
@@ -1,29 +1,209 @@
|
||||
# Release Notes
|
||||
|
||||
## 0.5.12 - Kompakte Live-Regie
|
||||
## 0.7.3 - Lesender MCP-Zugang mit OAuth 2.1
|
||||
|
||||
Veröffentlicht am 27. Oktober 2026
|
||||
|
||||
- Der öffentliche Streamable-HTTP-Endpunkt `/mcp` bietet fünf ausschließlich
|
||||
lesende Werkzeuge für Kontoidentität, Pieces, Sendungen und vollständige
|
||||
Abläufe. Er verwendet die bestehenden Inhalts- und Sendungsdienste und keine
|
||||
parallele Datenhaltung.
|
||||
- OAuth-2.1-Discovery, begrenzte dynamische Clientregistrierung,
|
||||
Authorization Code, PKCE `S256`, exakte Redirect-URI und Ressourcenbindung
|
||||
ermöglichen die von OpenAI dokumentierte Kontoverknüpfung. Codes und
|
||||
einstündige Tokens werden nur gehasht gespeichert.
|
||||
- Nutzerzustand, Sperren und Rollen werden bei jedem MCP-Aufruf erneut gelesen.
|
||||
Passwortwechsel und Kontosperre widerrufen bestehende OAuth-Tokens. Der
|
||||
vorhandene technische REST-Token wird weder offengelegt noch weitergereicht.
|
||||
- MCP `2026-07-28` und die weiterhin von OpenAI verwendeten älteren
|
||||
Initialisierungsfassungen werden am selben stateless Endpunkt unterstützt.
|
||||
Private redaktionelle Details sind erst nach ausdrücklicher Zustimmung
|
||||
lesbar; E-Mail, Uploadnamen, interne Pfade und Werkzeug-Arbeitsdaten bleiben
|
||||
ausgeschlossen.
|
||||
- Die Produktions-URL lautet `https://<Cloudron-App-Domain>/mcp`. README und
|
||||
Betriebsdokumentation beschreiben die Einrichtung über **Add custom MCP
|
||||
server**. Das Release wurde nicht auf Cloudron ausgerollt und eine reale
|
||||
ChatGPT-Verbindung wird nicht als geprüft ausgegeben.
|
||||
- Paket, Lockdatei und Cloudron-Manifest tragen Version `0.7.3`. Migration
|
||||
`0020_oauth_mcp.sql` ergänzt additive OAuth- und Ratenbegrenzungstabellen.
|
||||
- Typprüfung und Produktionsbuild sind erfolgreich. Ein isolierter lokaler
|
||||
HTTP-Rundlauf hat OAuth, beide MCP-Protokollgenerationen und eine echte
|
||||
`list_pieces`-Anfrage geprüft; eine reale ChatGPT-/Cloudron-Verbindung bleibt
|
||||
ausdrücklich offen.
|
||||
|
||||
## 0.7.2 - RSS-Auswahl, Live-Menü und Schnittstellenverwaltung
|
||||
|
||||
Veröffentlicht am 26. Oktober 2026
|
||||
|
||||
- Der Eingang zeigt neue RSS-Beiträge in einer kompakten Katalogfläche. Ein
|
||||
großzügiger, mobil vollflächiger Dialog filtert mehrere Quellen vor der
|
||||
Seiteneinteilung, zeigt 20 Beiträge je Seite und behält die barrierefrei
|
||||
erkennbare Auswahl über Quellen- und Seitenwechsel. Erst die ausdrückliche
|
||||
Übernahme erzeugt Eingangspieces; Herkunft, Kategorien, Verwerfen und
|
||||
Dublettenschutz bleiben erhalten (#16).
|
||||
- Das Live-Menü folgt der Nutzerabsicht: Sendungssteuerung, kompakte Ansicht,
|
||||
Lesefreigaben, standardmäßig eingeklappte OBS-Ausgabe und getrennte Navigation
|
||||
sind klar geordnet. Pause/Fortsetzen sowie Abschnitts- und Gesamtreset liegen
|
||||
direkt bei den Timern. Laufend, pausiert und beendet werden eindeutig
|
||||
unterschieden; Navigation allein verändert weder Lauf noch Ausgabe (#18).
|
||||
- RSS-Feeds und technische API-Zugänge verwenden Panel, Typografie,
|
||||
Eintragskarten, Classic-Regular-Icons und Dialograhmen des Werkzeugkatalogs.
|
||||
Feeds und Zugänge lassen sich in Dialogen anlegen und bearbeiten; Abruf,
|
||||
Löschen beziehungsweise Widerruf bleiben kompakte Iconaktionen. Neue
|
||||
API-Tokens erscheinen unmittelbar einmalig und kopierbar, während weiterhin
|
||||
nur ihr Hash gespeichert wird (#21).
|
||||
- Paket, Lockdatei und Cloudron-Manifest tragen Version `0.7.2`. Es ist keine
|
||||
Datenbankmigration erforderlich. 60 Verhaltenstests und 20 Chromium-Abläufe
|
||||
sind erfolgreich; echte Browser-/Geräteprüfungen außerhalb von Chromium
|
||||
bleiben offen.
|
||||
|
||||
## 0.7.1 - Bedienung und Live-Korrekturen
|
||||
|
||||
Veröffentlicht am 25. Oktober 2026, Korrekturstand 26. Oktober 2026
|
||||
|
||||
- Live-Abschnittszeiten übernehmen geänderte Plandauern. Frühere erledigte oder
|
||||
übersprungene Pieces können offiziell wiederaufgenommen werden, ohne ihre
|
||||
Abschnittslaufzeit oder die Gesamtzeit zurückzusetzen (#1).
|
||||
- Mobiler Live-Ablauf, lange Metadaten und Sendungskarten halten ihre verfügbare
|
||||
Breite ein. Der Ablauf bleibt als fokussierbares Sheet bedienbar (#3, #5, #13).
|
||||
- „Noch vorzubereiten“ speichert Status und Aufwand an der konkreten Einplanung,
|
||||
priorisiert aktive Sendungen nach Termin und verlinkt mit den Themenicons direkt
|
||||
in den Usage-Editor. Vorbereitende Originale können regulär eingeplant werden;
|
||||
Mehrfachverwendungen bleiben unabhängig (#6, #15).
|
||||
- Fundus- und Usage-Editor unterscheiden Text, Nur Bild, Linkvorschau und Video
|
||||
durch kontextsensitive Eingaben und passende Vorschauen (#8).
|
||||
- Gast- und historische Abschnitte besitzen klar gepolsterte äußere Glaskarten.
|
||||
Die Freigabeverwaltung liegt direkt vor dem Werkzeugkatalog; der gemeinsame
|
||||
Dialog und seine Formfelder folgen ohne nativen Doppelrahmen dem Sendewerk-
|
||||
Design. Einmalige Links lassen sich kopieren und sicher ersetzen (#11, #12).
|
||||
- Die Iconsuche ist nach dem Öffnen sofort sichtbar und fokussiert (#14).
|
||||
- RSS-Feeds und technische Zugänge verwenden in der Verwaltung kompakte
|
||||
Hinzufügen-Einstiege und dieselbe visuelle Listenlogik wie der Werkzeugkatalog.
|
||||
- Mobiles Live-Sheet und Backdrop sind am Viewport verankert. Viewport-Fit,
|
||||
Standalone-Metadaten und Web-App-Manifest aktivieren iOS-Safe-Areas; ein echter
|
||||
Safari-/Home-Bildschirm-Test bleibt mangels Gerät offen (#3, #13).
|
||||
- Paket, Lockdatei und Cloudron-Manifest tragen Version `0.7.1`. Migration
|
||||
`0019_usage_preparation.sql` ergänzt additive Usage-Snapshots. 60
|
||||
Verhaltenstests und 19 Chromium-Abläufe sind
|
||||
erfolgreich; echtes Safari und die installierte Webapp auf iOS bleiben offen.
|
||||
|
||||
## 0.7.0 - RSS-Import und externe Assistenz
|
||||
|
||||
Veröffentlicht am 25. Oktober 2026
|
||||
|
||||
- Barkeeper verwalten RSS-/Atom-Feeds mit Intervall und Standardkategorie;
|
||||
sichere manuelle und geplante Abrufe laufen fehlerisoliert.
|
||||
- Neue Beiträge landen in einem getrennten Auswahlbereich im Eingang. Erst eine
|
||||
bewusste Übernahme erzeugt Pieces, während dauerhaftes Verwerfen, Herkunft,
|
||||
Kategorien und Dublettenschutz erhalten bleiben.
|
||||
- Abrufe sperren interne Ziele und begrenzen Ports, Redirects, Laufzeit,
|
||||
Antwortgröße und Eintragszahl. Fremdes Feed-HTML wird zu Text bereinigt.
|
||||
- Die versionierte REST-API `/api/v1` liest und ändert Pieces, Sendungen und
|
||||
Einplanungen über getrennte technische Lese- oder Schreibzugänge.
|
||||
- Technische Tokens werden nur einmal gezeigt und gehasht gespeichert. Widerruf,
|
||||
Audit-Ereignisse, Revisionen und persistente Idempotenz schützen Änderungen.
|
||||
- `/api/v1/openapi.json` beschreibt die Schnittstelle für externe Clients.
|
||||
Sendewerk bleibt ohne KI nutzbar; eine konkrete ChatGPT-/Codex-Anbindung ist
|
||||
weiterhin offen.
|
||||
- Migration `0018_rss_and_api.sql` ergänzt Feed-, Zugangs-, Audit- und
|
||||
Idempotenzdaten. Paket, Lockdatei und Cloudron-Manifest tragen Version `0.7.0`.
|
||||
|
||||
## 0.6.1 - Redaktionelle Wartung
|
||||
|
||||
Veröffentlicht am 25. Oktober 2026
|
||||
|
||||
- Live-Countdowns übernehmen geänderte Abschnittsplanzeiten, ohne Laufzeit zu verlieren; die mobile Regie gruppiert ihre Kopfaktionen robuster und zeigt den Ablauf als oberstes Sheet.
|
||||
- Mobile Formularfelder und die Iconsuche vermeiden iOS-Fokuszoom; Sendungskarten und Gastansicht erhalten klarere Abstände.
|
||||
- Pieces führen optionalen Vorbereitungsaufwand, die Sendungsübersicht bündelt offene Vorbereitung und Abschnitte speichern kopierbare Twitch-Tags.
|
||||
- Präsentationen können ein ausdrücklich gewähltes Bild ohne Begleittext ausgeben; Originale und Sendungsfassungen bleiben getrennte Snapshots.
|
||||
- Lesefreigaben öffnen in Sendung, Verwaltung und Live-Regie über denselben Dialog.
|
||||
- Migration `0017_maintenance_fields.sql` ergänzt ausschließlich optionale, rückwärtskompatible Felder.
|
||||
|
||||
## 0.6.0 - Abschluss, Archiv und Freigaben
|
||||
|
||||
Veröffentlicht am 25. Oktober 2026
|
||||
|
||||
Sendewerk 0.6.0 trennt das wiederaufnehmbare Ende eines Live-Laufs vom
|
||||
unveränderlichen redaktionellen Abschluss. Abgeschlossene Sendungen erhalten
|
||||
eine stabile Historie, liegen im Archiv und können als neuer Entwurf dupliziert
|
||||
werden. Barkeeper geben genau eine geplante, laufende oder historische Sendung
|
||||
über widerrufbare, optional passwortgeschützte Leselinks frei.
|
||||
|
||||
### Abschluss und Historie
|
||||
|
||||
- Ein Abschlussdialog zeigt gesendete, übersprungene und offene Pieces getrennt
|
||||
und bietet ausschließlich gesendete Originale zur bewussten Archivierung an.
|
||||
- Finalisierung ist transaktional und idempotent. Übersprungene Pieces und die
|
||||
Reservebank werden nicht als gesendet verbucht.
|
||||
- Usage-Texte, Relationen, Kategorien und tatsächliche Zeiten bleiben nach dem
|
||||
Abschluss stabil, auch wenn Fundus-Originale oder Kataloge später wechseln.
|
||||
- Historische Sendungen sind intern nur lesbar. Die Duplikation erzeugt einen
|
||||
unabhängigen Entwurf mit offenen Pieces und ohne früheren Lauf- oder
|
||||
Freigabezustand.
|
||||
|
||||
### Archiv und Freigaben
|
||||
|
||||
- Das Archiv zeigt abgeschlossene Sendungen neben archivierten und gelöschten
|
||||
Pieces und bietet die Duplikation direkt an.
|
||||
- Barkeeper erstellen Leselinks direkt in der Sendungsbearbeitung oder zentral
|
||||
in der Verwaltung für Ablauf, Moderation oder vollständige Recherche, optional
|
||||
mit Passwort und Ablaufzeit.
|
||||
- Noch nicht abgeschlossene Sendungen zeigen Gästen beim nächsten Aufruf den
|
||||
aktuellen Plan. Nach dem Abschluss bleibt derselbe Link auf dem stabilen
|
||||
historischen Stand.
|
||||
- Freigaben lassen sich in nach Sendung gruppierten Verwaltungskarten bearbeiten
|
||||
und endgültig löschen; Passwortänderungen beenden vorhandene Gast-Sitzungen.
|
||||
- Tokens und Gast-Sitzungen liegen nur gehasht vor; Passwörter verwenden
|
||||
Argon2id und Fehlversuche sind begrenzt.
|
||||
- Gastseiten projizieren genau eine Sendung. Private Originaldaten, Nutzer,
|
||||
interne IDs und Felder außerhalb des gewählten Umfangs werden nicht geliefert.
|
||||
- Direkte Medienaufrufe prüfen dieselbe Freigabe, Passwortsitzung, Ablaufzeit und
|
||||
den Widerruf erneut und erlauben nur das freigegebene Präsentationsmedium.
|
||||
|
||||
### Technik und Prüfung
|
||||
|
||||
- Migration `0015_completion_archive_and_shares.sql` übernimmt bestehende
|
||||
abgeschlossene Sendungen und ergänzt Finalisierung, Historie,
|
||||
Duplikationsbefehle, Freigaben, Gast-Sitzungen und
|
||||
Passwortversuchsbegrenzung.
|
||||
- Migration `0016_shares_for_active_shows.sql` erhält vorhandene Freigaben und
|
||||
erweitert ihre Referenz auf alle Sendungszustände.
|
||||
- Paket, Lockdatei und Cloudron-Manifest tragen gemeinsam Version `0.6.0`.
|
||||
- 52 Verhaltenstests und 18 Chromium-Abläufe decken den bisherigen Umfang sowie
|
||||
Abschluss, Archiv und anonyme Lesefreigaben ab.
|
||||
|
||||
## 0.5.12 - Live-Regie und Sendungskalender
|
||||
|
||||
Veröffentlicht am 24. Oktober 2026
|
||||
|
||||
Sendewerk 0.5.12 macht aus der privaten Live-Steuerung eine kompakte Regieansicht
|
||||
für Vollbild, Smartphone und kleine Desktopfenster neben OBS oder Firebot. Das
|
||||
aktuelle Piece, die Position im Ablauf, der Abschnittscountdown und die
|
||||
wichtigsten Aktionen bleiben gleichzeitig erreichbar. Die öffentliche
|
||||
heinzlive-Ausgabe und die gespeicherten Livezustände bleiben technisch getrennt.
|
||||
für Vollbild, Smartphone und kleine Desktopfenster neben OBS oder Firebot. Die
|
||||
Sendungsübersicht erhält zusätzlich eine kontobezogen gespeicherte Listen- und
|
||||
Kalenderansicht. Die öffentliche heinzlive-Ausgabe und die gespeicherten
|
||||
Livezustände bleiben technisch getrennt.
|
||||
|
||||
### Highlights
|
||||
|
||||
- Ausgabe, Gesamtzeit, Abschnittszeit und Menü tragen in der Live-Kopfleiste
|
||||
jetzt die passenden lokalen Classic-Regular-Icons. Pause beziehungsweise
|
||||
Fortsetzen ist zusätzlich als direkter Iconbutton neben der Abschnittszeit
|
||||
erreichbar.
|
||||
- Die Live-Regie verwendet die gesamte Fensterfläche ohne normale
|
||||
App-Seitenleiste, mobilen App-Header oder Bottomnavigation.
|
||||
- Eine kompakte Kopfzeile zeigt aktuellen Abschnitt, Abschnittscountdown und den
|
||||
tatsächlich präsentierten Ausgabezustand.
|
||||
- Zwei kompakte Kopfzeilen halten Abschnitt, „Danach“, Menü, Ausgabe,
|
||||
Abschnittscountdown und Ablauf gleichzeitig erreichbar. Der Sendungsname ist
|
||||
in das Menü gewandert.
|
||||
- Lange Abschnitts- und Folgetitel bleiben einzeilig gekürzt und lassen sich per
|
||||
Klick oder Tastatur vollständig aufklappen, ohne benachbarte Bedienelemente zu
|
||||
überlagern.
|
||||
- Moderation und Ablauf bleiben auch bei einem nur 900 × 450 Pixel großen
|
||||
Desktopfenster nebeneinander. Lange Inhalte scrollen innerhalb ihrer
|
||||
Arbeitsfläche; Kopf- und Aktionszeile bleiben sichtbar.
|
||||
- Niedrige Desktopfenster verdichten Abstände und Bedienleisten anhand der
|
||||
verfügbaren Höhe, ohne Text oder die gesamte Oberfläche zu skalieren.
|
||||
- Die feste Fußleiste bündelt nächstes Piece, „Präsentieren“, „Überspringen“ und
|
||||
„Erledigen & weiter“. Beim letzten offenen Piece wird das Sendungsende
|
||||
eindeutig benannt.
|
||||
- Die feste Fußleiste ist auf „Zurück“, „Präsentieren“, „Überspringen“ und
|
||||
„Erledigen & weiter“ reduziert. Das nächste Piece steht in der Kopfzeile, das
|
||||
Leeren der Präsentation direkt am Ausgabezustand.
|
||||
- Auf dem Smartphone öffnet „Ablauf · Piece X/Y“ den Ablauf als separates Sheet,
|
||||
während das aktuelle Piece die Hauptfläche bleibt. Fokusführung, Escape und
|
||||
der Wechsel zurück auf eine breite Ansicht schließen den Modalzustand sauber.
|
||||
@@ -36,21 +216,36 @@ heinzlive-Ausgabe und die gespeicherten Livezustände bleiben technisch getrennt
|
||||
werden nur bei Bedarf geöffnet.
|
||||
- Die Prompter-Schriftgröße bleibt einstellbar und wird weiterhin lokal
|
||||
gespeichert. Texte werden nicht automatisch verkleinert.
|
||||
- Piece-Position, Piece-Titel und Zeit stehen in einer gemeinsamen kompakten
|
||||
Kopfzeile; dadurch beginnt die Einleitung weiter oben.
|
||||
|
||||
### Ablauf und Liveverhalten
|
||||
|
||||
- Pause und Fortsetzen steuern Piece-, Abschnitts- und Gesamtzeit gemeinsam und
|
||||
zählen Pausen auch nach Reload oder Navigation nicht mit.
|
||||
- Gelaufene Gesamtzeit und geschätzte Restzeit lassen sich direkt umschalten;
|
||||
die Auswahl bleibt lokal erhalten. Ungeplante verbleibende Abschnitte sind
|
||||
sichtbar, ohne Abschnitts- und Piece-Dauern doppelt zu zählen.
|
||||
- Abschnitts- und Gesamtzeit lassen sich getrennt nach Bestätigung zurücksetzen.
|
||||
Ablaufposition, Piece-Status, Restplanung und Präsentation bleiben dabei
|
||||
unverändert.
|
||||
- Sendungen lassen sich ausdrücklich vorbereiten, starten, pausieren und
|
||||
beenden. Nach dem Ende sind „Lauf fortsetzen“ und „Neuer Durchlauf“ getrennte
|
||||
Aktionen; offene Pieces werden beim Beenden nicht automatisch erledigt.
|
||||
- Abschnitte sind kompakt aufklappbar; der aktuelle Abschnitt ist geöffnet und
|
||||
das aktive Piece bleibt in der Ablaufspalte sichtbar.
|
||||
- Pieces kennzeichnen „Aktuell“, „Erledigt“, „Übersprungen“ und „Kommend“ auch
|
||||
textlich und lassen sich direkt auswählen, einschließlich des ersten Eintrags.
|
||||
- Pieces kennzeichnen tatsächliches Live-Piece, lokal betrachtetes Piece und
|
||||
ausgegebenes Piece getrennt. Jeder Eintrag lässt sich zur Betrachtung wählen,
|
||||
einschließlich des ersten Eintrags.
|
||||
- Die Reserve bleibt zusammengeklappt erreichbar. Dauerhafte Sortierpfeile und
|
||||
die separate große „Als Nächstes“-Karte entfallen; Umsortieren bleibt über
|
||||
eine kompakte Aktion am jeweiligen Eintrag erreichbar.
|
||||
- Die lokal gespeicherte Leseposition gehört zum jeweiligen Piece. Eine direkte
|
||||
Auswahl beginnt daher oben, ohne die Position des vorherigen Textes zu erben.
|
||||
- Direkte Auswahl verändert keinen Erledigungsstatus und veröffentlicht nichts.
|
||||
Nur „Präsentieren“ oder „Präsentation leeren“ verändert die öffentliche
|
||||
Ausgabe.
|
||||
- „Zurück“ und direkte Ablaufwahl verändern weder aktuelles Live-Piece noch
|
||||
Erledigungsstatus, Timer oder Ausgabe. Bei einem nur betrachteten früheren
|
||||
Piece bleiben Überspringen und Erledigen gesperrt. Nur „Präsentieren“ oder
|
||||
„Präsentation leeren“ verändert die öffentliche Ausgabe.
|
||||
- Abschnittstimer, tatsächliche Laufzeiten, Livefortschritt und Wiederaufnahme
|
||||
verwenden unverändert die vorhandenen persistenten Zustände.
|
||||
- „Live-Stand wiederaufnehmen“ erscheint nur bei einem tatsächlich
|
||||
@@ -60,21 +255,61 @@ heinzlive-Ausgabe und die gespeicherten Livezustände bleiben technisch getrennt
|
||||
|
||||
- Ausgabekanal verbinden, Schlüssel erneuern, Kanal trennen, Theme wechseln,
|
||||
Zeiten ein-/ausblenden und „Zur Planung“ bleiben im Regiemenü erreichbar.
|
||||
- Das Regiemenü erscheint als viewportgebundenes Popover sicher über den
|
||||
Glasflächen. Es bleibt in kleinen Fenstern scrollbar erreichbar und schließt
|
||||
mit Escape oder Außenklick; der Fokus kehrt zum Menüauslöser zurück.
|
||||
|
||||
### Interaktion
|
||||
|
||||
- „Interaktion“ ergänzt Piece und Sendungsfassung als optionales privates
|
||||
Markdownfeld zwischen Moderationsstichpunkten und Überleitung.
|
||||
- Vorlagen, Duplikate, Einplanungen und die bewusste Aktualisierung aus dem
|
||||
Fundus übernehmen das Feld jeweils als unabhängigen Snapshot.
|
||||
- Die private Live-Regie zeigt das Feld nur bei Inhalt. Die öffentliche
|
||||
heinzlive-Ausgabe übernimmt es nicht.
|
||||
|
||||
### Sendungsübersicht
|
||||
|
||||
- Sendungskarten bleiben auf kleinen Bildschirmen kompakt: Status, Titel und
|
||||
Termin stehen neben den horizontal angeordneten Abschnitts- und Zeitangaben,
|
||||
statt die Karte durch vollständiges Stapeln unnötig zu erhöhen.
|
||||
- „Liste | Kalender“ schaltet zwischen der bekannten Sendungsliste und einer
|
||||
Monatsansicht um; die Auswahl bleibt am angemeldeten Konto gespeichert.
|
||||
- Auf dem Desktop zeigt ein vollständiges Montag-bis-Sonntag-Raster alle Termine
|
||||
des Monats. Mehrere Sendungen pro Tag bleiben vollständig sichtbar und nach
|
||||
Uhrzeit sortiert.
|
||||
- Auf dem Smartphone wird derselbe Monat als chronologische Agenda dargestellt.
|
||||
Vorheriger Monat, nächster Monat und der Sprung zu heute bleiben erreichbar.
|
||||
- Die Gruppierung verwendet `Europe/Berlin`. Sendungen ohne Startzeit stehen in
|
||||
einem eigenen Bereich und verschwinden weder aus Liste noch Kalender.
|
||||
- Der Kalender ist eine Navigationsansicht. Termine werden weiterhin nur über
|
||||
die bestehende Sendungsbearbeitung geändert; Termin-Drag-and-drop wurde nicht
|
||||
ergänzt.
|
||||
|
||||
### Update und Kompatibilität
|
||||
|
||||
- Dieses Release benötigt keine neue Datenbankmigration und keine Änderung der
|
||||
Konfiguration.
|
||||
- Bestehende Sendungen, Livezustände, Timer, Ausgabekanäle und
|
||||
- `0012_show_overview_view.sql` ergänzt ausschließlich die kontobezogene
|
||||
Listen-/Kalenderpräferenz mit dem sicheren Standardwert `list`.
|
||||
- Es ist keine Änderung der Konfiguration erforderlich.
|
||||
- `0013_live_controls_and_interaction.sql` ergänzt das private Interaktionsfeld
|
||||
und persistente Gesamtzeitintervalle. Bestehende Piece-Laufintervalle werden
|
||||
als Gesamtzeit übernommen.
|
||||
- Bestehende Sendungen, Livezustände, Abschnittstimer, Ausgabekanäle und
|
||||
Präsentationssnapshots bleiben erhalten.
|
||||
- Paket, Lockdatei und Cloudron-Manifest tragen gemeinsam Version `0.5.12`.
|
||||
|
||||
### Prüfung
|
||||
|
||||
- 40 Unit- und Verhaltenstests sowie 16 Chromium-E2E-Abläufe sind erfolgreich.
|
||||
- Die Live-Regie wurde bei 1440 × 900, 900 × 450 und 390 × 700 Pixeln mit
|
||||
langen Inhalten, unabhängigen Scrollflächen und mobilem Ablauf-Sheet geprüft;
|
||||
die erzeugten Screenshots wurden visuell kontrolliert.
|
||||
- Die ergänzte Iconleiste, Pause/Fortsetzen und die kompakte Sendungskarte wurden
|
||||
gezielt in Chromium bei 670 × 450, 390 × 700 und 656 × 400 Pixeln geprüft.
|
||||
Typprüfung, sechs Live-Verhaltenstests und Produktionsbuild sind erfolgreich.
|
||||
- Die vollständige Matrix wurde für diese Ergänzung nicht erneut ausgeführt; die
|
||||
folgenden Gesamtnachweise stammen vom vorherigen 0.5.12-Stand.
|
||||
- 44 Unit- und Verhaltenstests sowie 17 Chromium-E2E-Abläufe sind erfolgreich.
|
||||
- Die Live-Regie wurde bei 1440 × 900, 900 × 450, 670 × 450 und 390 × 700 Pixeln
|
||||
mit langen Titeln, sichtbarem Regiemenü, unabhängigen Scrollflächen und
|
||||
mobilem Ablauf-Sheet geprüft; der Kalender zusätzlich bei 1440 × 1000 und
|
||||
390 × 844 Pixeln.
|
||||
- Reales OBS, echte YouTube-/TikTok-Wiedergabe und Safari auf einem iOS-Gerät
|
||||
standen nicht zur Verfügung.
|
||||
|
||||
|
||||
+215
-12
@@ -2,19 +2,207 @@
|
||||
|
||||
## Aktueller Umfang
|
||||
|
||||
Etappe 1 bis Etappe 5 sind abgeschlossen. Architektur, Gesamtdatenmodell,
|
||||
Etappe 1 bis Etappe 7 sind abgeschlossen. Architektur, Gesamtdatenmodell,
|
||||
Anmeldung, Rollen, persistente Inhaltsbearbeitung, Sendungsplanung,
|
||||
Live-Steuerung, Präsentationsausgabe und lokaler Betriebsweg sind dokumentiert.
|
||||
Etappe 6 wurde nicht begonnen.
|
||||
Live-Steuerung, Präsentationsausgabe, unveränderliche Sendungshistorie,
|
||||
Archiv, sichere Lesefreigaben, RSS-Import und technische REST-Zugänge sind
|
||||
dokumentiert.
|
||||
|
||||
## Kompakte Live-Regie 0.5.12
|
||||
## Lesender MCP-Zugang 0.7.3
|
||||
|
||||
- Der öffentliche Streamable-HTTP-Endpunkt `/mcp` liest Pieces, Sendungen und
|
||||
Abläufe über dieselben Dienste wie Browser und REST-API. Fünf deklarierte
|
||||
Werkzeuge besitzen nur Leseannotationen und keine Mutationspfade.
|
||||
- OAuth 2.1 verwendet Discovery-Metadaten, begrenzte dynamische
|
||||
Clientregistrierung, Authorization Code, PKCE `S256`, exakte Redirect-URIs
|
||||
und Ressourcenbindung. Codes und einstündige Tokens liegen nur gehasht vor.
|
||||
- OAuth-Tokens sind an den zustimmenden Nutzer gebunden. Sperrung und
|
||||
Passwortwechsel widerrufen sie; jeder Zugriff prüft erneut Nutzerstatus,
|
||||
Scope, Ablauf und Zielressource.
|
||||
- Aktuelles MCP `2026-07-28` mit `server/discover` und per-Request-Metadaten
|
||||
läuft neben den OpenAI-kompatiblen Initialisierungsfassungen. Ausgaben sind
|
||||
Positivlisten ohne E-Mail, Uploadnamen, interne Pfade oder Werkzeug-Arbeitsdaten.
|
||||
- Die konkrete Produktionsadresse ist
|
||||
`https://<Cloudron-App-Domain>/mcp`. Ein Cloudron-Deployment und eine reale
|
||||
ChatGPT-Verbindung wurden nicht durchgeführt.
|
||||
|
||||
Geprüft wurden Typen, Produktionsbuild und ein isolierter tatsächlicher
|
||||
HTTP-Ablauf über eine temporäre Datenbank: anonymer OAuth-Challenge, DCR,
|
||||
Zustimmung, PKCE-Tokenaustausch, Legacy-Initialisierung, aktuelle
|
||||
`server/discover`-Abfrage, Toolliste und `list_pieces` mit Seed-Daten waren
|
||||
erfolgreich. Eine weitere Verhaltenstest- oder Browsermatrix wurde gemäß
|
||||
Auftrag nicht ausgeführt.
|
||||
|
||||
## Bedienkorrekturen 0.7.2
|
||||
|
||||
- Der RSS-Importeingang ist eine kompakte Katalogfläche. Die eigentliche Auswahl
|
||||
öffnet einen responsiven Dialog mit kombinierbaren Quellenfiltern, 20 Beiträgen
|
||||
pro Seite, tastaturbedienbaren Auswahlkarten und einer festen bewussten
|
||||
Übernahme. Auswahl bleibt beim Filtern und Blättern erhalten; importierte oder
|
||||
verworfene Beiträge verschwinden über den bestehenden persistenten Status.
|
||||
- Das Live-Menü trennt Sendungssteuerung, Ansicht, Lesefreigaben,
|
||||
OBS-Ausgabekanal und Navigation. Pause/Fortsetzen und beide Timerresets liegen
|
||||
bei den Zeitflächen. Der Menüstatus unterscheidet Entwurf, Bereit, Läuft,
|
||||
Pausiert, Lauf beendet und historischen Abschluss; der OBS-Bereich bleibt bis
|
||||
zur bewussten Aktion eingeklappt.
|
||||
- Feedquellen und technische Zugänge verwenden dieselben Katalogkarten und
|
||||
Dialoggrundlagen wie Werkzeuge. Beide lassen sich anlegen und bearbeiten;
|
||||
Feeds behalten Abruf/Löschen, Zugänge ihren sofortigen Widerruf. Ein neuer
|
||||
API-Token wird im Dialog einmalig angezeigt und kann direkt kopiert werden.
|
||||
|
||||
Geprüft wurden 60 von 60 Verhaltenstests, Lint, Typprüfung, Produktionsbuild und
|
||||
20 von 20 Chromium-Abläufe. Der neue Ablauf prüft RSS-Auswahl über mehrere
|
||||
Quellen und Seiten, Übernahme ohne erneutes Angebot, Feed- und Zugangsanlage
|
||||
samt Bearbeitung und Tokenkopie. Das Live-Menü wurde laufend, pausiert und
|
||||
beendet sowie bei kleinem Desktopfenster und mobil geprüft. Die betroffenen
|
||||
Flächen wurden in hellem und dunklem Farbschema kontrolliert. Andere Browser und
|
||||
echte Mobilgeräte bleiben offen.
|
||||
|
||||
## Fehlerkorrekturen 0.7.1
|
||||
|
||||
- Explizite Abschnittsdauern werden während der Live-Regie nach Änderungen
|
||||
synchronisiert. Erledigte oder übersprungene Pieces lassen sich bewusst
|
||||
wiederaufnehmen; frühere Abschnitts- und Gesamtzeiten bleiben dabei erhalten.
|
||||
- Der mobile Ablauf liegt innerhalb eines isolierten Live-Containers, lange
|
||||
Metadaten verbreitern die Regie nicht mehr und das Sheet ist am mobilen
|
||||
Viewport verankert. `viewport-fit=cover`, Standalone-Metadaten und Manifest
|
||||
aktivieren Safe Areas auch beim Start vom Home-Bildschirm. Sendungskarten
|
||||
stapeln ihre Inhalte auf kleinen Bildschirmen eindeutig.
|
||||
- Die Vorbereitung liegt als eigener Status- und Aufwandsnapshot an der konkreten
|
||||
Einplanung. Vorbereitende Fundus-Pieces lassen sich planen; Originaländerungen,
|
||||
Duplikation und bewusste Aktualisierung folgen der bestehenden Snapshotregel.
|
||||
Usage-Titel, Sendung, Abschnitt, Termin und Themenicons führen direkt in den
|
||||
Usage-Editor; „sendefertig“ entfernt die Fassung aus der Übersicht.
|
||||
- Text, Nur Bild, Linkvorschau und Video besitzen in Fundus- und Usage-Editor
|
||||
kontextsensitive Felder und Vorschauen. Ausgeblendete Werte bleiben beim
|
||||
Moduswechsel erhalten.
|
||||
- Die Iconsuche fokussiert innerhalb der öffnenden Klick-/Tastaturaktion das
|
||||
Suchfeld. RSS-Feeds und technische Zugänge verwenden gestaltete Formfelder.
|
||||
- Lesefreigaben öffnen nach Serverantworten wieder mit dem einmalig sichtbaren
|
||||
Link, bieten Kopieren und sichere Ersatzlinks. Ersatzlinks invalidieren den
|
||||
alten Token und dessen Gastsitzungen. Die Verwaltung zeigt Freigaben direkt
|
||||
vor dem Werkzeugkatalog; der Dialog besitzt nur eine gestaltete Glasfläche.
|
||||
Gast- und historische Abschnitte besitzen äußere Karten mit Innenabstand.
|
||||
|
||||
Geprüft wurden 60 von 60 Verhaltenstests, Lint, Typprüfung, Produktionsbuild und
|
||||
19 von 19 Chromium-Abläufe. Die Browsermatrix öffnete beide Piece-Editoren,
|
||||
Sendungsübersicht, Verwaltung und Freigabedialoge, Gastansicht sowie Live-Regie
|
||||
bei Desktop- und Mobilbreiten. Safari und die installierte Webapp auf einem
|
||||
echten iOS-Gerät bleiben mangels Gerät getrennt offen.
|
||||
|
||||
## RSS-Import und externe Assistenz 0.7.0
|
||||
|
||||
- Barkeeper verwalten RSS-/Atom-Feeds mit Standardkategorie, Aktivierung und
|
||||
Abrufintervall; manueller Abruf und ein begrenzter Prozess-Scheduler verwenden
|
||||
dieselbe Fehler- und Dublettenlogik.
|
||||
- Feedabrufe prüfen Protokoll, Port, DNS und Redirects, begrenzen Laufzeit,
|
||||
Antwortgröße und Eintragszahl und lassen Fehler anderer Feeds unberührt.
|
||||
- Fremdes HTML wird entfernt. Beiträge bleiben mit stabiler Herkunft im
|
||||
getrennten Importeingang, bis die Redaktion sie auswählt, kategorisiert und
|
||||
als normale Pieces übernimmt oder dauerhaft verwirft.
|
||||
- `/api/v1` bietet Pieces und Sendungen über gehashte, widerrufbare technische
|
||||
Bearer-Tokens mit reinen Lese- oder Lese-/Schreibrechten an. Mutationen nutzen
|
||||
bestehende Dienste, Audit-Ereignisse, Revisionen und persistente
|
||||
Idempotenzschlüssel.
|
||||
- Die maschinenlesbare Beschreibung liegt unter `/api/v1/openapi.json`; eine
|
||||
ChatGPT-/Codex- oder andere konkrete Client-Anbindung wurde nicht eingerichtet.
|
||||
- Migration `0018_rss_and_api.sql` ergänzt ausschließlich additive Tabellen und
|
||||
Indizes. Sendewerk bleibt ohne KI und ohne konfigurierte Feeds vollständig
|
||||
nutzbar.
|
||||
|
||||
Geprüft wurden 58 Verhaltenstests, Typprüfung, Produktionsbuild, Dependency-
|
||||
Audit, vier RSS- und zwei Zugangssicherheitstests sowie ein echter HTTP-Rundlauf
|
||||
lesen → anlegen → idempotent wiederholen → ändern → erneut lesen → einplanen →
|
||||
sortieren. Desktop-Verwaltung und mobiler Eingang wurden in Chromium ohne
|
||||
Konsolenfehler geprüft. In der bestehenden Gesamtmatrix waren 16 von 18 Abläufen
|
||||
erfolgreich; die bereits bekannte Live-Zeitanzeige und der Ablauf
|
||||
Abschluss/Freigabe schlugen weiterhin fehl. Der globale Lintlauf bleibt an acht
|
||||
vorhandenen Formatierungsabweichungen außerhalb dieser Etappe offen.
|
||||
|
||||
## Wartungsrelease 0.6.1
|
||||
|
||||
- Abschnitts-Countdown, mobile Live-Kopfzeile und Ablauf-Sheet wurden korrigiert; die doppelte Piece-Positionsanzeige entfällt.
|
||||
- Optionaler Vorbereitungsaufwand, kompakte Vorbereitungsliste und Abschnitts-Twitch-Tags sind additiv persistiert.
|
||||
- Der Präsentationsmodus `image` gibt ausschließlich das bewusst gewählte Snapshot-Medium aus.
|
||||
- Mobile Eingaben, Iconsuche, Sendungskarten und Gastabstände wurden angepasst.
|
||||
- Lesefreigaben verwenden einen gemeinsamen Dialog und sind auch aus der Live-Regie erreichbar.
|
||||
|
||||
Geprüft wurden 52 Verhaltenstests, Typprüfung und Produktionsbuild. Im zweiten
|
||||
Chromium-Lauf waren 14 Abläufe erfolgreich; zwei Abläufe schlugen vor dem
|
||||
Zeitlimit fehl, zwei weitere wurden nicht mehr ausgeführt. Die vollständige
|
||||
Browsermatrix bleibt damit offen.
|
||||
|
||||
## Abschluss, Archiv und Freigaben 0.6.0
|
||||
|
||||
- das Ende eines Live-Laufs bleibt wiederaufnehmbar; erst der getrennte,
|
||||
idempotente Abschluss friert Sendung, Kategorien, tatsächliche Verwendungen
|
||||
und Zeiten unveränderlich ein
|
||||
- der Abschlussdialog zählt gesendete, übersprungene und offene Pieces getrennt
|
||||
und archiviert Fundus-Originale ausschließlich nach bewusster Auswahl
|
||||
- die Verwendungshistorie wird beim Abschluss materialisiert; übersprungene
|
||||
Verwendungen und die Reservebank zählen nicht als gesendet
|
||||
- abgeschlossene Sendungen liegen getrennt im Archiv, sind intern nur lesbar und
|
||||
lassen sich mit neuen IDs, offenen Verwendungen und ohne Live- oder
|
||||
Freigabezustand in einen neuen Entwurf duplizieren
|
||||
- Barkeeper verwalten gehashte Leselinks direkt in der Sendungsbearbeitung und
|
||||
gesammelt in der Verwaltung; Umfang, Passwort und Ablauf lassen sich ändern,
|
||||
Freigaben vollständig löschen
|
||||
- Entwürfe, bereite und laufende Sendungen lassen sich bereits freigeben;
|
||||
Planänderungen werden beim nächsten Gastaufruf sichtbar, während der Abschluss
|
||||
denselben Link auf den unveränderlichen historischen Stand festlegt
|
||||
- passwortgeschützte Freigaben verwenden kurzlebige, gehashte Gast-Sitzungen und
|
||||
begrenzen Fehlversuche pro Link und Clientadresse
|
||||
- Gastseiten liefern genau eine positiv projizierte Sendung ohne interne IDs,
|
||||
Originaldaten oder nicht freigegebene Felder; geschützte Präsentationsmedien
|
||||
prüfen Umfang, Passwortsitzung, Ablauf und Widerruf bei jedem Direktaufruf
|
||||
- bestehende abgeschlossene Sendungen werden durch Migration `0015` mit
|
||||
eingefrorener Historie übernommen; Migration `0016` erweitert bestehende
|
||||
Freigaben verlustfrei auf noch nicht abgeschlossene Sendungen
|
||||
|
||||
Die lokale Prüfmatrix umfasst 52 Verhaltenstests und 18 Chromium-Abläufe.
|
||||
Abschluss, Archiv, historische Nur-Lese-Ansicht, Passwortfreigabe,
|
||||
Scope-Begrenzung, direkter Medienzugriff, fremde IDs, Gast-Schreibversuch und
|
||||
Widerruf wurden zusätzlich in einem anonymen Browserkontext geprüft. Der
|
||||
erweiterte Ablauf prüft außerdem offene Sendungen, aktuelle Planänderungen,
|
||||
Bearbeiten und Löschen in beiden Barkeeper-Oberflächen sowie Desktop- und
|
||||
Smartphone-Layout.
|
||||
|
||||
## Live-Regie und Sendungskalender 0.5.12
|
||||
|
||||
- die Live-Kopfleiste zeigt Classic-Regular-Icons für Ausgabe, Gesamtzeit,
|
||||
Abschnitt, Menü und Ablauf; Pause/Fortsetzen liegt zusätzlich als direkter,
|
||||
beschrifteter Iconbutton neben der Abschnittszeit
|
||||
- Sendungskarten ordnen Fakten auf kleinen Bildschirmen wieder horizontal an und
|
||||
vermeiden dadurch die zuvor unnötig hohe Kartenfläche
|
||||
- Reparaturmigration `0014_live_show_timer_repair.sql` ergänzt fehlende
|
||||
Gesamttimertabellen auch dann, wenn `0013` bereits in einem früheren
|
||||
Zwischenstand protokolliert wurde; der 500-Fehler beim Laden von `/live` ist
|
||||
damit behoben
|
||||
- gemeinsame persistente Pause für Piece-, Abschnitts- und Gesamttimer;
|
||||
Fortsetzen zählt Pausenzeit weder nach Navigation noch nach Reload mit
|
||||
- getrennte bestätigungspflichtige Resets für Abschnitts- und Gesamtzeit, ohne
|
||||
Piece-Status, Ablaufposition, Restplanung oder Präsentationsstand zu verändern
|
||||
- umschaltbare, lokal gemerkte Anzeige von gelaufener Gesamtzeit und geschätzter
|
||||
Restzeit; Abschnitte ohne eigene Planung werden kenntlich gemacht und
|
||||
Abschnitts- sowie Piece-Dauern nie doppelt addiert
|
||||
- explizite Sendungssteuerung für Entwurf, Bereit, Start, Pause, Ende,
|
||||
Wiederaufnahme eines beendeten Laufs und klar getrennten neuen Durchlauf
|
||||
- optionales privates Markdownfeld „Interaktion“ zwischen Moderation und
|
||||
Überleitung; Original, Vorlage, Sendungsfassung, Duplikation und bewusste
|
||||
Fundus-Aktualisierung führen jeweils unabhängige Snapshots
|
||||
- „Interaktion“, Timer- und Sendungssteuerung bleiben aus der öffentlichen
|
||||
heinzlive-Projektion ausgeschlossen
|
||||
- fokussierte private Liveansicht ohne normale App-Seitenleiste oder mobile
|
||||
Bottomnavigation; Planung, Theme, Schriftgröße, Zeitdarstellung und
|
||||
Ausgabekanal bleiben über das kompakte Regiemenü erreichbar
|
||||
- feste Kopfzeile mit aktuellem Abschnitt, persistentem Abschnittscountdown und
|
||||
öffentlichem Ausgabezustand sowie feste Fußleiste mit nächstem Piece,
|
||||
Präsentation, Überspringen und kontextgerechtem Erledigen
|
||||
- zweizeilige feste Kopfzeile: Abschnitt und „Danach“ teilen sich die erste
|
||||
Zeile mit dem Menü; Ausgabe, Abschnittscountdown und Ablaufschalter bilden die
|
||||
zweite Zeile. Der Sendungsname steht platzsparend im Menü
|
||||
- lange Abschnitts- und Folgetitel sind regulär einzeilig gekürzt und lassen
|
||||
sich per Klick oder Tastatur vollständig aufklappen
|
||||
- feste, auf vier Kernaktionen reduzierte Fußleiste mit Zurück, Präsentieren,
|
||||
Überspringen und kontextgerechtem Erledigen; das Leeren der Präsentation liegt
|
||||
direkt beim Ausgabezustand
|
||||
- aktuelle Moderation und schmale Ablaufspalte bleiben auch bei 900 × 450 Pixeln
|
||||
nebeneinander; beide Arbeitsflächen scrollen unabhängig, ohne die ganze Seite
|
||||
oder einzelne Textblöcke zu verschachtelten Scrollcontainern zu machen
|
||||
@@ -22,22 +210,37 @@ Etappe 6 wurde nicht begonnen.
|
||||
verfügbaren Höhe verdichtet, ohne Text oder Gesamtoberfläche zu skalieren
|
||||
- auf schmalen Ansichten bleibt das Piece die Hauptfläche und der Ablauf öffnet
|
||||
als separates, safe-area-fähiges Sheet mit Fokusführung und Escape-Schließen
|
||||
- kompakter aufklappbarer Ablauf mit ausgeschriebenen Zuständen, direkter
|
||||
Auswahl jedes Pieces, automatisch sichtbarem aktuellen Eintrag und
|
||||
- kompakter aufklappbarer Ablauf mit ausgeschriebenen Zuständen, lokaler
|
||||
Betrachtung jedes Pieces, automatisch sichtbarem aktuellen Eintrag und
|
||||
zusammengeklappter Reserve; Sortierung bleibt in einer kompakten Aktion
|
||||
erreichbar, dauerhafte Sortierpfeile entfallen
|
||||
- die Leseposition wird je Piece lokal erhalten; ein erstmals gewähltes Piece
|
||||
beginnt oben statt an der Position des vorherigen Textes
|
||||
- Piece-Position, Titel und Zeit teilen sich einen kompakten Piece-Kopf, ohne die
|
||||
einstellbare Moderationsschrift zu verkleinern
|
||||
- das Regiemenü liegt als viewportgebundenes Popover sicher über den Glasflächen,
|
||||
bleibt scrollbar erreichbar und schließt per Escape oder Außenklick mit
|
||||
Fokus-Rückkehr zum Auslöser
|
||||
- Recherche, Quellen, Werkzeuge und eigene Notizen erscheinen nur bei Bedarf;
|
||||
leere Moderationsbereiche werden nicht dargestellt
|
||||
- Livefortschritt, direkte Auswahl, Abschnittstimer und öffentliche Präsentation
|
||||
verwenden unverändert ihre getrennten persistenten Zustände
|
||||
- Zurück und direkte Ablaufwahl verändern weder tatsächliches Live-Piece noch
|
||||
Status, Timer oder öffentliche Ausgabe; Überspringen und Erledigen bleiben bei
|
||||
einem nur betrachteten früheren Piece gesperrt
|
||||
- Liste und Kalender teilen dieselben Sendungsdaten; der Desktop zeigt ein
|
||||
vollständiges Monatsraster, das Smartphone eine chronologische Monatsagenda
|
||||
- Monatswechsel, heutiger Tag, mehrere Termine pro Tag und Sendungen ohne Termin
|
||||
bleiben sichtbar; die bevorzugte Listen- oder Kalenderansicht wird je Konto
|
||||
gespeichert
|
||||
- die Wiederaufnahmeaktion erscheint nur bei tatsächlich unterbrochenem
|
||||
Live-Stand statt während eines laufenden Pieces
|
||||
|
||||
Etappe 6 bleibt unverändert unbegonnen.
|
||||
|
||||
Die lokale Prüfmatrix umfasst 40 Verhaltenstests und 16 Chromium-Abläufe.
|
||||
Die bestehende lokale Prüfmatrix umfasst 44 Verhaltenstests und 17
|
||||
Chromium-Abläufe. Die nachträgliche Icon-, Pause- und Kartenkorrektur wurde
|
||||
zusätzlich mit Typprüfung, sechs Live-Verhaltenstests, Produktionsbuild und
|
||||
gezielten Chromium-Abläufen bei 670 × 450, 390 × 700 und 656 × 400 Pixeln
|
||||
geprüft. Die vollständige Matrix wurde dafür nicht erneut ausgeführt.
|
||||
Reales OBS, echte YouTube-/TikTok-Wiedergabe sowie Safari auf einem iOS-Gerät
|
||||
bleiben mangels verfügbarer Umgebung offen.
|
||||
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
ALTER TABLE users
|
||||
ADD COLUMN show_overview_view TEXT NOT NULL DEFAULT 'list'
|
||||
CHECK (show_overview_view IN ('list', 'calendar'));
|
||||
@@ -0,0 +1,21 @@
|
||||
ALTER TABLE pieces ADD COLUMN interaction_text TEXT NOT NULL DEFAULT '';
|
||||
ALTER TABLE piece_usages ADD COLUMN interaction_snapshot TEXT NOT NULL DEFAULT '';
|
||||
|
||||
CREATE TABLE live_show_timer_runs (
|
||||
id TEXT PRIMARY KEY,
|
||||
show_id TEXT NOT NULL REFERENCES shows(id) ON DELETE CASCADE,
|
||||
started_at_utc TEXT NOT NULL,
|
||||
ended_at_utc TEXT,
|
||||
CHECK (ended_at_utc IS NULL OR ended_at_utc >= started_at_utc)
|
||||
);
|
||||
|
||||
CREATE UNIQUE INDEX idx_one_open_show_timer_run
|
||||
ON live_show_timer_runs(show_id)
|
||||
WHERE ended_at_utc IS NULL;
|
||||
|
||||
CREATE INDEX idx_live_show_timer_runs_show
|
||||
ON live_show_timer_runs(show_id, started_at_utc);
|
||||
|
||||
INSERT INTO live_show_timer_runs (id, show_id, started_at_utc, ended_at_utc)
|
||||
SELECT 'migrated-' || id, show_id, started_at_utc, ended_at_utc
|
||||
FROM live_usage_runs;
|
||||
@@ -0,0 +1,18 @@
|
||||
CREATE TABLE IF NOT EXISTS live_show_timer_runs (
|
||||
id TEXT PRIMARY KEY,
|
||||
show_id TEXT NOT NULL REFERENCES shows(id) ON DELETE CASCADE,
|
||||
started_at_utc TEXT NOT NULL,
|
||||
ended_at_utc TEXT,
|
||||
CHECK (ended_at_utc IS NULL OR ended_at_utc >= started_at_utc)
|
||||
);
|
||||
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS idx_one_open_show_timer_run
|
||||
ON live_show_timer_runs(show_id)
|
||||
WHERE ended_at_utc IS NULL;
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_live_show_timer_runs_show
|
||||
ON live_show_timer_runs(show_id, started_at_utc);
|
||||
|
||||
INSERT OR IGNORE INTO live_show_timer_runs (id, show_id, started_at_utc, ended_at_utc)
|
||||
SELECT 'migrated-' || id, show_id, started_at_utc, ended_at_utc
|
||||
FROM live_usage_runs;
|
||||
@@ -0,0 +1,115 @@
|
||||
ALTER TABLE shows ADD COLUMN completed_at_utc TEXT;
|
||||
|
||||
ALTER TABLE show_sections ADD COLUMN category_name_snapshot TEXT;
|
||||
ALTER TABLE show_sections ADD COLUMN category_color_snapshot TEXT;
|
||||
|
||||
CREATE TABLE show_finalizations (
|
||||
show_id TEXT PRIMARY KEY REFERENCES shows(id) ON DELETE CASCADE,
|
||||
command_id TEXT NOT NULL,
|
||||
source_revision INTEGER NOT NULL CHECK (source_revision >= 1),
|
||||
finalized_by_user_id TEXT REFERENCES users(id) ON DELETE SET NULL,
|
||||
finalized_at_utc TEXT NOT NULL,
|
||||
UNIQUE (show_id, command_id)
|
||||
);
|
||||
|
||||
CREATE TABLE show_finalization_archived_pieces (
|
||||
show_id TEXT NOT NULL REFERENCES show_finalizations(show_id) ON DELETE CASCADE,
|
||||
piece_id TEXT NOT NULL REFERENCES pieces(id) ON DELETE RESTRICT,
|
||||
PRIMARY KEY (show_id, piece_id)
|
||||
);
|
||||
|
||||
CREATE TABLE piece_usage_history (
|
||||
usage_id TEXT PRIMARY KEY REFERENCES piece_usages(id) ON DELETE RESTRICT,
|
||||
show_id TEXT NOT NULL REFERENCES shows(id) ON DELETE RESTRICT,
|
||||
original_piece_id TEXT NOT NULL REFERENCES pieces(id) ON DELETE RESTRICT,
|
||||
show_title_snapshot TEXT NOT NULL,
|
||||
usage_title_snapshot TEXT NOT NULL,
|
||||
used_at_utc TEXT NOT NULL,
|
||||
actual_duration_seconds INTEGER NOT NULL CHECK (actual_duration_seconds >= 0)
|
||||
);
|
||||
|
||||
CREATE INDEX idx_piece_usage_history_original
|
||||
ON piece_usage_history(original_piece_id, used_at_utc DESC);
|
||||
|
||||
CREATE TABLE show_duplication_commands (
|
||||
source_show_id TEXT NOT NULL REFERENCES show_finalizations(show_id) ON DELETE CASCADE,
|
||||
command_id TEXT NOT NULL,
|
||||
created_show_id TEXT NOT NULL REFERENCES shows(id) ON DELETE CASCADE,
|
||||
created_at_utc TEXT NOT NULL,
|
||||
PRIMARY KEY (source_show_id, command_id)
|
||||
);
|
||||
|
||||
CREATE TABLE show_shares (
|
||||
id TEXT PRIMARY KEY,
|
||||
show_id TEXT NOT NULL REFERENCES show_finalizations(show_id) ON DELETE CASCADE,
|
||||
token_hash TEXT NOT NULL UNIQUE,
|
||||
scope TEXT NOT NULL CHECK (scope IN ('rundown', 'moderation', 'research')),
|
||||
password_hash TEXT,
|
||||
expires_at_utc TEXT,
|
||||
revoked_at_utc TEXT,
|
||||
created_by_user_id TEXT NOT NULL REFERENCES users(id) ON DELETE RESTRICT,
|
||||
created_at_utc TEXT NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX idx_show_shares_show ON show_shares(show_id, created_at_utc DESC);
|
||||
|
||||
CREATE TABLE show_share_sessions (
|
||||
token_hash TEXT PRIMARY KEY,
|
||||
share_id TEXT NOT NULL REFERENCES show_shares(id) ON DELETE CASCADE,
|
||||
created_at_utc TEXT NOT NULL,
|
||||
expires_at_utc TEXT NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX idx_show_share_sessions_share ON show_share_sessions(share_id, expires_at_utc);
|
||||
|
||||
CREATE TABLE share_password_attempts (
|
||||
id TEXT PRIMARY KEY,
|
||||
share_key TEXT NOT NULL,
|
||||
address_key TEXT NOT NULL,
|
||||
attempted_at_utc TEXT NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX idx_share_password_attempts_share
|
||||
ON share_password_attempts(share_key, attempted_at_utc);
|
||||
CREATE INDEX idx_share_password_attempts_address
|
||||
ON share_password_attempts(address_key, attempted_at_utc);
|
||||
|
||||
UPDATE show_sections
|
||||
SET category_name_snapshot = (
|
||||
SELECT name FROM section_categories WHERE id = show_sections.category_id
|
||||
),
|
||||
category_color_snapshot = (
|
||||
SELECT color FROM section_categories WHERE id = show_sections.category_id
|
||||
)
|
||||
WHERE show_id IN (SELECT id FROM shows WHERE status = 'completed');
|
||||
|
||||
UPDATE shows
|
||||
SET completed_at_utc = COALESCE(
|
||||
(SELECT ended_at_utc FROM show_live_states WHERE show_id = shows.id),
|
||||
updated_at_utc
|
||||
)
|
||||
WHERE status = 'completed';
|
||||
|
||||
INSERT INTO show_finalizations (
|
||||
show_id, command_id, source_revision, finalized_by_user_id, finalized_at_utc
|
||||
)
|
||||
SELECT id, 'migration-' || id, revision, NULL, completed_at_utc
|
||||
FROM shows
|
||||
WHERE status = 'completed';
|
||||
|
||||
INSERT INTO piece_usage_history (
|
||||
usage_id, show_id, original_piece_id, show_title_snapshot, usage_title_snapshot,
|
||||
used_at_utc, actual_duration_seconds
|
||||
)
|
||||
SELECT u.id, sh.id, u.original_piece_id, sh.title, u.title_snapshot,
|
||||
COALESCE(sh.starts_at_utc, sh.completed_at_utc),
|
||||
COALESCE((
|
||||
SELECT sum(max(0, CAST((julianday(COALESCE(r.ended_at_utc, sh.completed_at_utc)) -
|
||||
julianday(r.started_at_utc)) * 86400 AS INTEGER)))
|
||||
FROM live_usage_runs r WHERE r.usage_id = u.id
|
||||
), 0)
|
||||
FROM piece_usages u
|
||||
JOIN show_sections s ON s.id = u.show_section_id
|
||||
JOIN shows sh ON sh.id = s.show_id
|
||||
WHERE sh.status = 'completed' AND s.is_reserve_bank = 0
|
||||
AND u.status = 'done' AND u.original_piece_id IS NOT NULL;
|
||||
@@ -0,0 +1,43 @@
|
||||
DROP INDEX idx_show_share_sessions_share;
|
||||
DROP INDEX idx_show_shares_show;
|
||||
|
||||
ALTER TABLE show_share_sessions RENAME TO show_share_sessions_v15;
|
||||
ALTER TABLE show_shares RENAME TO show_shares_v15;
|
||||
|
||||
CREATE TABLE show_shares (
|
||||
id TEXT PRIMARY KEY,
|
||||
show_id TEXT NOT NULL REFERENCES shows(id) ON DELETE CASCADE,
|
||||
token_hash TEXT NOT NULL UNIQUE,
|
||||
scope TEXT NOT NULL CHECK (scope IN ('rundown', 'moderation', 'research')),
|
||||
password_hash TEXT,
|
||||
expires_at_utc TEXT,
|
||||
revoked_at_utc TEXT,
|
||||
created_by_user_id TEXT NOT NULL REFERENCES users(id) ON DELETE RESTRICT,
|
||||
created_at_utc TEXT NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX idx_show_shares_show ON show_shares(show_id, created_at_utc DESC);
|
||||
|
||||
CREATE TABLE show_share_sessions (
|
||||
token_hash TEXT PRIMARY KEY,
|
||||
share_id TEXT NOT NULL REFERENCES show_shares(id) ON DELETE CASCADE,
|
||||
created_at_utc TEXT NOT NULL,
|
||||
expires_at_utc TEXT NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX idx_show_share_sessions_share ON show_share_sessions(share_id, expires_at_utc);
|
||||
|
||||
INSERT INTO show_shares (
|
||||
id, show_id, token_hash, scope, password_hash, expires_at_utc, revoked_at_utc,
|
||||
created_by_user_id, created_at_utc
|
||||
)
|
||||
SELECT id, show_id, token_hash, scope, password_hash, expires_at_utc, revoked_at_utc,
|
||||
created_by_user_id, created_at_utc
|
||||
FROM show_shares_v15;
|
||||
|
||||
INSERT INTO show_share_sessions (token_hash, share_id, created_at_utc, expires_at_utc)
|
||||
SELECT token_hash, share_id, created_at_utc, expires_at_utc
|
||||
FROM show_share_sessions_v15;
|
||||
|
||||
DROP TABLE show_share_sessions_v15;
|
||||
DROP TABLE show_shares_v15;
|
||||
@@ -0,0 +1,10 @@
|
||||
ALTER TABLE pieces ADD COLUMN preparation_effort TEXT CHECK (
|
||||
preparation_effort IS NULL OR preparation_effort IN ('low', 'medium', 'high')
|
||||
);
|
||||
ALTER TABLE pieces ADD COLUMN presentation_image_only INTEGER NOT NULL DEFAULT 0
|
||||
CHECK (presentation_image_only IN (0, 1));
|
||||
ALTER TABLE piece_usages ADD COLUMN presentation_image_only_snapshot INTEGER NOT NULL DEFAULT 0
|
||||
CHECK (presentation_image_only_snapshot IN (0, 1));
|
||||
|
||||
ALTER TABLE show_sections ADD COLUMN twitch_tags TEXT NOT NULL DEFAULT '';
|
||||
ALTER TABLE show_template_sections ADD COLUMN twitch_tags TEXT NOT NULL DEFAULT '';
|
||||
@@ -0,0 +1,66 @@
|
||||
CREATE TABLE feed_sources (
|
||||
id TEXT PRIMARY KEY,
|
||||
name TEXT NOT NULL UNIQUE,
|
||||
url TEXT NOT NULL UNIQUE,
|
||||
is_enabled INTEGER NOT NULL DEFAULT 1 CHECK (is_enabled IN (0, 1)),
|
||||
refresh_interval_minutes INTEGER NOT NULL DEFAULT 60 CHECK (refresh_interval_minutes BETWEEN 15 AND 10080),
|
||||
default_category_id TEXT REFERENCES section_categories(id) ON DELETE SET NULL,
|
||||
etag TEXT NOT NULL DEFAULT '',
|
||||
last_modified TEXT NOT NULL DEFAULT '',
|
||||
last_fetched_at_utc TEXT,
|
||||
next_fetch_at_utc TEXT,
|
||||
last_error TEXT NOT NULL DEFAULT '',
|
||||
created_at_utc TEXT NOT NULL,
|
||||
updated_at_utc TEXT NOT NULL
|
||||
);
|
||||
|
||||
CREATE TABLE feed_entries (
|
||||
id TEXT PRIMARY KEY,
|
||||
feed_id TEXT NOT NULL REFERENCES feed_sources(id) ON DELETE CASCADE,
|
||||
external_id TEXT NOT NULL,
|
||||
title TEXT NOT NULL,
|
||||
url TEXT NOT NULL,
|
||||
summary TEXT NOT NULL DEFAULT '',
|
||||
published_at_utc TEXT,
|
||||
status TEXT NOT NULL DEFAULT 'new' CHECK (status IN ('new', 'imported', 'discarded')),
|
||||
piece_id TEXT REFERENCES pieces(id) ON DELETE SET NULL,
|
||||
first_seen_at_utc TEXT NOT NULL,
|
||||
updated_at_utc TEXT NOT NULL,
|
||||
UNIQUE (feed_id, external_id)
|
||||
);
|
||||
|
||||
CREATE INDEX feed_entries_status_idx ON feed_entries(status, first_seen_at_utc DESC);
|
||||
CREATE INDEX feed_sources_due_idx ON feed_sources(is_enabled, next_fetch_at_utc);
|
||||
|
||||
CREATE TABLE technical_accesses (
|
||||
id TEXT PRIMARY KEY,
|
||||
name TEXT NOT NULL UNIQUE,
|
||||
token_hash TEXT NOT NULL UNIQUE,
|
||||
permissions TEXT NOT NULL CHECK (permissions IN ('read', 'read_write')),
|
||||
created_by_user_id TEXT NOT NULL REFERENCES users(id),
|
||||
created_at_utc TEXT NOT NULL,
|
||||
last_used_at_utc TEXT,
|
||||
revoked_at_utc TEXT
|
||||
);
|
||||
|
||||
CREATE TABLE api_idempotency (
|
||||
access_id TEXT NOT NULL REFERENCES technical_accesses(id) ON DELETE CASCADE,
|
||||
request_key TEXT NOT NULL,
|
||||
request_hash TEXT NOT NULL,
|
||||
status_code INTEGER NOT NULL,
|
||||
response_json TEXT NOT NULL CHECK (json_valid(response_json)),
|
||||
created_at_utc TEXT NOT NULL,
|
||||
PRIMARY KEY (access_id, request_key)
|
||||
);
|
||||
|
||||
CREATE TABLE audit_events (
|
||||
id TEXT PRIMARY KEY,
|
||||
actor_type TEXT NOT NULL CHECK (actor_type IN ('user', 'technical')),
|
||||
actor_id TEXT NOT NULL,
|
||||
action TEXT NOT NULL,
|
||||
target_type TEXT NOT NULL,
|
||||
target_id TEXT NOT NULL,
|
||||
created_at_utc TEXT NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX audit_events_created_idx ON audit_events(created_at_utc DESC);
|
||||
@@ -0,0 +1,17 @@
|
||||
ALTER TABLE piece_usages ADD COLUMN preparation_status_snapshot TEXT NOT NULL DEFAULT 'ready'
|
||||
CHECK (preparation_status_snapshot IN ('preparing', 'ready'));
|
||||
|
||||
ALTER TABLE piece_usages ADD COLUMN preparation_effort_snapshot TEXT
|
||||
CHECK (preparation_effort_snapshot IS NULL OR preparation_effort_snapshot IN ('low', 'medium', 'high'));
|
||||
|
||||
UPDATE piece_usages
|
||||
SET preparation_status_snapshot = CASE
|
||||
WHEN EXISTS (
|
||||
SELECT 1 FROM pieces p
|
||||
WHERE p.id = piece_usages.original_piece_id AND p.status = 'preparing'
|
||||
) THEN 'preparing'
|
||||
ELSE 'ready'
|
||||
END,
|
||||
preparation_effort_snapshot = (
|
||||
SELECT p.preparation_effort FROM pieces p WHERE p.id = piece_usages.original_piece_id
|
||||
);
|
||||
@@ -0,0 +1,49 @@
|
||||
CREATE TABLE oauth_clients (
|
||||
id TEXT PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
redirect_uris_json TEXT NOT NULL CHECK (json_valid(redirect_uris_json)),
|
||||
created_at_utc TEXT NOT NULL
|
||||
);
|
||||
|
||||
CREATE TABLE oauth_authorization_codes (
|
||||
code_hash TEXT PRIMARY KEY,
|
||||
client_id TEXT NOT NULL REFERENCES oauth_clients(id) ON DELETE CASCADE,
|
||||
user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
redirect_uri TEXT NOT NULL,
|
||||
scope TEXT NOT NULL,
|
||||
resource TEXT NOT NULL,
|
||||
code_challenge TEXT NOT NULL,
|
||||
created_at_utc TEXT NOT NULL,
|
||||
expires_at_utc TEXT NOT NULL,
|
||||
consumed_at_utc TEXT
|
||||
);
|
||||
|
||||
CREATE INDEX oauth_authorization_codes_expiry_idx
|
||||
ON oauth_authorization_codes(expires_at_utc);
|
||||
|
||||
CREATE TABLE oauth_access_tokens (
|
||||
token_hash TEXT PRIMARY KEY,
|
||||
client_id TEXT NOT NULL REFERENCES oauth_clients(id) ON DELETE CASCADE,
|
||||
user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
scope TEXT NOT NULL,
|
||||
resource TEXT NOT NULL,
|
||||
created_at_utc TEXT NOT NULL,
|
||||
expires_at_utc TEXT NOT NULL,
|
||||
last_used_at_utc TEXT,
|
||||
request_window_started_at_utc TEXT NOT NULL,
|
||||
request_count INTEGER NOT NULL DEFAULT 0 CHECK (request_count >= 0),
|
||||
revoked_at_utc TEXT
|
||||
);
|
||||
|
||||
CREATE INDEX oauth_access_tokens_user_idx ON oauth_access_tokens(user_id);
|
||||
CREATE INDEX oauth_access_tokens_expiry_idx ON oauth_access_tokens(expires_at_utc);
|
||||
|
||||
CREATE TABLE oauth_rate_limit_attempts (
|
||||
id TEXT PRIMARY KEY,
|
||||
kind TEXT NOT NULL CHECK (kind IN ('registration', 'token')),
|
||||
address_hash TEXT NOT NULL,
|
||||
attempted_at_utc TEXT NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX oauth_rate_limit_attempts_lookup_idx
|
||||
ON oauth_rate_limit_attempts(kind, address_hash, attempted_at_utc);
|
||||
Generated
+123
-2
@@ -1,15 +1,16 @@
|
||||
{
|
||||
"name": "sendewerk",
|
||||
"version": "0.5.12",
|
||||
"version": "0.7.3",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "sendewerk",
|
||||
"version": "0.5.12",
|
||||
"version": "0.7.3",
|
||||
"dependencies": {
|
||||
"@node-rs/argon2": "^2.2.2",
|
||||
"better-sqlite3": "^13.0.3",
|
||||
"fast-xml-parser": "^5.11.2",
|
||||
"file-type": "^22.2.0",
|
||||
"marked": "^18.1.1",
|
||||
"metascraper": "^5.58.5",
|
||||
@@ -599,6 +600,18 @@
|
||||
"node": ">= 22.13"
|
||||
}
|
||||
},
|
||||
"node_modules/@nodable/entities": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-3.1.0.tgz",
|
||||
"integrity": "sha512-LsS/DjHr+uDM647Gru/cA8+J3a3HfhttwCKLyuoyN7yXTFCxKBtSgMQBvrW9yNPa2/zDRUNuGPaH5QUFoa4arQ==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/nodable"
|
||||
}
|
||||
],
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@node-rs/argon2": {
|
||||
"version": "2.2.2",
|
||||
"resolved": "https://registry.npmjs.org/@node-rs/argon2/-/argon2-2.2.2.tgz",
|
||||
@@ -1630,6 +1643,18 @@
|
||||
"url": "https://github.com/sponsors/epoberezkin"
|
||||
}
|
||||
},
|
||||
"node_modules/anynum": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/anynum/-/anynum-1.0.1.tgz",
|
||||
"integrity": "sha512-N6//FLET/tXYNM/F6ABca1oH6fWB+KlTt909Le28WMDBk8oaT4vY17DCrwg2MvmuqUKt3Ni4N5dGJ/EoBgcO6A==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/NaturalIntelligence"
|
||||
}
|
||||
],
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/aria-query": {
|
||||
"version": "5.3.1",
|
||||
"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.1.tgz",
|
||||
@@ -2689,6 +2714,45 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/fast-xml-builder": {
|
||||
"version": "1.3.1",
|
||||
"resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.3.1.tgz",
|
||||
"integrity": "sha512-pIM/1n3ntFXKYrUZwW7QCK0gAW7XY+wzj1YMIV3tLDvPj/V+zTGJK5e3/4WJfwj0qWw2ElNXiTixda/R+3YSug==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/NaturalIntelligence"
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"path-expression-matcher": "^1.6.2",
|
||||
"xml-naming": "^0.3.0"
|
||||
}
|
||||
},
|
||||
"node_modules/fast-xml-parser": {
|
||||
"version": "5.11.2",
|
||||
"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.11.2.tgz",
|
||||
"integrity": "sha512-R9iDuNrQYeQut46cn2r2wHKn4HYzVDvDm5J1wW+koZewykv0yuO2HChTYeZtrULyHIDM9cj9TUXloCsueCQUog==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/NaturalIntelligence"
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@nodable/entities": "^3.0.1",
|
||||
"fast-xml-builder": "^1.2.0",
|
||||
"is-unsafe": "^2.0.0",
|
||||
"path-expression-matcher": "^1.6.2",
|
||||
"strnum": "^2.4.2",
|
||||
"xml-naming": "^0.3.0"
|
||||
},
|
||||
"bin": {
|
||||
"fxparser": "src/cli/cli.js"
|
||||
}
|
||||
},
|
||||
"node_modules/fdir": {
|
||||
"version": "6.5.0",
|
||||
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
|
||||
@@ -3055,6 +3119,18 @@
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/is-unsafe": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/is-unsafe/-/is-unsafe-2.0.2.tgz",
|
||||
"integrity": "sha512-HgbIHPBH0KHHCcjLfGsCvhtPTVxjaAZlXjwdz7/GQC40SjSe4sfQsar8J5VFo8JOSbarkpV0OLG95bbaNd9aAQ==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/NaturalIntelligence"
|
||||
}
|
||||
],
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/is-uri": {
|
||||
"version": "1.2.14",
|
||||
"resolved": "https://registry.npmjs.org/is-uri/-/is-uri-1.2.14.tgz",
|
||||
@@ -4052,6 +4128,21 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/path-expression-matcher": {
|
||||
"version": "1.6.2",
|
||||
"resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.6.2.tgz",
|
||||
"integrity": "sha512-enSlaiat05iasnzmgNxRj8reFdj3puY2QpNgP1aPIaVfT6nn9ICuPoFlKHk8EN22HcwewshO+mN2DGbkCEOtqQ==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/NaturalIntelligence"
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/path-key": {
|
||||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
|
||||
@@ -4545,6 +4636,21 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/strnum": {
|
||||
"version": "2.5.1",
|
||||
"resolved": "https://registry.npmjs.org/strnum/-/strnum-2.5.1.tgz",
|
||||
"integrity": "sha512-UM4nTLWzQiDBseVxUGxN0wJzIk0UU89Qi7pKXz9qISo+lhviJikTuikBsK/oFRlpvYHvSdz0TVoLyQ+sEpYwxA==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/NaturalIntelligence"
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"anynum": "^1.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/strtok3": {
|
||||
"version": "10.6.2",
|
||||
"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-10.6.2.tgz",
|
||||
@@ -5284,6 +5390,21 @@
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/xml-naming": {
|
||||
"version": "0.3.0",
|
||||
"resolved": "https://registry.npmjs.org/xml-naming/-/xml-naming-0.3.0.tgz",
|
||||
"integrity": "sha512-ghig2TBE/H11aOVgmahA3MhimvkBr6JIYknH/Dhdk10nXwdbIqBJsbfMxpvFPG8bAw77gN29aQWvKpmVoPlvPQ==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/NaturalIntelligence"
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=16.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/xmlchars": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
|
||||
|
||||
+2
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "sendewerk",
|
||||
"private": true,
|
||||
"version": "0.5.12",
|
||||
"version": "0.7.3",
|
||||
"type": "module",
|
||||
"engines": {
|
||||
"node": ">=22.17 <25"
|
||||
@@ -26,6 +26,7 @@
|
||||
"dependencies": {
|
||||
"@node-rs/argon2": "^2.2.2",
|
||||
"better-sqlite3": "^13.0.3",
|
||||
"fast-xml-parser": "^5.11.2",
|
||||
"file-type": "^22.2.0",
|
||||
"marked": "^18.1.1",
|
||||
"metascraper": "^5.58.5",
|
||||
|
||||
+1661
-125
File diff suppressed because it is too large.
Load diff
Vendored
+1
@@ -8,6 +8,7 @@ declare global {
|
||||
interface PageData {
|
||||
user?: AuthUser | null;
|
||||
presentationMode?: boolean;
|
||||
oauthMode?: boolean;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+5
-1
@@ -2,8 +2,12 @@
|
||||
<html lang="de" data-theme="light" data-theme-preference="system">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
|
||||
<meta name="theme-color" content="#f4f1eb" />
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
|
||||
<meta name="apple-mobile-web-app-title" content="Sendewerk" />
|
||||
<link rel="manifest" href="%sveltekit.assets%/manifest.webmanifest" />
|
||||
<script>
|
||||
(function () {
|
||||
try {
|
||||
|
||||
+45
-3
@@ -1,6 +1,8 @@
|
||||
import { randomBytes } from 'node:crypto';
|
||||
import { redirect } from '@sveltejs/kit';
|
||||
import type { Handle } from '@sveltejs/kit/hooks';
|
||||
import { deleteSession, getSessionUser, hasUsers, SESSION_COOKIE } from '#lib/server/auth.js';
|
||||
import { startFeedScheduler } from '#lib/server/feeds.js';
|
||||
|
||||
const publicPaths = new Set([
|
||||
'/',
|
||||
@@ -13,17 +15,42 @@ const publicPaths = new Set([
|
||||
]);
|
||||
|
||||
export const handle: Handle = async ({ event, resolve }) => {
|
||||
startFeedScheduler();
|
||||
const presentationPath = event.url.pathname.startsWith('/heinzlive/');
|
||||
const sharePath = event.url.pathname.startsWith('/freigabe/');
|
||||
const shareMediaPath = /^\/freigabe\/[^/]+\/media\/[^/]+$/.test(event.url.pathname);
|
||||
const apiPath = event.url.pathname.startsWith('/api/v1/');
|
||||
const oauthPath =
|
||||
event.url.pathname.startsWith('/oauth/') ||
|
||||
event.url.pathname.startsWith('/.well-known/oauth-');
|
||||
const mcpPath = event.url.pathname === '/mcp';
|
||||
const presentationTestPath = /^\/fundus\/[^/]+\/praesentation(?:\/|$)/.test(event.url.pathname);
|
||||
const token = event.cookies.get(SESSION_COOKIE);
|
||||
event.locals.user = getSessionUser(token);
|
||||
if (token && !event.locals.user) deleteSession(event.cookies);
|
||||
|
||||
if (!presentationPath && !publicPaths.has(event.url.pathname) && !event.locals.user) {
|
||||
if (
|
||||
!presentationPath &&
|
||||
!sharePath &&
|
||||
!publicPaths.has(event.url.pathname) &&
|
||||
!apiPath &&
|
||||
!oauthPath &&
|
||||
!mcpPath &&
|
||||
!event.locals.user
|
||||
) {
|
||||
redirect(303, hasUsers() ? '/login' : '/setup');
|
||||
}
|
||||
|
||||
const response = await resolve(event);
|
||||
const sharePageNonce = sharePath && !shareMediaPath ? randomBytes(16).toString('base64') : null;
|
||||
const response = await resolve(
|
||||
event,
|
||||
sharePageNonce
|
||||
? {
|
||||
transformPageChunk: ({ html }) =>
|
||||
html.replaceAll('<script', `<script nonce="${sharePageNonce}"`)
|
||||
}
|
||||
: undefined
|
||||
);
|
||||
response.headers.set('Referrer-Policy', 'same-origin');
|
||||
response.headers.set('X-Content-Type-Options', 'nosniff');
|
||||
response.headers.set('X-Frame-Options', 'DENY');
|
||||
@@ -35,7 +62,22 @@ export const handle: Handle = async ({ event, resolve }) => {
|
||||
"frame-src https://www.youtube-nocookie.com https://www.youtube.com https://www.tiktok.com; frame-ancestors 'none'"
|
||||
);
|
||||
}
|
||||
if (event.url.pathname === '/einladung' || event.url.pathname === '/passwort-zuruecksetzen') {
|
||||
if (sharePath) {
|
||||
response.headers.set('Cache-Control', 'private, no-store');
|
||||
response.headers.set('Referrer-Policy', 'same-origin');
|
||||
if (!shareMediaPath) {
|
||||
response.headers.set(
|
||||
'Content-Security-Policy',
|
||||
`default-src 'self'; script-src 'self' 'nonce-${sharePageNonce}'; style-src 'self' 'unsafe-inline'; img-src 'self'; frame-ancestors 'none'`
|
||||
);
|
||||
}
|
||||
}
|
||||
if (
|
||||
event.url.pathname === '/einladung' ||
|
||||
event.url.pathname === '/passwort-zuruecksetzen' ||
|
||||
oauthPath ||
|
||||
mcpPath
|
||||
) {
|
||||
response.headers.set('Cache-Control', 'no-store');
|
||||
}
|
||||
return response;
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import {
|
||||
berlinDateKey,
|
||||
buildCalendarDays,
|
||||
formatMonthLabel,
|
||||
normalizeMonthKey,
|
||||
shiftMonth
|
||||
} from './calendar.js';
|
||||
|
||||
describe('show calendar', () => {
|
||||
it('groups UTC instants by their Berlin civil date', () => {
|
||||
expect(berlinDateKey('2026-09-30T22:30:00.000Z')).toBe('2026-10-01');
|
||||
expect(berlinDateKey('2026-12-31T23:30:00.000Z')).toBe('2027-01-01');
|
||||
});
|
||||
|
||||
it('builds a Monday-first six-week month without dropping boundary days', () => {
|
||||
const days = buildCalendarDays('2026-10', '2026-10-24');
|
||||
expect(days).toHaveLength(42);
|
||||
expect(days[0]).toMatchObject({ date: '2026-09-28', inSelectedMonth: false });
|
||||
expect(days.find((day) => day.date === '2026-10-24')?.isToday).toBe(true);
|
||||
expect(days.at(-1)?.date).toBe('2026-11-08');
|
||||
});
|
||||
|
||||
it('moves across year boundaries and validates month keys', () => {
|
||||
expect(shiftMonth('2026-12', 1)).toBe('2027-01');
|
||||
expect(shiftMonth('2026-01', -1)).toBe('2025-12');
|
||||
expect(normalizeMonthKey('2026-13', '2026-10')).toBe('2026-10');
|
||||
expect(normalizeMonthKey('2026-02', '2026-10')).toBe('2026-02');
|
||||
expect(formatMonthLabel('2026-10')).toBe('Oktober 2026');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,75 @@
|
||||
export const BERLIN_TIME_ZONE = 'Europe/Berlin';
|
||||
|
||||
export type CalendarDay = {
|
||||
date: string;
|
||||
dayNumber: number;
|
||||
inSelectedMonth: boolean;
|
||||
isToday: boolean;
|
||||
};
|
||||
|
||||
const berlinDateFormatter = new Intl.DateTimeFormat('en-CA', {
|
||||
timeZone: BERLIN_TIME_ZONE,
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit'
|
||||
});
|
||||
|
||||
function padded(value: number) {
|
||||
return String(value).padStart(2, '0');
|
||||
}
|
||||
|
||||
function dateParts(value: string | Date) {
|
||||
const parts = berlinDateFormatter.formatToParts(
|
||||
typeof value === 'string' ? new Date(value) : value
|
||||
);
|
||||
const read = (type: Intl.DateTimeFormatPartTypes) =>
|
||||
Number(parts.find((part) => part.type === type)?.value);
|
||||
return { year: read('year'), month: read('month'), day: read('day') };
|
||||
}
|
||||
|
||||
export function berlinDateKey(value: string | Date) {
|
||||
const parts = dateParts(value);
|
||||
return `${parts.year}-${padded(parts.month)}-${padded(parts.day)}`;
|
||||
}
|
||||
|
||||
export function berlinMonthKey(value: string | Date) {
|
||||
return berlinDateKey(value).slice(0, 7);
|
||||
}
|
||||
|
||||
export function normalizeMonthKey(value: string | null | undefined, fallback: string) {
|
||||
if (!value || !/^\d{4}-(0[1-9]|1[0-2])$/.test(value)) return fallback;
|
||||
return value;
|
||||
}
|
||||
|
||||
export function shiftMonth(monthKey: string, delta: number) {
|
||||
const [year, month] = monthKey.split('-').map(Number);
|
||||
const shifted = new Date(Date.UTC(year, month - 1 + delta, 1));
|
||||
return `${shifted.getUTCFullYear()}-${padded(shifted.getUTCMonth() + 1)}`;
|
||||
}
|
||||
|
||||
export function formatMonthLabel(monthKey: string) {
|
||||
const [year, month] = monthKey.split('-').map(Number);
|
||||
return new Intl.DateTimeFormat('de-DE', {
|
||||
timeZone: 'UTC',
|
||||
month: 'long',
|
||||
year: 'numeric'
|
||||
}).format(new Date(Date.UTC(year, month - 1, 1)));
|
||||
}
|
||||
|
||||
export function buildCalendarDays(monthKey: string, todayKey: string): CalendarDay[] {
|
||||
const [year, month] = monthKey.split('-').map(Number);
|
||||
const first = new Date(Date.UTC(year, month - 1, 1));
|
||||
const mondayOffset = (first.getUTCDay() + 6) % 7;
|
||||
const start = new Date(Date.UTC(year, month - 1, 1 - mondayOffset));
|
||||
return Array.from({ length: 42 }, (_, index) => {
|
||||
const date = new Date(start);
|
||||
date.setUTCDate(start.getUTCDate() + index);
|
||||
const dateKey = `${date.getUTCFullYear()}-${padded(date.getUTCMonth() + 1)}-${padded(date.getUTCDate())}`;
|
||||
return {
|
||||
date: dateKey,
|
||||
dayNumber: date.getUTCDate(),
|
||||
inSelectedMonth: dateKey.startsWith(monthKey),
|
||||
isToday: dateKey === todayKey
|
||||
};
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,108 @@
|
||||
<script lang="ts">
|
||||
import { tick } from 'svelte';
|
||||
import AppIcon from './AppIcon.svelte';
|
||||
|
||||
type Feed = {
|
||||
id: string;
|
||||
name: string;
|
||||
url: string;
|
||||
isEnabled: boolean;
|
||||
refreshIntervalMinutes: number;
|
||||
defaultCategoryId: string | null;
|
||||
};
|
||||
|
||||
let { categories }: { categories: { id: string; name: string }[] } = $props();
|
||||
let dialog: HTMLDialogElement;
|
||||
let nameInput: HTMLInputElement;
|
||||
let feed = $state<Feed | null>(null);
|
||||
let name = $state('');
|
||||
let url = $state('');
|
||||
let refreshIntervalMinutes = $state(60);
|
||||
let defaultCategoryId = $state('');
|
||||
let isEnabled = $state(true);
|
||||
|
||||
export async function showModal(selectedFeed: Feed | null = null) {
|
||||
feed = selectedFeed;
|
||||
name = selectedFeed?.name ?? '';
|
||||
url = selectedFeed?.url ?? '';
|
||||
refreshIntervalMinutes = selectedFeed?.refreshIntervalMinutes ?? 60;
|
||||
defaultCategoryId = selectedFeed?.defaultCategoryId ?? '';
|
||||
isEnabled = selectedFeed?.isEnabled ?? true;
|
||||
dialog.showModal();
|
||||
await tick();
|
||||
nameInput.focus();
|
||||
}
|
||||
|
||||
function close() {
|
||||
dialog.close();
|
||||
}
|
||||
</script>
|
||||
|
||||
<dialog
|
||||
bind:this={dialog}
|
||||
class="management-dialog feed-editor-dialog"
|
||||
aria-labelledby="feed-dialog-title"
|
||||
onclick={(event) => event.target === dialog && close()}
|
||||
>
|
||||
<header>
|
||||
<div class="management-dialog-title">
|
||||
<span class="management-dialog-icon"><AppIcon name="rss" /></span>
|
||||
<div>
|
||||
<p class="eyebrow">RSS-Quelle</p>
|
||||
<h2 id="feed-dialog-title">{feed?.name || 'Feed hinzufügen'}</h2>
|
||||
</div>
|
||||
</div>
|
||||
<button class="dialog-close" type="button" aria-label="Feeddialog schließen" onclick={close}
|
||||
><AppIcon name="xmark" /></button
|
||||
>
|
||||
</header>
|
||||
<form class="management-dialog-form" method="POST" action="?/saveFeed">
|
||||
{#if feed}<input type="hidden" name="feedId" value={feed.id} />{/if}
|
||||
<div class="management-dialog-fields">
|
||||
<label
|
||||
>Name<input
|
||||
bind:this={nameInput}
|
||||
bind:value={name}
|
||||
name="name"
|
||||
required
|
||||
maxlength="120"
|
||||
/></label
|
||||
>
|
||||
<label
|
||||
>Feed-URL<input bind:value={url} name="url" type="url" required maxlength="2000" /></label
|
||||
>
|
||||
<label
|
||||
>Intervall in Minuten<input
|
||||
bind:value={refreshIntervalMinutes}
|
||||
name="refreshIntervalMinutes"
|
||||
type="number"
|
||||
min="15"
|
||||
max="10080"
|
||||
required
|
||||
/></label
|
||||
>
|
||||
<label
|
||||
>Standardkategorie<select bind:value={defaultCategoryId} name="defaultCategoryId"
|
||||
><option value="">Keine</option>{#each categories as category (category.id)}<option
|
||||
value={category.id}>{category.name}</option
|
||||
>{/each}</select
|
||||
></label
|
||||
>
|
||||
</div>
|
||||
<div class="management-dialog-selections">
|
||||
<label class="toggle-row"
|
||||
><input type="checkbox" name="isEnabled" value="1" bind:checked={isEnabled} /><span
|
||||
><strong>Automatischer Abruf</strong><small
|
||||
>Der Feed wird im festgelegten Intervall sicher abgerufen.</small
|
||||
></span
|
||||
></label
|
||||
>
|
||||
</div>
|
||||
<footer>
|
||||
<button class="secondary-button" type="button" onclick={close}>Abbrechen</button>
|
||||
<button class="primary-button" type="submit"
|
||||
>{feed ? 'Änderungen speichern' : 'Feed anlegen'}</button
|
||||
>
|
||||
</footer>
|
||||
</form>
|
||||
</dialog>
|
||||
@@ -6,6 +6,7 @@
|
||||
$props();
|
||||
let query = $state('');
|
||||
let menu: HTMLDetailsElement;
|
||||
let searchInput: HTMLInputElement;
|
||||
let filtered = $derived(
|
||||
classicRegularIcons.filter((icon) =>
|
||||
`${icon.name} ${icon.label} ${icon.terms.join(' ')}`
|
||||
@@ -14,18 +15,31 @@
|
||||
)
|
||||
);
|
||||
let visible = $derived(filtered.slice(0, 120));
|
||||
|
||||
function openAndFocus(event: MouseEvent) {
|
||||
if (menu.open) return;
|
||||
event.preventDefault();
|
||||
menu.open = true;
|
||||
searchInput.focus({ preventScroll: true });
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="icon-picker">
|
||||
<input type="hidden" name={inputName} value={name} />
|
||||
<details bind:this={menu}>
|
||||
<summary><AppIcon name={name || 'circle'} /> Icon auswählen</summary>
|
||||
<details
|
||||
bind:this={menu}
|
||||
ontoggle={() => {
|
||||
if (menu.open) queueMicrotask(() => searchInput.focus());
|
||||
}}
|
||||
>
|
||||
<summary onclick={openAndFocus}><AppIcon name={name || 'circle'} /> Icon auswählen</summary>
|
||||
<div class="icon-picker-popover">
|
||||
<label
|
||||
><span class="sr-only">Icons durchsuchen</span><input
|
||||
type="search"
|
||||
placeholder="Icon suchen"
|
||||
bind:value={query}
|
||||
bind:this={searchInput}
|
||||
/></label
|
||||
>
|
||||
<div class="icon-picker-grid">
|
||||
|
||||
@@ -60,6 +60,10 @@
|
||||
{/each}
|
||||
</footer>{/if}
|
||||
</article>
|
||||
{:else if content.mode === 'image'}
|
||||
<article class="output-content output-image-only">
|
||||
{#if imageSrc}<img src={imageSrc} alt={content.images?.[0]?.altText ?? content.title} />{/if}
|
||||
</article>
|
||||
{:else if content.mode === 'link'}
|
||||
<article class="output-content output-link-card">
|
||||
{#if imageSrc && !imageUnavailable}<div class="output-link-image">
|
||||
|
||||
@@ -0,0 +1,219 @@
|
||||
<script lang="ts">
|
||||
/* eslint-disable svelte/no-navigation-without-resolve -- RSS links are validated external URLs. */
|
||||
import { onMount, tick } from 'svelte';
|
||||
import AppIcon from './AppIcon.svelte';
|
||||
import ChoicePicker from './ChoicePicker.svelte';
|
||||
|
||||
type FeedEntry = {
|
||||
id: string;
|
||||
feedId: string;
|
||||
feedName: string;
|
||||
title: string;
|
||||
url: string;
|
||||
summary: string;
|
||||
publishedAtUtc: string | null;
|
||||
};
|
||||
|
||||
let {
|
||||
entries,
|
||||
categories,
|
||||
form = null
|
||||
}: {
|
||||
entries: FeedEntry[];
|
||||
categories: { id: string; name: string }[];
|
||||
form?: { intent?: string; feedError?: string } | null;
|
||||
} = $props();
|
||||
let dialog: HTMLDialogElement;
|
||||
let closeButton: HTMLButtonElement;
|
||||
let selectedIds = $state<string[]>([]);
|
||||
let selectedFeedIds = $state<string[]>([]);
|
||||
let categoryIds = $state<string[]>([]);
|
||||
let page = $state(1);
|
||||
const pageSize = 20;
|
||||
let feeds = $derived(
|
||||
Array.from(new Map(entries.map((entry) => [entry.feedId, entry.feedName])).entries()).map(
|
||||
([id, name]) => ({ id, name })
|
||||
)
|
||||
);
|
||||
let filteredEntries = $derived(entries.filter((entry) => selectedFeedIds.includes(entry.feedId)));
|
||||
let pageCount = $derived(Math.max(1, Math.ceil(filteredEntries.length / pageSize)));
|
||||
let visibleEntries = $derived(filteredEntries.slice((page - 1) * pageSize, page * pageSize));
|
||||
let allSourcesSelected = $derived(feeds.length > 0 && selectedFeedIds.length === feeds.length);
|
||||
|
||||
onMount(() => {
|
||||
selectedFeedIds = feeds.map((feed) => feed.id);
|
||||
if (form?.intent === 'feedImport' && form.feedError) void showModal();
|
||||
});
|
||||
|
||||
export async function showModal() {
|
||||
if (!selectedFeedIds.length) selectedFeedIds = feeds.map((feed) => feed.id);
|
||||
if (!dialog.open) dialog.showModal();
|
||||
await tick();
|
||||
closeButton.focus();
|
||||
}
|
||||
|
||||
function close() {
|
||||
dialog.close();
|
||||
}
|
||||
|
||||
function selectAllSources() {
|
||||
selectedFeedIds = feeds.map((feed) => feed.id);
|
||||
page = 1;
|
||||
}
|
||||
|
||||
function toggleSource(id: string) {
|
||||
selectedFeedIds = selectedFeedIds.includes(id)
|
||||
? selectedFeedIds.filter((feedId) => feedId !== id)
|
||||
: [...selectedFeedIds, id];
|
||||
page = 1;
|
||||
}
|
||||
|
||||
function toggleEntry(id: string) {
|
||||
selectedIds = selectedIds.includes(id)
|
||||
? selectedIds.filter((entryId) => entryId !== id)
|
||||
: [...selectedIds, id];
|
||||
}
|
||||
|
||||
function handleEntryKeydown(event: KeyboardEvent, id: string) {
|
||||
if (event.key !== 'Enter' && event.key !== ' ') return;
|
||||
event.preventDefault();
|
||||
toggleEntry(id);
|
||||
}
|
||||
</script>
|
||||
|
||||
<dialog
|
||||
bind:this={dialog}
|
||||
class="management-dialog rss-selection-dialog"
|
||||
aria-labelledby="rss-selection-title"
|
||||
onclick={(event) => event.target === dialog && close()}
|
||||
>
|
||||
<header>
|
||||
<div class="management-dialog-title">
|
||||
<span class="management-dialog-icon"><AppIcon name="rss" /></span>
|
||||
<div>
|
||||
<p class="eyebrow">RSS-Importeingang</p>
|
||||
<h2 id="rss-selection-title">RSS-Beiträge auswählen</h2>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
bind:this={closeButton}
|
||||
class="dialog-close"
|
||||
type="button"
|
||||
aria-label="RSS-Auswahl schließen"
|
||||
onclick={close}><AppIcon name="xmark" /></button
|
||||
>
|
||||
</header>
|
||||
<form class="rss-selection-form" method="POST" action="?/importFeeds">
|
||||
{#each selectedIds as id (id)}<input type="hidden" name="entryIds" value={id} />{/each}
|
||||
<div class="rss-selection-content">
|
||||
{#if form?.intent === 'feedImport' && form.feedError}<div
|
||||
class="form-message error"
|
||||
role="alert"
|
||||
>
|
||||
{form.feedError}
|
||||
</div>{/if}
|
||||
<nav class="rss-source-filters" aria-label="RSS-Quellen filtern">
|
||||
<button
|
||||
type="button"
|
||||
class:active={allSourcesSelected}
|
||||
aria-pressed={allSourcesSelected}
|
||||
onclick={selectAllSources}>Alle Quellen</button
|
||||
>
|
||||
{#each feeds as feed (feed.id)}
|
||||
<button
|
||||
type="button"
|
||||
class:active={selectedFeedIds.includes(feed.id)}
|
||||
aria-pressed={selectedFeedIds.includes(feed.id)}
|
||||
onclick={() => toggleSource(feed.id)}>{feed.name}</button
|
||||
>
|
||||
{/each}
|
||||
</nav>
|
||||
|
||||
<div class="rss-result-summary" aria-live="polite">
|
||||
<strong>{filteredEntries.length} verfügbare Beiträge</strong>
|
||||
<span>Seite {page} von {pageCount}</span>
|
||||
</div>
|
||||
<div
|
||||
class="rss-entry-list"
|
||||
role="listbox"
|
||||
aria-label="Verfügbare RSS-Beiträge"
|
||||
aria-multiselectable="true"
|
||||
>
|
||||
{#each visibleEntries as entry (entry.id)}
|
||||
<div
|
||||
class:selected={selectedIds.includes(entry.id)}
|
||||
class="rss-entry"
|
||||
role="option"
|
||||
tabindex="0"
|
||||
aria-selected={selectedIds.includes(entry.id)}
|
||||
onclick={() => toggleEntry(entry.id)}
|
||||
onkeydown={(event) => handleEntryKeydown(event, entry.id)}
|
||||
>
|
||||
<div class="rss-entry-state" aria-hidden="true">
|
||||
<AppIcon name={selectedIds.includes(entry.id) ? 'check' : 'plus'} />
|
||||
</div>
|
||||
<div class="rss-entry-copy">
|
||||
<small
|
||||
>{entry.feedName}{entry.publishedAtUtc
|
||||
? ` · ${new Date(entry.publishedAtUtc).toLocaleDateString('de-DE')}`
|
||||
: ''}</small
|
||||
>
|
||||
<strong>{entry.title}</strong>
|
||||
{#if entry.summary}<p>{entry.summary}</p>{/if}
|
||||
<a
|
||||
href={entry.url}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
onclick={(event) => event.stopPropagation()}
|
||||
onkeydown={(event) => event.stopPropagation()}>Original öffnen</a
|
||||
>
|
||||
</div>
|
||||
{#if selectedIds.includes(entry.id)}<span class="rss-selected-label">Ausgewählt</span
|
||||
>{/if}
|
||||
</div>
|
||||
{:else}<p class="empty-copy">
|
||||
Für diese Quellenauswahl sind keine Beiträge verfügbar.
|
||||
</p>{/each}
|
||||
</div>
|
||||
{#if pageCount > 1}<nav class="rss-pagination" aria-label="RSS-Beitragsseiten">
|
||||
<button
|
||||
class="secondary-button"
|
||||
type="button"
|
||||
disabled={page === 1}
|
||||
onclick={() => (page -= 1)}>Zurück</button
|
||||
>
|
||||
<span
|
||||
>{(page - 1) * pageSize + 1}–{Math.min(page * pageSize, filteredEntries.length)} von {filteredEntries.length}</span
|
||||
>
|
||||
<button
|
||||
class="secondary-button"
|
||||
type="button"
|
||||
disabled={page === pageCount}
|
||||
onclick={() => (page += 1)}>Weiter</button
|
||||
>
|
||||
</nav>{/if}
|
||||
<div class="rss-category-selection">
|
||||
<span class="field-label">Kategorien für die Auswahl</span>
|
||||
<small>Ohne Auswahl gilt die Standardkategorie der jeweiligen Quelle.</small>
|
||||
<ChoicePicker
|
||||
items={categories}
|
||||
selectedIds={categoryIds}
|
||||
label="Kategorien"
|
||||
fieldName="categoryIds"
|
||||
onselectionchange={(ids) => (categoryIds = ids)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<footer class="rss-selection-actions">
|
||||
<button
|
||||
class="text-button danger-text"
|
||||
type="submit"
|
||||
formaction="?/discardFeeds"
|
||||
disabled={!selectedIds.length}>Auswahl verwerfen</button
|
||||
>
|
||||
<button class="primary-button" type="submit" disabled={!selectedIds.length}>
|
||||
Auswahl in den Eingang übernehmen ({selectedIds.length})
|
||||
</button>
|
||||
</footer>
|
||||
</form>
|
||||
</dialog>
|
||||
@@ -0,0 +1,330 @@
|
||||
<script lang="ts">
|
||||
import { resolve } from '$app/paths';
|
||||
import { onMount } from 'svelte';
|
||||
import AppIcon from './AppIcon.svelte';
|
||||
|
||||
type ShareShow = {
|
||||
id: string;
|
||||
title: string;
|
||||
startsAtUtc: string | null;
|
||||
status: string;
|
||||
};
|
||||
|
||||
type ShareItem = {
|
||||
id: string;
|
||||
showId: string;
|
||||
showTitle: string;
|
||||
showStatus: string;
|
||||
showStartsAtUtc: string | null;
|
||||
scope: 'rundown' | 'moderation' | 'research';
|
||||
isPasswordProtected: boolean;
|
||||
expiresAtUtc: string | null;
|
||||
revokedAtUtc: string | null;
|
||||
createdAtUtc: string;
|
||||
};
|
||||
|
||||
let {
|
||||
shows,
|
||||
shares,
|
||||
fixedShowId = '',
|
||||
catalogPanel = false,
|
||||
form = null
|
||||
}: {
|
||||
shows: ShareShow[];
|
||||
shares: ShareItem[];
|
||||
fixedShowId?: string;
|
||||
catalogPanel?: boolean;
|
||||
form?: {
|
||||
intent?: string;
|
||||
error?: string;
|
||||
success?: string | boolean;
|
||||
shareUrl?: string;
|
||||
} | null;
|
||||
} = $props();
|
||||
|
||||
let visibleShows = $derived(
|
||||
fixedShowId
|
||||
? shows.filter((show) => show.id === fixedShowId)
|
||||
: shows.filter((show) => shares.some((share) => share.showId === show.id))
|
||||
);
|
||||
let dialog: HTMLDialogElement;
|
||||
let copyMessage = $state('');
|
||||
|
||||
onMount(() => {
|
||||
if (form?.intent?.toLowerCase().includes('share')) dialog.showModal();
|
||||
});
|
||||
|
||||
async function copyShareUrl() {
|
||||
if (!form?.shareUrl) return;
|
||||
await navigator.clipboard.writeText(new URL(form.shareUrl, window.location.origin).href);
|
||||
copyMessage = 'Link kopiert.';
|
||||
}
|
||||
|
||||
function germanDate(value: string | null, fallback = 'Termin offen') {
|
||||
return value
|
||||
? new Intl.DateTimeFormat('de-DE', {
|
||||
timeZone: 'Europe/Berlin',
|
||||
dateStyle: 'medium',
|
||||
timeStyle: 'short'
|
||||
}).format(new Date(value))
|
||||
: fallback;
|
||||
}
|
||||
|
||||
function berlinInput(value: string | null) {
|
||||
if (!value) return '';
|
||||
const parts = new Intl.DateTimeFormat('en-CA', {
|
||||
timeZone: 'Europe/Berlin',
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hourCycle: 'h23'
|
||||
}).formatToParts(new Date(value));
|
||||
const read = (type: Intl.DateTimeFormatPartTypes) =>
|
||||
parts.find((part) => part.type === type)?.value ?? '';
|
||||
return `${read('year')}-${read('month')}-${read('day')}T${read('hour')}:${read('minute')}`;
|
||||
}
|
||||
|
||||
function statusLabel(status: string) {
|
||||
if (status === 'draft') return 'Entwurf';
|
||||
if (status === 'ready') return 'Bereit';
|
||||
if (status === 'live') return 'Live';
|
||||
return 'Abgeschlossen';
|
||||
}
|
||||
|
||||
function scopeLabel(scope: ShareItem['scope']) {
|
||||
if (scope === 'rundown') return 'Nur Ablauf';
|
||||
if (scope === 'moderation') return 'Ablauf und Moderation';
|
||||
return 'Vollständig mit Recherche';
|
||||
}
|
||||
|
||||
function shareState(share: ShareItem) {
|
||||
if (share.revokedAtUtc) return 'Widerrufen';
|
||||
if (share.expiresAtUtc && new Date(share.expiresAtUtc) <= new Date()) return 'Abgelaufen';
|
||||
return 'Aktiv';
|
||||
}
|
||||
</script>
|
||||
|
||||
{#if catalogPanel}
|
||||
<section class="quiet-panel share-catalog-panel">
|
||||
<div class="panel-heading">
|
||||
<div>
|
||||
<p class="eyebrow">Gastzugänge</p>
|
||||
<h2>Lesefreigaben</h2>
|
||||
</div>
|
||||
<button
|
||||
class="compact-add-button share-dialog-trigger"
|
||||
type="button"
|
||||
aria-label="Lesefreigaben"
|
||||
onclick={() => dialog.showModal()}
|
||||
>
|
||||
<AppIcon name="link" /> Freigaben verwalten
|
||||
</button>
|
||||
</div>
|
||||
<p class="catalog-note">
|
||||
Sendungen gezielt als widerrufbaren Leselink mit wählbarem Informationsumfang teilen.
|
||||
</p>
|
||||
</section>
|
||||
{:else}
|
||||
<button
|
||||
class="secondary-button share-dialog-trigger"
|
||||
type="button"
|
||||
onclick={() => dialog.showModal()}
|
||||
>
|
||||
<AppIcon name="link" /> Lesefreigaben
|
||||
</button>
|
||||
{/if}
|
||||
<dialog bind:this={dialog} class="share-management-dialog">
|
||||
<section class="share-management" aria-labelledby={`share-title-${fixedShowId || 'all'}`}>
|
||||
<div class="panel-heading">
|
||||
<div>
|
||||
<p class="eyebrow">Gastzugänge</p>
|
||||
<h2 id={`share-title-${fixedShowId || 'all'}`}>Lesefreigaben</h2>
|
||||
</div>
|
||||
<span class="mail-mode">Aktualisiert sich bis zum Abschluss</span>
|
||||
<button
|
||||
class="dialog-close"
|
||||
type="button"
|
||||
aria-label="Lesefreigaben schließen"
|
||||
onclick={() => dialog.close()}
|
||||
>
|
||||
<AppIcon name="xmark" />
|
||||
</button>
|
||||
</div>
|
||||
<p class="share-intro">
|
||||
Der Gast sieht nur diese Sendung und den gewählten Informationsumfang. Der vollständige Link
|
||||
wird aus Sicherheitsgründen nur direkt nach dem Anlegen angezeigt.
|
||||
</p>
|
||||
{#if form?.intent?.toLowerCase().includes('share') && form.error}<div
|
||||
class="form-message error"
|
||||
role="alert"
|
||||
>
|
||||
{form.error}
|
||||
</div>{/if}
|
||||
{#if form?.intent?.toLowerCase().includes('share') && typeof form.success === 'string'}<div
|
||||
class="form-message success"
|
||||
role="status"
|
||||
>
|
||||
{form.success}
|
||||
</div>{/if}
|
||||
{#if form?.shareUrl}<div class="form-message success share-result" role="status">
|
||||
<strong>Neuer Leselink</strong>
|
||||
<!-- The server returns only a same-origin share path created by this action. -->
|
||||
<div>
|
||||
<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
|
||||
<a href={form.shareUrl}>{form.shareUrl}</a><button
|
||||
class="secondary-button"
|
||||
type="button"
|
||||
onclick={copyShareUrl}><AppIcon name="copy" /> Kopieren</button
|
||||
>
|
||||
</div>
|
||||
{#if copyMessage}<small>{copyMessage}</small>{/if}
|
||||
</div>{/if}
|
||||
|
||||
<form class="share-create-form" method="POST" action="?/createShare">
|
||||
{#if fixedShowId}
|
||||
<input type="hidden" name="showId" value={fixedShowId} />
|
||||
{:else}
|
||||
<label
|
||||
>Sendung<select name="showId" required>
|
||||
<option value="">Sendung wählen</option>
|
||||
{#each shows as show (show.id)}<option value={show.id}
|
||||
>{show.title} · {statusLabel(show.status)}</option
|
||||
>{/each}
|
||||
</select></label
|
||||
>
|
||||
{/if}
|
||||
<label
|
||||
>Informationsumfang<select name="scope">
|
||||
<option value="rundown">Nur Ablauf</option>
|
||||
<option value="moderation">Ablauf und Moderation</option>
|
||||
<option value="research">Vollständig mit Recherche</option>
|
||||
</select></label
|
||||
>
|
||||
<label
|
||||
>Optionales Passwort<input
|
||||
name="password"
|
||||
type="password"
|
||||
minlength="12"
|
||||
maxlength="256"
|
||||
autocomplete="new-password"
|
||||
/></label
|
||||
>
|
||||
<label>Optionaler Ablauf<input name="expiresAt" type="datetime-local" /></label>
|
||||
<button class="primary-button" type="submit" disabled={!shows.length}>Leselink anlegen</button
|
||||
>
|
||||
</form>
|
||||
|
||||
{#if visibleShows.length}
|
||||
<div class="share-show-list">
|
||||
{#each visibleShows as show (show.id)}
|
||||
<article class="share-show-card">
|
||||
<header>
|
||||
<div>
|
||||
<a href={resolve('/sendungen/[id]', { id: show.id })}>{show.title}</a>
|
||||
<small>{germanDate(show.startsAtUtc)} Uhr</small>
|
||||
</div>
|
||||
<span class={`show-state ${show.status}`}>{statusLabel(show.status)}</span>
|
||||
</header>
|
||||
<div class="share-list">
|
||||
{#each shares.filter((share) => share.showId === show.id) as share (share.id)}
|
||||
<details class="share-row">
|
||||
<summary>
|
||||
<span class="share-row-icon"><AppIcon name="link" /></span>
|
||||
<span>
|
||||
<strong>{scopeLabel(share.scope)}</strong>
|
||||
<small
|
||||
>{share.isPasswordProtected ? 'Mit Passwort' : 'Ohne Passwort'} · {germanDate(
|
||||
share.expiresAtUtc,
|
||||
'ohne Ablauf'
|
||||
)}</small
|
||||
>
|
||||
</span>
|
||||
<span class:locked={shareState(share) !== 'Aktiv'}>{shareState(share)}</span>
|
||||
<AppIcon name="pen" />
|
||||
</summary>
|
||||
<div class="share-edit-area">
|
||||
{#if share.revokedAtUtc}
|
||||
<p>Diese Freigabe ist widerrufen und kann nur noch gelöscht werden.</p>
|
||||
{:else}
|
||||
<form class="share-edit-form" method="POST" action="?/updateShare">
|
||||
<input type="hidden" name="shareId" value={share.id} />
|
||||
<input type="hidden" name="showId" value={show.id} />
|
||||
<label
|
||||
>Informationsumfang<select name="scope" value={share.scope}>
|
||||
<option value="rundown">Nur Ablauf</option>
|
||||
<option value="moderation">Ablauf und Moderation</option>
|
||||
<option value="research">Vollständig mit Recherche</option>
|
||||
</select></label
|
||||
>
|
||||
<label
|
||||
>Passwort<select name="passwordMode">
|
||||
<option value="keep">Unverändert</option>
|
||||
<option value="remove">Kein Passwort</option>
|
||||
<option value="replace">Neues Passwort setzen</option>
|
||||
</select></label
|
||||
>
|
||||
<label
|
||||
>Neues Passwort<input
|
||||
name="password"
|
||||
type="password"
|
||||
minlength="12"
|
||||
maxlength="256"
|
||||
autocomplete="new-password"
|
||||
/></label
|
||||
>
|
||||
<label
|
||||
>Ablauf<input
|
||||
name="expiresAt"
|
||||
type="datetime-local"
|
||||
value={berlinInput(share.expiresAtUtc)}
|
||||
/><small>Leer lassen, um den Ablauf zu entfernen.</small></label
|
||||
>
|
||||
<button class="secondary-button" type="submit">Freigabe speichern</button>
|
||||
</form>
|
||||
{/if}
|
||||
{#if !share.revokedAtUtc}<form
|
||||
method="POST"
|
||||
action="?/replaceShare"
|
||||
onsubmit={(event) => {
|
||||
if (
|
||||
!confirm('Ersatzlink anlegen? Der bisherige Link wird sofort ungültig.')
|
||||
)
|
||||
event.preventDefault();
|
||||
}}
|
||||
>
|
||||
<input type="hidden" name="shareId" value={share.id} />
|
||||
<input type="hidden" name="showId" value={show.id} />
|
||||
<button class="text-button" type="submit">Ersatzlink anlegen</button>
|
||||
</form>{/if}
|
||||
<form
|
||||
method="POST"
|
||||
action="?/deleteShare"
|
||||
onsubmit={(event) => {
|
||||
if (
|
||||
!confirm('Freigabe endgültig löschen? Der Leselink wird sofort ungültig.')
|
||||
)
|
||||
event.preventDefault();
|
||||
}}
|
||||
>
|
||||
<input type="hidden" name="shareId" value={share.id} />
|
||||
<input type="hidden" name="showId" value={show.id} />
|
||||
<button class="text-button danger-text" type="submit">Freigabe löschen</button
|
||||
>
|
||||
</form>
|
||||
</div>
|
||||
</details>
|
||||
{/each}
|
||||
{#if !shares.some((share) => share.showId === show.id)}
|
||||
<p class="quiet-copy">Für diese Sendung gibt es noch keine Lesefreigabe.</p>
|
||||
{/if}
|
||||
</div>
|
||||
</article>
|
||||
{/each}
|
||||
</div>
|
||||
{:else}
|
||||
<p class="quiet-copy">Noch keine Lesefreigaben angelegt.</p>
|
||||
{/if}
|
||||
</section>
|
||||
</dialog>
|
||||
@@ -0,0 +1,128 @@
|
||||
<script lang="ts">
|
||||
import { onMount, tick } from 'svelte';
|
||||
import AppIcon from './AppIcon.svelte';
|
||||
type TechnicalAccess = {
|
||||
id: string;
|
||||
name: string;
|
||||
permissions: 'read' | 'read_write';
|
||||
};
|
||||
|
||||
let {
|
||||
form = null
|
||||
}: {
|
||||
form?: {
|
||||
intent?: string;
|
||||
error?: string;
|
||||
success?: string | boolean;
|
||||
technicalToken?: string;
|
||||
} | null;
|
||||
} = $props();
|
||||
let dialog: HTMLDialogElement;
|
||||
let nameInput = $state<HTMLInputElement>();
|
||||
let copyMessage = $state('');
|
||||
let access = $state<TechnicalAccess | null>(null);
|
||||
let name = $state('');
|
||||
let permissions = $state<'read' | 'read_write'>('read');
|
||||
|
||||
onMount(() => {
|
||||
if (form?.intent === 'technicalAccess' && (form.error || form.technicalToken)) void showModal();
|
||||
});
|
||||
|
||||
export async function showModal(selectedAccess: TechnicalAccess | null = null) {
|
||||
access = selectedAccess;
|
||||
name = selectedAccess?.name ?? '';
|
||||
permissions = selectedAccess?.permissions ?? 'read';
|
||||
if (!dialog.open) dialog.showModal();
|
||||
await tick();
|
||||
(form?.technicalToken && !access
|
||||
? dialog.querySelector<HTMLButtonElement>('.token-copy')
|
||||
: nameInput
|
||||
)?.focus();
|
||||
}
|
||||
|
||||
function close() {
|
||||
dialog.close();
|
||||
}
|
||||
|
||||
async function copyToken() {
|
||||
if (!form?.technicalToken) return;
|
||||
try {
|
||||
await navigator.clipboard.writeText(form.technicalToken);
|
||||
copyMessage = 'Token kopiert.';
|
||||
} catch {
|
||||
copyMessage = 'Kopieren wurde vom Browser blockiert.';
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<dialog
|
||||
bind:this={dialog}
|
||||
class="management-dialog technical-access-dialog"
|
||||
aria-labelledby="technical-access-dialog-title"
|
||||
onclick={(event) => event.target === dialog && close()}
|
||||
>
|
||||
<header>
|
||||
<div class="management-dialog-title">
|
||||
<span class="management-dialog-icon"><AppIcon name="key" /></span>
|
||||
<div>
|
||||
<p class="eyebrow">Externe Assistenz</p>
|
||||
<h2 id="technical-access-dialog-title">{access?.name || 'API-Zugang hinzufügen'}</h2>
|
||||
</div>
|
||||
</div>
|
||||
<button class="dialog-close" type="button" aria-label="Zugangsdialog schließen" onclick={close}
|
||||
><AppIcon name="xmark" /></button
|
||||
>
|
||||
</header>
|
||||
{#if form?.technicalToken && !access}
|
||||
<div class="technical-token-result">
|
||||
<div class="form-message success" role="status">
|
||||
<strong>Token, einmalig sichtbar</strong>
|
||||
<p>Jetzt kopieren und sicher hinterlegen. Sendewerk speichert weiterhin nur den Hash.</p>
|
||||
</div>
|
||||
<code>{form.technicalToken}</code>
|
||||
<button class="primary-button token-copy" type="button" onclick={copyToken}
|
||||
><AppIcon name="copy" /> Token kopieren</button
|
||||
>
|
||||
{#if copyMessage}<small role="status">{copyMessage}</small>{/if}
|
||||
</div>
|
||||
{:else}
|
||||
<form
|
||||
class="management-dialog-form"
|
||||
method="POST"
|
||||
action={access ? '?/updateTechnicalAccess' : '?/createTechnicalAccess'}
|
||||
>
|
||||
{#if access}<input type="hidden" name="accessId" value={access.id} />{/if}
|
||||
{#if form?.intent === 'technicalAccess' && form.error}<div
|
||||
class="form-message error dialog-form-message"
|
||||
role="alert"
|
||||
>
|
||||
{form.error}
|
||||
</div>{/if}
|
||||
<div class="management-dialog-fields">
|
||||
<label
|
||||
>Name<input
|
||||
bind:this={nameInput}
|
||||
bind:value={name}
|
||||
name="name"
|
||||
required
|
||||
maxlength="120"
|
||||
placeholder="Redaktionsassistenz"
|
||||
/></label
|
||||
>
|
||||
<label
|
||||
>Berechtigung<select bind:value={permissions} name="permissions"
|
||||
><option value="read">Nur lesen</option><option value="read_write"
|
||||
>Lesen und schreiben</option
|
||||
></select
|
||||
></label
|
||||
>
|
||||
</div>
|
||||
<footer>
|
||||
<button class="secondary-button" type="button" onclick={close}>Abbrechen</button>
|
||||
<button class="primary-button" type="submit"
|
||||
>{access ? 'Änderungen speichern' : 'Zugang anlegen'}</button
|
||||
>
|
||||
</footer>
|
||||
</form>
|
||||
{/if}
|
||||
</dialog>
|
||||
@@ -1,10 +1,11 @@
|
||||
<script lang="ts">
|
||||
import { enhance, type SubmitFunction } from '$app/forms';
|
||||
import { untrack } from 'svelte';
|
||||
import { onMount, untrack } from 'svelte';
|
||||
import MarkdownEditorField from './MarkdownEditorField.svelte';
|
||||
import InlineTitleEditor from './InlineTitleEditor.svelte';
|
||||
import NavIcon from './NavIcon.svelte';
|
||||
import PieceEditorDialog from './PieceEditorDialog.svelte';
|
||||
import PresentationDisplay from './PresentationDisplay.svelte';
|
||||
import type { PieceUsage } from '#lib/server/shows.js';
|
||||
|
||||
let {
|
||||
@@ -13,7 +14,8 @@
|
||||
sectionId,
|
||||
sections,
|
||||
error,
|
||||
enhanceCommand
|
||||
enhanceCommand,
|
||||
open = false
|
||||
}: {
|
||||
usage: PieceUsage;
|
||||
revision: number;
|
||||
@@ -21,6 +23,7 @@
|
||||
sections: { id: string; name: string }[];
|
||||
error?: string;
|
||||
enhanceCommand: SubmitFunction;
|
||||
open?: boolean;
|
||||
} = $props();
|
||||
|
||||
let formId = $derived(`usage-editor-form-${usage.id}`);
|
||||
@@ -30,6 +33,14 @@
|
||||
untrack(() => ({ ...usage, tools: usage.tools.map((tool) => ({ ...tool })) }))
|
||||
);
|
||||
let dirty = $state(false);
|
||||
let selectedSourceId = $state(
|
||||
untrack(
|
||||
() => usage.sources.find((source) => source.url === usage.presentationSourceUrl)?.id ?? ''
|
||||
)
|
||||
);
|
||||
onMount(() => {
|
||||
if (open) editor.showModal();
|
||||
});
|
||||
let selectedMedia = $derived(
|
||||
draft.media.find((media) => media.id === draft.presentationMediaId) ?? null
|
||||
);
|
||||
@@ -38,12 +49,63 @@
|
||||
return Number((seconds / 60).toFixed(2));
|
||||
}
|
||||
|
||||
function previewHtml(value: string) {
|
||||
return value
|
||||
.replaceAll('&', '&')
|
||||
.replaceAll('<', '<')
|
||||
.replaceAll('>', '>')
|
||||
.replaceAll('"', '"')
|
||||
.replaceAll("'", ''')
|
||||
.replaceAll('\n', '<br>');
|
||||
}
|
||||
|
||||
function requestClose() {
|
||||
if (dirty && !confirm('Ungespeicherte Änderungen verwerfen und Editor schließen?')) return;
|
||||
dirty = false;
|
||||
editor.close();
|
||||
}
|
||||
|
||||
function presentationSourceChanged(event: Event) {
|
||||
selectedSourceId = (event.currentTarget as HTMLSelectElement).value;
|
||||
const source = draft.sources.find((item) => item.id === selectedSourceId);
|
||||
if (!source) return;
|
||||
draft.presentationSourceLabel = source.label;
|
||||
draft.presentationSourceUrl = source.url;
|
||||
draft.presentationSourceTimecodeSeconds = source.timecodeSeconds;
|
||||
}
|
||||
|
||||
let previewContent = $derived({
|
||||
mode: draft.presentationMode,
|
||||
topics: draft.topics.map((topic) => topic.name),
|
||||
title: draft.outputTitle || draft.title,
|
||||
html: previewHtml(draft.presentation),
|
||||
source: draft.presentationSourceUrl
|
||||
? {
|
||||
label: draft.presentationSourceLabel,
|
||||
url: draft.presentationSourceUrl,
|
||||
timecodeSeconds: draft.presentationSourceTimecodeSeconds
|
||||
}
|
||||
: null,
|
||||
previewTitle: draft.presentationTitle,
|
||||
description: draft.presentationDescription,
|
||||
imageUrl: draft.presentationMode === 'link' ? draft.presentationImageUrl : '',
|
||||
siteName: draft.presentationSiteName,
|
||||
provider: draft.presentationProvider,
|
||||
providerId: draft.presentationProviderId,
|
||||
embedUrl: '',
|
||||
sources: [],
|
||||
images: selectedMedia
|
||||
? [{ id: selectedMedia.originalMediaId, altText: selectedMedia.altText }]
|
||||
: []
|
||||
});
|
||||
let previewImageSrc = $derived(
|
||||
selectedMedia && draft.presentationMode === 'text'
|
||||
? '/media'
|
||||
: selectedMedia && draft.presentationMode === 'image'
|
||||
? `/media/${selectedMedia.originalMediaId}`
|
||||
: ''
|
||||
);
|
||||
|
||||
const enhanceEditor: SubmitFunction = async (input) => {
|
||||
const finish = await enhanceCommand(input);
|
||||
return async (result) => {
|
||||
@@ -108,6 +170,13 @@
|
||||
rows={10}
|
||||
bind:value={draft.moderation}
|
||||
/>
|
||||
<MarkdownEditorField
|
||||
name="interaction"
|
||||
label="Interaktion"
|
||||
placeholder="Welche Frage möchtest du dem Chat stellen?"
|
||||
privateField
|
||||
bind:value={draft.interaction}
|
||||
/>
|
||||
<MarkdownEditorField
|
||||
name="transition"
|
||||
label="Überleitung"
|
||||
@@ -118,6 +187,26 @@
|
||||
<details class="piece-meta-details">
|
||||
<summary>Dauer und Einplanung</summary>
|
||||
<div class="piece-meta-grid">
|
||||
<label
|
||||
>Vorbereitungsstatus<select
|
||||
name="preparationStatus"
|
||||
bind:value={draft.preparationStatus}
|
||||
>
|
||||
<option value="preparing">In Vorbereitung</option>
|
||||
<option value="ready">Sendefertig</option>
|
||||
</select></label
|
||||
>
|
||||
<label
|
||||
>Vorbereitungsaufwand<select
|
||||
name="preparationEffort"
|
||||
bind:value={draft.preparationEffort}
|
||||
>
|
||||
<option value={null}>Nicht angegeben</option>
|
||||
<option value="low">Gering</option>
|
||||
<option value="medium">Mittel</option>
|
||||
<option value="high">Hoch</option>
|
||||
</select></label
|
||||
>
|
||||
<label
|
||||
>Dauer in Minuten<input
|
||||
name="durationMinutes"
|
||||
@@ -205,22 +294,9 @@
|
||||
</div>
|
||||
<div class="piece-presentation-layout">
|
||||
<div class="piece-presentation-controls">
|
||||
<label
|
||||
>Präsentationstitel<input
|
||||
name="outputTitle"
|
||||
maxlength="300"
|
||||
placeholder="Optional, sonst interner Titel"
|
||||
bind:value={draft.outputTitle}
|
||||
/></label
|
||||
>
|
||||
<MarkdownEditorField
|
||||
name="presentation"
|
||||
label="Öffentlicher Text"
|
||||
placeholder="Text für die Publikumsausgabe"
|
||||
bind:value={draft.presentation}
|
||||
/>
|
||||
<p class="field-label">Präsentationsart</p>
|
||||
<div class="presentation-mode-picker" role="group" aria-label="Darstellung">
|
||||
{#each [['text', 'Text'], ['link', 'Linkvorschau'], ['video', 'Video']] as mode (mode[0])}
|
||||
{#each [['text', 'Text'], ['image', 'Nur Bild'], ['link', 'Linkvorschau'], ['video', 'Video']] as mode (mode[0])}
|
||||
<label
|
||||
><input
|
||||
type="radio"
|
||||
@@ -231,6 +307,25 @@
|
||||
>
|
||||
{/each}
|
||||
</div>
|
||||
{#if draft.presentationMode === 'text'}
|
||||
<label
|
||||
>Öffentliche Überschrift<input
|
||||
name="outputTitle"
|
||||
maxlength="300"
|
||||
placeholder="Optional, sonst interner Titel"
|
||||
bind:value={draft.outputTitle}
|
||||
/></label
|
||||
>
|
||||
<MarkdownEditorField
|
||||
name="presentation"
|
||||
label="Öffentlicher Vorspann"
|
||||
placeholder="Text für die Publikumsausgabe"
|
||||
bind:value={draft.presentation}
|
||||
/>
|
||||
{:else}
|
||||
<input type="hidden" name="outputTitle" value={draft.outputTitle} />
|
||||
<input type="hidden" name="presentation" value={draft.presentation} />
|
||||
{/if}
|
||||
<input
|
||||
type="hidden"
|
||||
name="presentationSourceLabel"
|
||||
@@ -244,34 +339,44 @@
|
||||
/>
|
||||
<input type="hidden" name="presentationSiteName" value={draft.presentationSiteName} />
|
||||
<input type="hidden" name="presentationMediaId" value={draft.presentationMediaId ?? ''} />
|
||||
{#if draft.presentationMode !== 'text'}
|
||||
{#if draft.presentationMode === 'link' || draft.presentationMode === 'video'}
|
||||
<div class="presentation-settings">
|
||||
<div class="presentation-source-summary wide-field">
|
||||
<span>Ausgewählte Quelle</span>
|
||||
<strong
|
||||
>{draft.presentationSourceLabel ||
|
||||
draft.presentationSourceUrl ||
|
||||
'Keine Quelle'}</strong
|
||||
<label class="wide-field"
|
||||
>{draft.presentationMode === 'video' ? 'Video-URL' : 'Quelle/URL'}<select
|
||||
bind:value={selectedSourceId}
|
||||
onchange={presentationSourceChanged}
|
||||
>
|
||||
<option value="">Quelle auswählen</option>
|
||||
{#each draft.sources as source (source.id)}
|
||||
<option value={source.id}>{source.label || source.url}</option>
|
||||
{/each}
|
||||
</select></label
|
||||
>
|
||||
{#if draft.presentationSourceUrl}<small>{draft.presentationSourceUrl}</small>{/if}
|
||||
</div>
|
||||
<label
|
||||
>Kartentitel<input
|
||||
>{draft.presentationMode === 'video' ? 'Videotitel' : 'Kartentitel'}<input
|
||||
name="presentationTitle"
|
||||
maxlength="300"
|
||||
placeholder="Optionaler Anzeigetitel"
|
||||
bind:value={draft.presentationTitle}
|
||||
/></label
|
||||
>
|
||||
{#if draft.presentationMode === 'link'}
|
||||
<label
|
||||
>Bild-URL<input
|
||||
>Vorschaubild-URL<input
|
||||
name="presentationImageUrl"
|
||||
type="url"
|
||||
maxlength="2000"
|
||||
placeholder="https://…"
|
||||
placeholder="Aus der Linkvorschau"
|
||||
bind:value={draft.presentationImageUrl}
|
||||
/></label
|
||||
>
|
||||
{:else}
|
||||
<input
|
||||
type="hidden"
|
||||
name="presentationImageUrl"
|
||||
value={draft.presentationImageUrl}
|
||||
/>
|
||||
{/if}
|
||||
<label class="wide-field"
|
||||
>Anreißer<textarea
|
||||
name="presentationDescription"
|
||||
@@ -291,9 +396,11 @@
|
||||
<input type="hidden" name="presentationImageUrl" value={draft.presentationImageUrl} />
|
||||
{/if}
|
||||
</div>
|
||||
{#if draft.media.length}<fieldset class="usage-media-picker">
|
||||
{#if draft.media.length && ['text', 'image'].includes(draft.presentationMode)}<fieldset
|
||||
class="usage-media-picker"
|
||||
>
|
||||
<legend>Hochgeladenes Präsentationsbild</legend>
|
||||
<label
|
||||
{#if draft.presentationMode === 'text'}<label
|
||||
><input
|
||||
type="radio"
|
||||
checked={!draft.presentationMediaId}
|
||||
@@ -302,7 +409,7 @@
|
||||
dirty = true;
|
||||
}}
|
||||
/> Kein Bild</label
|
||||
>
|
||||
>{/if}
|
||||
<div class="media-grid">
|
||||
{#each draft.media as media (media.id)}<label class="media-presentation-choice"
|
||||
><input
|
||||
@@ -319,30 +426,7 @@
|
||||
</div>
|
||||
</fieldset>{/if}
|
||||
<aside class="piece-presentation-preview" aria-label="Präsentationsvorschau">
|
||||
<p class="output-kicker">Vorschau · {draft.presentationMode}</p>
|
||||
<h4>{draft.outputTitle || draft.title}</h4>
|
||||
{#if draft.presentationMode === 'text'}
|
||||
<p class="preview-markdown-source">
|
||||
{draft.presentation || 'Noch kein öffentlicher Text.'}
|
||||
</p>
|
||||
{#if selectedMedia}<img
|
||||
src={`/media/${selectedMedia.originalMediaId}`}
|
||||
alt={selectedMedia.altText}
|
||||
/>{/if}
|
||||
{:else}
|
||||
{#if selectedMedia}<img
|
||||
src={`/media/${selectedMedia.originalMediaId}`}
|
||||
alt={selectedMedia.altText}
|
||||
/>{:else if draft.presentationImageUrl}<img
|
||||
src={draft.presentationImageUrl}
|
||||
alt=""
|
||||
/>{/if}
|
||||
<p>
|
||||
{draft.presentationDescription ||
|
||||
draft.presentationSourceUrl ||
|
||||
'Noch keine Vorschauangaben.'}
|
||||
</p>
|
||||
{/if}
|
||||
<PresentationDisplay content={previewContent} imageSrc={previewImageSrc} />
|
||||
</aside>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
|
||||
export async function apiBody(request: Request) {
|
||||
const type = request.headers.get('content-type') ?? '';
|
||||
if (!type.includes('application/json')) throw new Error('API_JSON_REQUIRED');
|
||||
try {
|
||||
return (await request.json()) as Record<string, unknown>;
|
||||
} catch {
|
||||
throw new Error('API_INVALID_JSON');
|
||||
}
|
||||
}
|
||||
|
||||
export function apiFailure(cause: unknown) {
|
||||
const code = cause instanceof Error ? cause.message : 'API_ERROR';
|
||||
const status =
|
||||
code === 'API_UNAUTHORIZED'
|
||||
? 401
|
||||
: code === 'API_FORBIDDEN'
|
||||
? 403
|
||||
: code === 'NOT_FOUND'
|
||||
? 404
|
||||
: code === 'CONFLICT' || code === 'API_IDEMPOTENCY_CONFLICT'
|
||||
? 409
|
||||
: 400;
|
||||
return json(
|
||||
{
|
||||
error: {
|
||||
code,
|
||||
message:
|
||||
status === 401
|
||||
? 'Authentifizierung erforderlich.'
|
||||
: status === 403
|
||||
? 'Diese Berechtigung fehlt.'
|
||||
: status === 404
|
||||
? 'Nicht gefunden.'
|
||||
: 'Anfrage konnte nicht verarbeitet werden.'
|
||||
}
|
||||
},
|
||||
{ status }
|
||||
);
|
||||
}
|
||||
|
||||
export function pageInput(url: URL) {
|
||||
const limit = Math.min(100, Math.max(1, Number(url.searchParams.get('limit') ?? 50) || 50));
|
||||
const offset = Math.max(0, Number(url.searchParams.get('offset') ?? 0) || 0);
|
||||
return { limit, offset };
|
||||
}
|
||||
@@ -70,6 +70,21 @@ afterEach(async () => {
|
||||
});
|
||||
|
||||
describe('authentication', () => {
|
||||
it('stores the show overview preference per user', async () => {
|
||||
const { createFirstAdmin, getShowOverviewView, setShowOverviewView } =
|
||||
await import('./auth.js');
|
||||
const user = await createFirstAdmin({
|
||||
setupToken: 'a'.repeat(32),
|
||||
email: 'calendar@example.test',
|
||||
displayName: 'Kalender Test',
|
||||
password: 'a-valid-password-123'
|
||||
});
|
||||
expect(getShowOverviewView(user.id)).toBe('list');
|
||||
expect(setShowOverviewView(user.id, 'calendar')).toBe('calendar');
|
||||
expect(getShowOverviewView(user.id)).toBe('calendar');
|
||||
expect(() => setShowOverviewView(user.id, 'invalid')).toThrow('INVALID_VIEW');
|
||||
});
|
||||
|
||||
it('creates the first Barkeeper once and stores no plaintext secret', async () => {
|
||||
const { createFirstAdmin } = await import('./auth.js');
|
||||
const password = 'Ein-sehr-langes-Testpasswort';
|
||||
|
||||
+35
-3
@@ -26,6 +26,7 @@ const PASSWORD_OPTIONS = {
|
||||
} as const;
|
||||
|
||||
export type Role = 'barkeeper' | 'thekencrew';
|
||||
export type ShowOverviewView = 'list' | 'calendar';
|
||||
export type AuthUser = {
|
||||
id: string;
|
||||
email: string;
|
||||
@@ -66,6 +67,23 @@ export function normalizeEmail(email: string): string {
|
||||
return email.trim().toLowerCase();
|
||||
}
|
||||
|
||||
export function getShowOverviewView(userId: string): ShowOverviewView {
|
||||
const row = getDatabase()
|
||||
.prepare('SELECT show_overview_view FROM users WHERE id = ?')
|
||||
.get(userId) as { show_overview_view: ShowOverviewView } | undefined;
|
||||
if (!row) throw new Error('NOT_FOUND');
|
||||
return row.show_overview_view;
|
||||
}
|
||||
|
||||
export function setShowOverviewView(userId: string, view: string): ShowOverviewView {
|
||||
if (view !== 'list' && view !== 'calendar') throw new Error('INVALID_VIEW');
|
||||
const result = getDatabase()
|
||||
.prepare('UPDATE users SET show_overview_view = ?, updated_at_utc = ? WHERE id = ?')
|
||||
.run(view, nowUtc(), userId);
|
||||
if (!result.changes) throw new Error('NOT_FOUND');
|
||||
return view;
|
||||
}
|
||||
|
||||
export function validEmail(email: string): boolean {
|
||||
return email.length <= 254 && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
|
||||
}
|
||||
@@ -92,11 +110,11 @@ export async function verifyPassword(passwordHash: string, password: string): Pr
|
||||
|
||||
const dummyPasswordHash = hashPassword(randomBytes(32).toString('hex'));
|
||||
|
||||
function createToken(): string {
|
||||
export function createToken(): string {
|
||||
return randomBytes(32).toString('base64url');
|
||||
}
|
||||
|
||||
function hashToken(token: string): string {
|
||||
export function hashToken(token: string): string {
|
||||
return createHash('sha256').update(token).digest('hex');
|
||||
}
|
||||
|
||||
@@ -546,7 +564,13 @@ export async function resetPassword(token: string, password: string): Promise<vo
|
||||
'UPDATE password_reset_tokens SET consumed_at_utc = ? WHERE user_id = ? AND consumed_at_utc IS NULL'
|
||||
)
|
||||
.run(timestamp, row.user_id);
|
||||
database.prepare('DELETE FROM oauth_authorization_codes WHERE user_id = ?').run(row.user_id);
|
||||
database.prepare('DELETE FROM sessions WHERE user_id = ?').run(row.user_id);
|
||||
database
|
||||
.prepare(
|
||||
'UPDATE oauth_access_tokens SET revoked_at_utc = ? WHERE user_id = ? AND revoked_at_utc IS NULL'
|
||||
)
|
||||
.run(timestamp, row.user_id);
|
||||
});
|
||||
reset();
|
||||
}
|
||||
@@ -574,7 +598,15 @@ export function setUserLocked(actor: AuthUser, userId: string, locked: boolean):
|
||||
database
|
||||
.prepare('UPDATE users SET locked_at_utc = ?, updated_at_utc = ? WHERE id = ?')
|
||||
.run(locked ? nowUtc() : null, nowUtc(), userId);
|
||||
if (locked) database.prepare('DELETE FROM sessions WHERE user_id = ?').run(userId);
|
||||
if (locked) {
|
||||
database.prepare('DELETE FROM sessions WHERE user_id = ?').run(userId);
|
||||
database
|
||||
.prepare(
|
||||
'UPDATE oauth_access_tokens SET revoked_at_utc = ? WHERE user_id = ? AND revoked_at_utc IS NULL'
|
||||
)
|
||||
.run(nowUtc(), userId);
|
||||
database.prepare('DELETE FROM oauth_authorization_codes WHERE user_id = ?').run(userId);
|
||||
}
|
||||
});
|
||||
update();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,204 @@
|
||||
import { execFileSync } from 'node:child_process';
|
||||
import { mkdtempSync, rmSync } from 'node:fs';
|
||||
import { tmpdir } from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
||||
import type { AuthUser } from './auth.js';
|
||||
import { finalizeShow, getCompletionSummary } from './completion.js';
|
||||
import { closeDatabase, getDatabase } from './database.js';
|
||||
import {
|
||||
addPieceUsage,
|
||||
addShowSection,
|
||||
createShow,
|
||||
duplicateCompletedShow,
|
||||
getPieceUsageContexts,
|
||||
getShow
|
||||
} from './shows.js';
|
||||
|
||||
let directory: string;
|
||||
const actor: AuthUser = {
|
||||
id: 'completion-actor',
|
||||
email: 'completion@example.test',
|
||||
displayName: 'Abschluss Test',
|
||||
role: 'barkeeper',
|
||||
lockedAtUtc: null
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
directory = mkdtempSync(path.join(tmpdir(), 'sendewerk-completion-test-'));
|
||||
process.env.SENDEWERK_DB_PATH = path.join(directory, 'test.sqlite');
|
||||
process.env.SENDEWERK_UPLOAD_DIR = path.join(directory, 'uploads');
|
||||
execFileSync(process.execPath, ['scripts/migrate.mjs'], { cwd: process.cwd(), env: process.env });
|
||||
execFileSync(process.execPath, ['scripts/seed.mjs'], { cwd: process.cwd(), env: process.env });
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`INSERT INTO users (id, email, email_normalized, display_name, password_hash, role,
|
||||
password_changed_at_utc, created_at_utc, updated_at_utc)
|
||||
VALUES (?, ?, ?, ?, 'unused', 'barkeeper', ?, ?, ?)`
|
||||
)
|
||||
.run(
|
||||
actor.id,
|
||||
actor.email,
|
||||
actor.email,
|
||||
actor.displayName,
|
||||
...Array(3).fill(new Date().toISOString())
|
||||
);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
closeDatabase();
|
||||
delete process.env.SENDEWERK_DB_PATH;
|
||||
delete process.env.SENDEWERK_UPLOAD_DIR;
|
||||
rmSync(directory, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
function endedShow() {
|
||||
const created = createShow({ title: 'Finale Sendung', startsAtUtc: null, templateId: null });
|
||||
const section = addShowSection(created.id, created.revision, {
|
||||
name: 'Gesendeter Block',
|
||||
categoryId: 'cat-jc',
|
||||
explicitDurationSeconds: null
|
||||
});
|
||||
const done = addPieceUsage(created.id, section.revision, {
|
||||
pieceId: 'piece-console',
|
||||
sectionId: section.id
|
||||
});
|
||||
const skipped = addPieceUsage(created.id, done.revision, {
|
||||
pieceId: 'piece-console',
|
||||
sectionId: section.id
|
||||
});
|
||||
const database = getDatabase();
|
||||
database.prepare("UPDATE piece_usages SET status = 'done' WHERE id = ?").run(done.id);
|
||||
database.prepare("UPDATE piece_usages SET status = 'skipped' WHERE id = ?").run(skipped.id);
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO show_live_states
|
||||
(show_id, revision, started_at_utc, ended_at_utc, presentation_revision, updated_at_utc)
|
||||
VALUES (?, 0, ?, ?, 0, ?)`
|
||||
)
|
||||
.run(
|
||||
created.id,
|
||||
'2026-10-25T18:00:00.000Z',
|
||||
'2026-10-25T19:00:00.000Z',
|
||||
'2026-10-25T19:00:00.000Z'
|
||||
);
|
||||
return { showId: created.id, doneUsageId: done.id, revision: skipped.revision };
|
||||
}
|
||||
|
||||
describe('show completion', () => {
|
||||
it('finalizes once, records only sent usages and archives only the explicit selection', () => {
|
||||
const prepared = endedShow();
|
||||
expect(getCompletionSummary(prepared.showId)).toMatchObject({
|
||||
doneCount: 1,
|
||||
skippedCount: 1,
|
||||
candidates: [{ pieceId: 'piece-console', usageCount: 1 }]
|
||||
});
|
||||
const first = finalizeShow({
|
||||
showId: prepared.showId,
|
||||
commandId: 'complete-once',
|
||||
expectedShowRevision: prepared.revision,
|
||||
expectedLiveRevision: 0,
|
||||
archivePieceIds: ['piece-console'],
|
||||
actor,
|
||||
now: new Date('2026-10-25T19:05:00.000Z')
|
||||
});
|
||||
expect(first.duplicate).toBe(false);
|
||||
expect(
|
||||
finalizeShow({
|
||||
showId: prepared.showId,
|
||||
commandId: 'complete-once',
|
||||
expectedShowRevision: prepared.revision,
|
||||
expectedLiveRevision: 0,
|
||||
archivePieceIds: ['piece-console'],
|
||||
actor
|
||||
}).duplicate
|
||||
).toBe(true);
|
||||
expect(() =>
|
||||
finalizeShow({
|
||||
showId: prepared.showId,
|
||||
commandId: 'different-command',
|
||||
expectedShowRevision: prepared.revision,
|
||||
expectedLiveRevision: 0,
|
||||
archivePieceIds: [],
|
||||
actor
|
||||
})
|
||||
).toThrow('SHOW_COMPLETED');
|
||||
const database = getDatabase();
|
||||
expect(
|
||||
(
|
||||
database
|
||||
.prepare('SELECT count(*) AS count FROM piece_usage_history WHERE show_id = ?')
|
||||
.get(prepared.showId) as { count: number }
|
||||
).count
|
||||
).toBe(1);
|
||||
expect(database.prepare('SELECT status FROM pieces WHERE id = ?').get('piece-console')).toEqual(
|
||||
{ status: 'archived' }
|
||||
);
|
||||
expect(getPieceUsageContexts(['piece-console'])['piece-console'].sentHistory).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('keeps historical snapshots stable and duplicates them into an editable clean run', () => {
|
||||
const prepared = endedShow();
|
||||
finalizeShow({
|
||||
showId: prepared.showId,
|
||||
commandId: 'freeze',
|
||||
expectedShowRevision: prepared.revision,
|
||||
expectedLiveRevision: 0,
|
||||
archivePieceIds: [],
|
||||
actor
|
||||
});
|
||||
const historical = getShow(prepared.showId)!;
|
||||
getDatabase()
|
||||
.prepare("UPDATE section_categories SET name = 'Später geändert' WHERE id = 'cat-jc'")
|
||||
.run();
|
||||
getDatabase()
|
||||
.prepare("UPDATE pieces SET title = 'Später geändert' WHERE id = 'piece-console'")
|
||||
.run();
|
||||
const unchanged = getShow(prepared.showId)!;
|
||||
expect(unchanged.sections[0].category).toBe(historical.sections[0].category);
|
||||
expect(unchanged.sections[0].usages[0].title).toBe(historical.sections[0].usages[0].title);
|
||||
|
||||
const copy = duplicateCompletedShow(prepared.showId, 'copy-once');
|
||||
expect(duplicateCompletedShow(prepared.showId, 'copy-once').id).toBe(copy.id);
|
||||
expect(getShow(copy.id)).toMatchObject({
|
||||
status: 'draft',
|
||||
startsAtUtc: null,
|
||||
sections: [
|
||||
{
|
||||
category: historical.sections[0].category,
|
||||
usages: [{ status: 'open' }, { status: 'open' }]
|
||||
}
|
||||
]
|
||||
});
|
||||
expect(
|
||||
getDatabase().prepare('SELECT 1 FROM show_finalizations WHERE show_id = ?').get(copy.id)
|
||||
).toBeUndefined();
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`UPDATE piece_usages SET status = 'done'
|
||||
WHERE show_section_id IN (SELECT id FROM show_sections WHERE show_id = ?)`
|
||||
)
|
||||
.run(copy.id);
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`INSERT INTO show_live_states
|
||||
(show_id, revision, started_at_utc, ended_at_utc, presentation_revision, updated_at_utc)
|
||||
VALUES (?, 0, ?, ?, 0, ?)`
|
||||
)
|
||||
.run(
|
||||
copy.id,
|
||||
'2026-10-26T18:00:00.000Z',
|
||||
'2026-10-26T19:00:00.000Z',
|
||||
'2026-10-26T19:00:00.000Z'
|
||||
);
|
||||
finalizeShow({
|
||||
showId: copy.id,
|
||||
commandId: 'finalize-copy',
|
||||
expectedShowRevision: 1,
|
||||
expectedLiveRevision: 0,
|
||||
archivePieceIds: [],
|
||||
actor
|
||||
});
|
||||
expect(getShow(copy.id)?.sections[0].category).toBe(historical.sections[0].category);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,210 @@
|
||||
import type { AuthUser } from './auth.js';
|
||||
import { getDatabase } from './database.js';
|
||||
|
||||
export type CompletionCandidate = {
|
||||
pieceId: string;
|
||||
title: string;
|
||||
usageCount: number;
|
||||
};
|
||||
|
||||
export type CompletionSummary = {
|
||||
doneCount: number;
|
||||
skippedCount: number;
|
||||
openCount: number;
|
||||
candidates: CompletionCandidate[];
|
||||
};
|
||||
|
||||
export function isShowFinalized(showId: string): boolean {
|
||||
return Boolean(
|
||||
getDatabase().prepare('SELECT 1 FROM show_finalizations WHERE show_id = ?').get(showId)
|
||||
);
|
||||
}
|
||||
|
||||
export function getCompletionSummary(showId: string): CompletionSummary {
|
||||
const database = getDatabase();
|
||||
if (!database.prepare('SELECT 1 FROM shows WHERE id = ?').get(showId))
|
||||
throw new Error('NOT_FOUND');
|
||||
const counts = database
|
||||
.prepare(
|
||||
`SELECT
|
||||
sum(CASE WHEN u.status = 'done' THEN 1 ELSE 0 END) AS done_count,
|
||||
sum(CASE WHEN u.status = 'skipped' THEN 1 ELSE 0 END) AS skipped_count,
|
||||
sum(CASE WHEN u.status IN ('open', 'current') THEN 1 ELSE 0 END) AS open_count
|
||||
FROM piece_usages u JOIN show_sections s ON s.id = u.show_section_id
|
||||
WHERE s.show_id = ? AND s.is_reserve_bank = 0`
|
||||
)
|
||||
.get(showId) as {
|
||||
done_count: number | null;
|
||||
skipped_count: number | null;
|
||||
open_count: number | null;
|
||||
};
|
||||
const candidates = database
|
||||
.prepare(
|
||||
`SELECT u.original_piece_id AS piece_id, p.title, count(*) AS usage_count
|
||||
FROM piece_usages u
|
||||
JOIN show_sections s ON s.id = u.show_section_id
|
||||
JOIN pieces p ON p.id = u.original_piece_id
|
||||
WHERE s.show_id = ? AND s.is_reserve_bank = 0 AND u.status = 'done'
|
||||
AND p.status != 'archived' AND p.deleted_at_utc IS NULL
|
||||
GROUP BY u.original_piece_id, p.title ORDER BY p.title COLLATE NOCASE`
|
||||
)
|
||||
.all(showId) as { piece_id: string; title: string; usage_count: number }[];
|
||||
return {
|
||||
doneCount: counts.done_count ?? 0,
|
||||
skippedCount: counts.skipped_count ?? 0,
|
||||
openCount: counts.open_count ?? 0,
|
||||
candidates: candidates.map((candidate) => ({
|
||||
pieceId: candidate.piece_id,
|
||||
title: candidate.title,
|
||||
usageCount: candidate.usage_count
|
||||
}))
|
||||
};
|
||||
}
|
||||
|
||||
export function getHistoricalActualDurations(showId: string): Record<string, number> {
|
||||
return Object.fromEntries(
|
||||
(
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`SELECT usage_id, actual_duration_seconds FROM piece_usage_history WHERE show_id = ?`
|
||||
)
|
||||
.all(showId) as { usage_id: string; actual_duration_seconds: number }[]
|
||||
).map((row) => [row.usage_id, row.actual_duration_seconds])
|
||||
);
|
||||
}
|
||||
|
||||
export function finalizeShow(input: {
|
||||
showId: string;
|
||||
commandId: string;
|
||||
expectedShowRevision: number;
|
||||
expectedLiveRevision: number;
|
||||
archivePieceIds: string[];
|
||||
actor: AuthUser;
|
||||
now?: Date;
|
||||
}) {
|
||||
if (!input.commandId || input.commandId.length > 200) throw new Error('INVALID_COMMAND');
|
||||
if (!Number.isInteger(input.expectedShowRevision) || input.expectedShowRevision < 1) {
|
||||
throw new Error('INVALID_REVISION');
|
||||
}
|
||||
if (!Number.isInteger(input.expectedLiveRevision) || input.expectedLiveRevision < 0) {
|
||||
throw new Error('INVALID_REVISION');
|
||||
}
|
||||
const archivePieceIds = [...new Set(input.archivePieceIds.filter(Boolean))];
|
||||
const database = getDatabase();
|
||||
return database.transaction(() => {
|
||||
const existing = database
|
||||
.prepare('SELECT command_id FROM show_finalizations WHERE show_id = ?')
|
||||
.get(input.showId) as { command_id: string } | undefined;
|
||||
if (existing) {
|
||||
if (existing.command_id !== input.commandId) throw new Error('SHOW_COMPLETED');
|
||||
return { duplicate: true };
|
||||
}
|
||||
const state = database
|
||||
.prepare(
|
||||
`SELECT sh.revision AS show_revision, ls.revision AS live_revision, ls.ended_at_utc
|
||||
FROM shows sh JOIN show_live_states ls ON ls.show_id = sh.id WHERE sh.id = ?`
|
||||
)
|
||||
.get(input.showId) as
|
||||
{ show_revision: number; live_revision: number; ended_at_utc: string | null } | undefined;
|
||||
if (!state) throw new Error('NOT_FOUND');
|
||||
if (!state.ended_at_utc) throw new Error('NOT_ENDED');
|
||||
if (
|
||||
state.show_revision !== input.expectedShowRevision ||
|
||||
state.live_revision !== input.expectedLiveRevision
|
||||
) {
|
||||
throw new Error('CONFLICT');
|
||||
}
|
||||
|
||||
const candidates = getCompletionSummary(input.showId).candidates.map(
|
||||
(candidate) => candidate.pieceId
|
||||
);
|
||||
if (archivePieceIds.some((pieceId) => !candidates.includes(pieceId))) {
|
||||
throw new Error('INVALID_ARCHIVE_SELECTION');
|
||||
}
|
||||
const now = (input.now ?? new Date()).toISOString();
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE live_usage_runs SET ended_at_utc = ? WHERE show_id = ? AND ended_at_utc IS NULL`
|
||||
)
|
||||
.run(now, input.showId);
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE live_show_timer_runs SET ended_at_utc = ? WHERE show_id = ? AND ended_at_utc IS NULL`
|
||||
)
|
||||
.run(now, input.showId);
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE live_section_timer_runs SET ended_at_utc = ?
|
||||
WHERE ended_at_utc IS NULL AND timer_id IN (
|
||||
SELECT id FROM live_section_timers WHERE show_id = ?
|
||||
)`
|
||||
)
|
||||
.run(now, input.showId);
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE live_section_timers SET ended_at_utc = ? WHERE show_id = ? AND ended_at_utc IS NULL`
|
||||
)
|
||||
.run(now, input.showId);
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE show_sections SET
|
||||
category_name_snapshot = COALESCE(category_name_snapshot,
|
||||
(SELECT name FROM section_categories WHERE id = show_sections.category_id)),
|
||||
category_color_snapshot = COALESCE(category_color_snapshot,
|
||||
(SELECT color FROM section_categories WHERE id = show_sections.category_id))
|
||||
WHERE show_id = ?`
|
||||
)
|
||||
.run(input.showId);
|
||||
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO piece_usage_history (
|
||||
usage_id, show_id, original_piece_id, show_title_snapshot, usage_title_snapshot,
|
||||
used_at_utc, actual_duration_seconds
|
||||
)
|
||||
SELECT u.id, sh.id, u.original_piece_id, sh.title, u.title_snapshot,
|
||||
COALESCE(sh.starts_at_utc, ?),
|
||||
COALESCE((
|
||||
SELECT sum(max(0, CAST((julianday(COALESCE(r.ended_at_utc, ?)) -
|
||||
julianday(r.started_at_utc)) * 86400 AS INTEGER)))
|
||||
FROM live_usage_runs r WHERE r.usage_id = u.id
|
||||
), 0)
|
||||
FROM piece_usages u
|
||||
JOIN show_sections s ON s.id = u.show_section_id
|
||||
JOIN shows sh ON sh.id = s.show_id
|
||||
WHERE sh.id = ? AND s.is_reserve_bank = 0 AND u.status = 'done'
|
||||
AND u.original_piece_id IS NOT NULL`
|
||||
)
|
||||
.run(now, now, input.showId);
|
||||
|
||||
const archivePiece = database.prepare(
|
||||
`UPDATE pieces SET archived_from_status = status, status = 'archived', revision = revision + 1,
|
||||
updated_at_utc = ? WHERE id = ? AND status != 'archived' AND deleted_at_utc IS NULL`
|
||||
);
|
||||
for (const pieceId of archivePieceIds) {
|
||||
archivePiece.run(now, pieceId);
|
||||
}
|
||||
|
||||
const updated = database
|
||||
.prepare(
|
||||
`UPDATE shows SET status = 'completed', completed_at_utc = ?, revision = revision + 1,
|
||||
updated_at_utc = ? WHERE id = ? AND revision = ? AND status != 'completed'`
|
||||
)
|
||||
.run(now, now, input.showId, input.expectedShowRevision);
|
||||
if (updated.changes !== 1) throw new Error('CONFLICT');
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO show_finalizations
|
||||
(show_id, command_id, source_revision, finalized_by_user_id, finalized_at_utc)
|
||||
VALUES (?, ?, ?, ?, ?)`
|
||||
)
|
||||
.run(input.showId, input.commandId, input.expectedShowRevision, input.actor.id, now);
|
||||
const recordArchivedPiece = database.prepare(
|
||||
'INSERT INTO show_finalization_archived_pieces (show_id, piece_id) VALUES (?, ?)'
|
||||
);
|
||||
for (const pieceId of archivePieceIds) {
|
||||
recordArchivedPiece.run(input.showId, pieceId);
|
||||
}
|
||||
return { duplicate: false };
|
||||
})();
|
||||
}
|
||||
@@ -18,6 +18,10 @@ export function getAuthConfig() {
|
||||
throw new Error('SENDEWERK_APP_ORIGIN muss im Produktionsbetrieb gesetzt sein.');
|
||||
}
|
||||
const origin = new URL(configuredOrigin || 'http://localhost:5173');
|
||||
const loopback = ['localhost', '127.0.0.1', '[::1]'].includes(origin.hostname);
|
||||
if (process.env.NODE_ENV === 'production' && origin.protocol !== 'https:' && !loopback) {
|
||||
throw new Error('SENDEWERK_APP_ORIGIN muss öffentlich HTTPS verwenden.');
|
||||
}
|
||||
return {
|
||||
origin,
|
||||
setupToken: process.env.SENDEWERK_SETUP_TOKEN || '',
|
||||
|
||||
@@ -74,7 +74,8 @@ function completeInput(overrides: Partial<PieceInput> = {}): PieceInput {
|
||||
sources: [
|
||||
{ label: 'Dokumentation', url: 'https://example.com/dokumentation', timecodeSeconds: 75 }
|
||||
],
|
||||
...overrides
|
||||
...overrides,
|
||||
preparationEffort: overrides.preparationEffort ?? null
|
||||
};
|
||||
}
|
||||
|
||||
@@ -332,11 +333,17 @@ describe('content management', () => {
|
||||
presentationMediaId: selected.id
|
||||
});
|
||||
|
||||
savePiece(id, source.revision, {
|
||||
...source,
|
||||
status: 'preparing',
|
||||
presentationMode: 'image'
|
||||
});
|
||||
const duplicateId = await duplicatePiece(id);
|
||||
const duplicate = getPiece(duplicateId)!;
|
||||
expect(duplicate.media).toHaveLength(1);
|
||||
expect(duplicate.presentationMediaId).toBe(duplicate.media[0].id);
|
||||
expect(duplicate.presentationMediaId).not.toBe(selected.id);
|
||||
expect(duplicate.presentationMode).toBe('image');
|
||||
|
||||
const template = savePieceAsTemplate(id, 'Ohne Medienreferenz', 'Nur Inhaltsdaten');
|
||||
const snapshot = getDatabase()
|
||||
|
||||
+61
-19
@@ -14,6 +14,7 @@ import {
|
||||
export const PIECE_STATUSES = ['inbox', 'preparing', 'ready', 'archived'] as const;
|
||||
export type PieceStatus = (typeof PIECE_STATUSES)[number];
|
||||
export type EditablePieceStatus = Exclude<PieceStatus, 'archived'>;
|
||||
export type PreparationEffort = 'low' | 'medium' | 'high' | null;
|
||||
export type TaxonomyKind = 'category' | 'format' | 'topic';
|
||||
|
||||
export type PieceSourceInput = {
|
||||
@@ -42,10 +43,12 @@ export type PieceInput = {
|
||||
summary: string;
|
||||
formatId: string | null;
|
||||
status: EditablePieceStatus;
|
||||
preparationEffort: PreparationEffort;
|
||||
durationSeconds: number;
|
||||
intro: string;
|
||||
researchText: string;
|
||||
moderationNotes: string;
|
||||
interactionText?: string;
|
||||
transitionText: string;
|
||||
presentationText: string;
|
||||
presentationMode: PresentationMode;
|
||||
@@ -81,9 +84,13 @@ export type PieceListItem = {
|
||||
sourceCount: number;
|
||||
mediaId: string | null;
|
||||
isFavorite: boolean;
|
||||
preparationEffort: PreparationEffort;
|
||||
};
|
||||
|
||||
export type PieceEditor = Omit<PieceInput, 'status' | 'tools' | 'presentationMediaId'> & {
|
||||
export type PieceEditor = Omit<
|
||||
PieceInput,
|
||||
'status' | 'tools' | 'presentationMediaId' | 'interactionText'
|
||||
> & {
|
||||
id: string;
|
||||
status: PieceStatus;
|
||||
revision: number;
|
||||
@@ -92,9 +99,12 @@ export type PieceEditor = Omit<PieceInput, 'status' | 'tools' | 'presentationMed
|
||||
media: PieceMedia[];
|
||||
presentationMediaId: string | null;
|
||||
isFavorite: boolean;
|
||||
interactionText: string;
|
||||
tools: PieceTool[];
|
||||
};
|
||||
|
||||
type ValidatedPieceInput = PieceInput;
|
||||
|
||||
export type PieceMedia = {
|
||||
id: string;
|
||||
originalName: string;
|
||||
@@ -187,10 +197,13 @@ function requireTaxonomyIds(table: 'formats' | 'topics' | 'section_categories',
|
||||
if (count.count !== ids.length) throw new Error('INVALID_TAXONOMY');
|
||||
}
|
||||
|
||||
function validatePieceInput(input: PieceInput): PieceInput {
|
||||
function validatePieceInput(input: PieceInput): ValidatedPieceInput {
|
||||
const title = cleanText(input.title, 200, 'title');
|
||||
if (!title) throw new Error('INVALID_TITLE');
|
||||
if (!['inbox', 'preparing', 'ready'].includes(input.status)) throw new Error('INVALID_STATUS');
|
||||
if (![null, 'low', 'medium', 'high'].includes(input.preparationEffort)) {
|
||||
throw new Error('INVALID_PREPARATION_EFFORT');
|
||||
}
|
||||
if (
|
||||
!Number.isInteger(input.durationSeconds) ||
|
||||
input.durationSeconds < 0 ||
|
||||
@@ -219,7 +232,7 @@ function validatePieceInput(input: PieceInput): PieceInput {
|
||||
}
|
||||
return { label, url, timecodeSeconds: source.timecodeSeconds };
|
||||
});
|
||||
if (!['text', 'link', 'video'].includes(input.presentationMode)) {
|
||||
if (!['text', 'image', 'link', 'video'].includes(input.presentationMode)) {
|
||||
throw new Error('INVALID_PRESENTATION');
|
||||
}
|
||||
const sourcePosition = input.presentationSourcePosition;
|
||||
@@ -229,7 +242,7 @@ function validatePieceInput(input: PieceInput): PieceInput {
|
||||
) {
|
||||
throw new Error('INVALID_PRESENTATION');
|
||||
}
|
||||
if (input.presentationMode !== 'text' && sourcePosition === null) {
|
||||
if (['link', 'video'].includes(input.presentationMode) && sourcePosition === null) {
|
||||
throw new Error('INVALID_PRESENTATION');
|
||||
}
|
||||
const presentationImageUrl = cleanText(input.presentationImageUrl, 2_000, 'presentation_image');
|
||||
@@ -242,16 +255,24 @@ function validatePieceInput(input: PieceInput): PieceInput {
|
||||
input.presentationMediaId === undefined
|
||||
? undefined
|
||||
: cleanText(input.presentationMediaId, 100, 'presentation_media') || null;
|
||||
if (input.presentationMode === 'image' && !presentationMediaId) {
|
||||
throw new Error('INVALID_PRESENTATION');
|
||||
}
|
||||
return {
|
||||
title,
|
||||
outputTitle: cleanText(input.outputTitle, 300, 'output_title'),
|
||||
summary: cleanText(input.summary, 2_000, 'summary'),
|
||||
formatId: input.formatId || null,
|
||||
status: input.status,
|
||||
preparationEffort: input.preparationEffort,
|
||||
durationSeconds: input.durationSeconds,
|
||||
intro: cleanText(input.intro, 50_000, 'intro'),
|
||||
researchText: cleanText(input.researchText, 50_000, 'research'),
|
||||
moderationNotes: cleanText(input.moderationNotes, 50_000, 'moderation'),
|
||||
interactionText:
|
||||
input.interactionText === undefined
|
||||
? undefined
|
||||
: cleanText(input.interactionText, 50_000, 'interaction'),
|
||||
transitionText: cleanText(input.transitionText, 50_000, 'transition'),
|
||||
presentationText: cleanText(input.presentationText, 50_000, 'presentation'),
|
||||
presentationMode: input.presentationMode,
|
||||
@@ -306,6 +327,7 @@ type PieceListRow = {
|
||||
source_count: number;
|
||||
media_id: string | null;
|
||||
is_favorite: number;
|
||||
preparation_effort: PreparationEffort;
|
||||
};
|
||||
|
||||
export function listPieces(filters: {
|
||||
@@ -355,6 +377,7 @@ export function listPieces(filters: {
|
||||
const rows = database
|
||||
.prepare(
|
||||
`SELECT p.id, p.title, p.summary, p.status, p.revision, p.duration_seconds, p.is_favorite,
|
||||
p.preparation_effort,
|
||||
p.format_id, COALESCE(f.name, 'Ohne Format') AS format,
|
||||
(SELECT count(*) FROM piece_sources ps WHERE ps.piece_id = p.id) AS source_count,
|
||||
(SELECT pm.id FROM piece_media pm WHERE pm.piece_id = p.id AND pm.removed_at_utc IS NULL ORDER BY pm.position LIMIT 1) AS media_id
|
||||
@@ -387,7 +410,8 @@ export function listPieces(filters: {
|
||||
topics: topicStatement.all(row.id) as PieceListItem['topics'],
|
||||
sourceCount: row.source_count,
|
||||
mediaId: row.media_id,
|
||||
isFavorite: row.is_favorite === 1
|
||||
isFavorite: row.is_favorite === 1,
|
||||
preparationEffort: row.preparation_effort
|
||||
}));
|
||||
}
|
||||
|
||||
@@ -402,6 +426,7 @@ type PieceRow = {
|
||||
intro: string;
|
||||
research_text: string;
|
||||
moderation_notes: string;
|
||||
interaction_text: string;
|
||||
transition_text: string;
|
||||
presentation_text: string;
|
||||
presentation_mode: PresentationMode;
|
||||
@@ -421,14 +446,16 @@ type PieceRow = {
|
||||
updated_at_utc: string;
|
||||
is_favorite: number;
|
||||
presentation_media_id: string | null;
|
||||
preparation_effort: PreparationEffort;
|
||||
};
|
||||
|
||||
export function getPiece(id: string): PieceEditor | null {
|
||||
const database = getDatabase();
|
||||
const row = database
|
||||
.prepare(
|
||||
`SELECT id, title, output_title, summary, format_id, status, duration_seconds, intro, research_text,
|
||||
moderation_notes, transition_text, presentation_text, presentation_mode,
|
||||
`SELECT id, title, output_title, summary, format_id, status, preparation_effort, duration_seconds, intro, research_text,
|
||||
moderation_notes, interaction_text, transition_text, presentation_text,
|
||||
CASE WHEN presentation_image_only = 1 THEN 'image' ELSE presentation_mode END AS presentation_mode,
|
||||
presentation_source_position, presentation_title, presentation_description,
|
||||
presentation_image_url, presentation_site_name, presentation_provider,
|
||||
presentation_provider_id, presentation_title_manual, presentation_description_manual,
|
||||
@@ -448,10 +475,12 @@ export function getPiece(id: string): PieceEditor | null {
|
||||
summary: row.summary,
|
||||
formatId: row.format_id,
|
||||
status: row.status,
|
||||
preparationEffort: row.preparation_effort,
|
||||
durationSeconds: row.duration_seconds,
|
||||
intro: row.intro,
|
||||
researchText: row.research_text,
|
||||
moderationNotes: row.moderation_notes,
|
||||
interactionText: row.interaction_text,
|
||||
transitionText: row.transition_text,
|
||||
presentationText: row.presentation_text,
|
||||
presentationMode: row.presentation_mode,
|
||||
@@ -599,9 +628,9 @@ export function savePiece(id: string, expectedRevision: number, rawInput: PieceI
|
||||
const save = database.transaction(() => {
|
||||
const result = database
|
||||
.prepare(
|
||||
`UPDATE pieces SET title = ?, output_title = ?, summary = ?, format_id = ?, status = ?, duration_seconds = ?,
|
||||
intro = ?, research_text = ?, moderation_notes = ?, transition_text = ?, presentation_text = ?,
|
||||
presentation_mode = ?, presentation_source_position = ?, presentation_title = ?,
|
||||
`UPDATE pieces SET title = ?, output_title = ?, summary = ?, format_id = ?, status = ?, preparation_effort = ?, duration_seconds = ?,
|
||||
intro = ?, research_text = ?, moderation_notes = ?, interaction_text = COALESCE(?, interaction_text), transition_text = ?, presentation_text = ?,
|
||||
presentation_mode = ?, presentation_image_only = ?, presentation_source_position = ?, presentation_title = ?,
|
||||
presentation_description = ?, presentation_image_url = ?, presentation_site_name = ?,
|
||||
presentation_provider = ?, presentation_provider_id = ?, presentation_title_manual = ?,
|
||||
presentation_description_manual = ?, presentation_image_manual = ?,
|
||||
@@ -615,13 +644,16 @@ export function savePiece(id: string, expectedRevision: number, rawInput: PieceI
|
||||
input.summary,
|
||||
input.formatId,
|
||||
input.status,
|
||||
input.preparationEffort,
|
||||
input.durationSeconds,
|
||||
input.intro,
|
||||
input.researchText,
|
||||
input.moderationNotes,
|
||||
input.interactionText ?? null,
|
||||
input.transitionText,
|
||||
input.presentationText,
|
||||
input.presentationMode,
|
||||
input.presentationMode === 'image' ? 'text' : input.presentationMode,
|
||||
input.presentationMode === 'image' ? 1 : 0,
|
||||
input.presentationSourcePosition,
|
||||
input.presentationTitle,
|
||||
input.presentationDescription,
|
||||
@@ -650,17 +682,19 @@ export function savePiece(id: string, expectedRevision: number, rawInput: PieceI
|
||||
return { revision: expectedRevision + 1, updatedAtUtc };
|
||||
}
|
||||
|
||||
function blankPieceInput(): PieceInput {
|
||||
function blankPieceInput(): ValidatedPieceInput {
|
||||
return {
|
||||
title: 'Neues Piece',
|
||||
outputTitle: '',
|
||||
summary: '',
|
||||
formatId: null,
|
||||
status: 'preparing',
|
||||
preparationEffort: null,
|
||||
durationSeconds: 0,
|
||||
intro: '',
|
||||
researchText: '',
|
||||
moderationNotes: '',
|
||||
interactionText: '',
|
||||
transitionText: '',
|
||||
presentationText: '',
|
||||
presentationMode: 'text',
|
||||
@@ -682,7 +716,7 @@ function blankPieceInput(): PieceInput {
|
||||
};
|
||||
}
|
||||
|
||||
function templateInput(templateId: string): PieceInput {
|
||||
function templateInput(templateId: string): ValidatedPieceInput {
|
||||
if (templateId === 'blank') return blankPieceInput();
|
||||
const row = getDatabase()
|
||||
.prepare('SELECT snapshot_json FROM piece_templates WHERE id = ?')
|
||||
@@ -739,8 +773,8 @@ export function createPiece(template = 'blank'): string {
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO pieces (id, title, output_title, summary, format_id, status, duration_seconds, intro,
|
||||
research_text, moderation_notes, transition_text, presentation_text, created_at_utc,
|
||||
updated_at_utc, revision) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1)`
|
||||
research_text, moderation_notes, interaction_text, transition_text, presentation_text, created_at_utc,
|
||||
updated_at_utc, revision) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1)`
|
||||
)
|
||||
.run(
|
||||
id,
|
||||
@@ -753,6 +787,7 @@ export function createPiece(template = 'blank'): string {
|
||||
input.intro,
|
||||
input.researchText,
|
||||
input.moderationNotes,
|
||||
input.interactionText ?? '',
|
||||
input.transitionText,
|
||||
input.presentationText,
|
||||
now,
|
||||
@@ -782,6 +817,7 @@ export function savePieceAsTemplate(
|
||||
delete snapshot.updatedAtUtc;
|
||||
delete snapshot.media;
|
||||
delete snapshot.presentationMediaId;
|
||||
if (snapshot.presentationMode === 'image') snapshot.presentationMode = 'text';
|
||||
snapshot.status = 'preparing';
|
||||
const snapshotJson = JSON.stringify(snapshot);
|
||||
const database = getDatabase();
|
||||
@@ -901,14 +937,17 @@ export async function duplicatePiece(sourceId: string): Promise<string> {
|
||||
database.transaction(() => {
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO pieces (id, title, output_title, summary, format_id, status, duration_seconds, intro,
|
||||
research_text, moderation_notes, transition_text, presentation_text, presentation_mode,
|
||||
`INSERT INTO pieces (id, title, output_title, summary, format_id, status, preparation_effort, duration_seconds, intro,
|
||||
research_text, moderation_notes, interaction_text, transition_text, presentation_text, presentation_mode, presentation_image_only,
|
||||
presentation_source_position, presentation_title, presentation_description,
|
||||
presentation_image_url, presentation_site_name, presentation_provider,
|
||||
presentation_provider_id, presentation_title_manual,
|
||||
presentation_description_manual, presentation_image_manual,
|
||||
presentation_metadata_fetched_at_utc, created_at_utc, updated_at_utc, revision)
|
||||
VALUES (?, ?, ?, ?, ?, 'preparing', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1)`
|
||||
VALUES (
|
||||
?, ?, ?, ?, ?, 'preparing', ?, ?, ?, ?, ?, ?, ?, ?, ?,
|
||||
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1
|
||||
)`
|
||||
)
|
||||
.run(
|
||||
id,
|
||||
@@ -916,13 +955,16 @@ export async function duplicatePiece(sourceId: string): Promise<string> {
|
||||
source.outputTitle,
|
||||
source.summary,
|
||||
source.formatId,
|
||||
source.preparationEffort,
|
||||
source.durationSeconds,
|
||||
source.intro,
|
||||
source.researchText,
|
||||
source.moderationNotes,
|
||||
source.interactionText,
|
||||
source.transitionText,
|
||||
source.presentationText,
|
||||
source.presentationMode,
|
||||
source.presentationMode === 'image' ? 'text' : source.presentationMode,
|
||||
source.presentationMode === 'image' ? 1 : 0,
|
||||
source.presentationSourcePosition,
|
||||
source.presentationTitle,
|
||||
source.presentationDescription,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import Database from 'better-sqlite3';
|
||||
import { execFileSync } from 'node:child_process';
|
||||
import { mkdtempSync, rmSync } from 'node:fs';
|
||||
import { mkdtempSync, readdirSync, readFileSync, rmSync } from 'node:fs';
|
||||
import { tmpdir } from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest';
|
||||
@@ -62,7 +62,7 @@ describe('database setup', () => {
|
||||
database.close();
|
||||
|
||||
expect(counts).toEqual({
|
||||
migrations: 11,
|
||||
migrations: 20,
|
||||
pieces: 6,
|
||||
shows: 2,
|
||||
usages: 5,
|
||||
@@ -90,4 +90,97 @@ describe('database setup', () => {
|
||||
expect(show.totalDurationSeconds).toBe(5100);
|
||||
expect(show.sections[1].usages.find((usage) => usage.isReserve)?.durationSeconds).toBe(540);
|
||||
});
|
||||
|
||||
it('upgrades existing completed shows into stable finalizations exactly once', () => {
|
||||
const directory = mkdtempSync(path.join(tmpdir(), 'sendewerk-upgrade-test-'));
|
||||
temporaryDirectories.push(directory);
|
||||
const databasePath = path.join(directory, 'test.sqlite');
|
||||
const environment = {
|
||||
...process.env,
|
||||
SENDEWERK_DB_PATH: databasePath,
|
||||
SENDEWERK_UPLOAD_DIR: path.join(directory, 'uploads')
|
||||
};
|
||||
const database = new Database(databasePath);
|
||||
database.pragma('foreign_keys = ON');
|
||||
database.exec(
|
||||
'CREATE TABLE schema_migrations (name TEXT PRIMARY KEY, applied_at_utc TEXT NOT NULL)'
|
||||
);
|
||||
const migrationDirectory = path.resolve('migrations');
|
||||
const oldMigrations = readdirSync(migrationDirectory)
|
||||
.filter(
|
||||
(name) =>
|
||||
/^\d+.+\.sql$/.test(name) && !name.startsWith('0015_') && !name.startsWith('0016_')
|
||||
)
|
||||
.sort();
|
||||
for (const name of oldMigrations) {
|
||||
database.exec(readFileSync(path.join(migrationDirectory, name), 'utf8'));
|
||||
database
|
||||
.prepare('INSERT INTO schema_migrations (name, applied_at_utc) VALUES (?, ?)')
|
||||
.run(name, new Date().toISOString());
|
||||
}
|
||||
database.close();
|
||||
execFileSync(process.execPath, ['scripts/seed.mjs'], { cwd: process.cwd(), env: environment });
|
||||
|
||||
const legacy = new Database(databasePath);
|
||||
legacy.pragma('foreign_keys = ON');
|
||||
const usage = legacy
|
||||
.prepare(
|
||||
`SELECT u.id FROM piece_usages u JOIN show_sections s ON s.id = u.show_section_id
|
||||
WHERE s.show_id = 'show-october' AND s.is_reserve_bank = 0 LIMIT 1`
|
||||
)
|
||||
.get() as { id: string };
|
||||
legacy.prepare("UPDATE piece_usages SET status = 'done' WHERE id = ?").run(usage.id);
|
||||
legacy.prepare("UPDATE shows SET status = 'completed' WHERE id = 'show-october'").run();
|
||||
const completionMigration = '0015_completion_archive_and_shares.sql';
|
||||
legacy.exec(readFileSync(path.join(migrationDirectory, completionMigration), 'utf8'));
|
||||
legacy
|
||||
.prepare('INSERT INTO schema_migrations (name, applied_at_utc) VALUES (?, ?)')
|
||||
.run(completionMigration, new Date().toISOString());
|
||||
const now = new Date().toISOString();
|
||||
legacy
|
||||
.prepare(
|
||||
`INSERT INTO users (id, email, email_normalized, display_name, password_hash, role,
|
||||
password_changed_at_utc, created_at_utc, updated_at_utc)
|
||||
VALUES ('upgrade-barkeeper', 'upgrade@example.test', 'upgrade@example.test',
|
||||
'Upgrade', 'unused', 'barkeeper', ?, ?, ?)`
|
||||
)
|
||||
.run(now, now, now);
|
||||
legacy
|
||||
.prepare(
|
||||
`INSERT INTO show_shares
|
||||
(id, show_id, token_hash, scope, password_hash, expires_at_utc, revoked_at_utc,
|
||||
created_by_user_id, created_at_utc)
|
||||
VALUES ('upgrade-share', 'show-october', 'upgrade-token-hash', 'rundown', NULL,
|
||||
NULL, NULL, 'upgrade-barkeeper', ?)`
|
||||
)
|
||||
.run(now);
|
||||
legacy
|
||||
.prepare(
|
||||
`INSERT INTO show_share_sessions (token_hash, share_id, created_at_utc, expires_at_utc)
|
||||
VALUES ('upgrade-session-hash', 'upgrade-share', ?, ?)`
|
||||
)
|
||||
.run(now, new Date(Date.now() + 60_000).toISOString());
|
||||
legacy.close();
|
||||
|
||||
for (let run = 0; run < 2; run += 1) {
|
||||
execFileSync(process.execPath, ['scripts/migrate.mjs'], {
|
||||
cwd: process.cwd(),
|
||||
env: environment
|
||||
});
|
||||
}
|
||||
const upgraded = new Database(databasePath, { readonly: true });
|
||||
expect(
|
||||
upgraded
|
||||
.prepare(
|
||||
`SELECT
|
||||
(SELECT count(*) FROM show_finalizations WHERE show_id = 'show-october') AS finalizations,
|
||||
(SELECT count(*) FROM piece_usage_history WHERE show_id = 'show-october') AS history,
|
||||
(SELECT count(*) FROM show_shares WHERE id = 'upgrade-share') AS shares,
|
||||
(SELECT count(*) FROM show_share_sessions WHERE token_hash = 'upgrade-session-hash') AS sessions`
|
||||
)
|
||||
.get()
|
||||
).toEqual({ finalizations: 1, history: 1, shares: 1, sessions: 1 });
|
||||
expect(upgraded.pragma('foreign_key_check')).toEqual([]);
|
||||
upgraded.close();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,134 @@
|
||||
import { execFileSync } from 'node:child_process';
|
||||
import { mkdtempSync, rmSync } from 'node:fs';
|
||||
import { tmpdir } from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { closeDatabase, getDatabase } from './database.js';
|
||||
import {
|
||||
discardFeedEntries,
|
||||
fetchDueFeeds,
|
||||
fetchFeed,
|
||||
importFeedEntries,
|
||||
listFeedEntries,
|
||||
saveFeedSource
|
||||
} from './feeds.js';
|
||||
import { getPiece } from './content.js';
|
||||
|
||||
vi.mock('node:dns/promises', () => ({
|
||||
lookup: vi.fn(async () => [{ address: '93.184.216.34', family: 4 }])
|
||||
}));
|
||||
|
||||
const validFeed = `<?xml version="1.0"?><rss version="2.0"><channel><title>Test</title><item>
|
||||
<guid>entry-1</guid><title>Ein Beitrag</title><link>https://example.org/post</link>
|
||||
<description><![CDATA[<p>Kurz <strong>und</strong> gut.</p><script>evil()</script>]]></description>
|
||||
<pubDate>Sat, 24 Oct 2026 12:00:00 GMT</pubDate></item></channel></rss>`;
|
||||
|
||||
let directory: string;
|
||||
|
||||
beforeEach(() => {
|
||||
directory = mkdtempSync(path.join(tmpdir(), 'sendewerk-feed-test-'));
|
||||
process.env.SENDEWERK_DB_PATH = path.join(directory, 'test.sqlite');
|
||||
process.env.SENDEWERK_UPLOAD_DIR = path.join(directory, 'uploads');
|
||||
execFileSync(process.execPath, ['scripts/migrate.mjs'], { cwd: process.cwd(), env: process.env });
|
||||
execFileSync(process.execPath, ['scripts/seed.mjs'], { cwd: process.cwd(), env: process.env });
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vi.unstubAllGlobals();
|
||||
closeDatabase();
|
||||
delete process.env.SENDEWERK_DB_PATH;
|
||||
delete process.env.SENDEWERK_UPLOAD_DIR;
|
||||
rmSync(directory, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
describe('RSS import inbox', () => {
|
||||
it('keeps one entry across fetches and preserves a discard decision', async () => {
|
||||
vi.stubGlobal(
|
||||
'fetch',
|
||||
vi.fn(
|
||||
async () => new Response(validFeed, { headers: { 'content-type': 'application/rss+xml' } })
|
||||
)
|
||||
);
|
||||
const feedId = saveFeedSource(null, {
|
||||
name: 'Feed',
|
||||
url: 'https://example.org/feed.xml',
|
||||
isEnabled: true,
|
||||
refreshIntervalMinutes: 60,
|
||||
defaultCategoryId: null
|
||||
});
|
||||
await fetchFeed(feedId);
|
||||
const [entry] = listFeedEntries();
|
||||
expect(entry.title).toBe('Ein Beitrag');
|
||||
expect(discardFeedEntries([entry.id])).toBe(1);
|
||||
await fetchFeed(feedId);
|
||||
expect(listFeedEntries()).toHaveLength(0);
|
||||
expect(listFeedEntries('discarded')).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('sanitizes foreign HTML and retains the original source on explicit import', async () => {
|
||||
vi.stubGlobal(
|
||||
'fetch',
|
||||
vi.fn(async () => new Response(validFeed))
|
||||
);
|
||||
const feedId = saveFeedSource(null, {
|
||||
name: 'Feed',
|
||||
url: 'https://example.org/feed.xml',
|
||||
isEnabled: true,
|
||||
refreshIntervalMinutes: 60,
|
||||
defaultCategoryId: 'cat-jc'
|
||||
});
|
||||
await fetchFeed(feedId);
|
||||
const [entry] = listFeedEntries();
|
||||
const [pieceId] = importFeedEntries([entry.id], []);
|
||||
const piece = getPiece(pieceId)!;
|
||||
expect(piece.summary).toContain('Kurz und gut.');
|
||||
expect(piece.summary).not.toContain('<script>');
|
||||
expect(piece.sources).toEqual([
|
||||
{ label: 'RSS: Originalbeitrag', url: 'https://example.org/post', timecodeSeconds: null }
|
||||
]);
|
||||
expect(piece.categoryIds).toEqual(['cat-jc']);
|
||||
});
|
||||
|
||||
it('isolates a broken feed while fetching other due feeds', async () => {
|
||||
vi.stubGlobal(
|
||||
'fetch',
|
||||
vi.fn(
|
||||
async (url: URL) => new Response(url.href.includes('broken') ? '<not-feed />' : validFeed)
|
||||
)
|
||||
);
|
||||
saveFeedSource(null, {
|
||||
name: 'A broken',
|
||||
url: 'https://example.org/broken.xml',
|
||||
isEnabled: true,
|
||||
refreshIntervalMinutes: 60,
|
||||
defaultCategoryId: null
|
||||
});
|
||||
saveFeedSource(null, {
|
||||
name: 'B valid',
|
||||
url: 'https://example.org/valid.xml',
|
||||
isEnabled: true,
|
||||
refreshIntervalMinutes: 60,
|
||||
defaultCategoryId: null
|
||||
});
|
||||
await fetchDueFeeds();
|
||||
expect(listFeedEntries()).toHaveLength(1);
|
||||
const errors = getDatabase()
|
||||
.prepare("SELECT count(*) AS count FROM feed_sources WHERE last_error <> ''")
|
||||
.get() as { count: number };
|
||||
expect(errors.count).toBe(1);
|
||||
});
|
||||
|
||||
it('blocks loopback targets before sending a request', async () => {
|
||||
const request = vi.fn();
|
||||
vi.stubGlobal('fetch', request);
|
||||
const feedId = saveFeedSource(null, {
|
||||
name: 'Local',
|
||||
url: 'http://127.0.0.1/feed.xml',
|
||||
isEnabled: false,
|
||||
refreshIntervalMinutes: 60,
|
||||
defaultCategoryId: null
|
||||
});
|
||||
await expect(fetchFeed(feedId)).rejects.toThrow('FEED_BLOCKED');
|
||||
expect(request).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,457 @@
|
||||
import { createHash, randomUUID } from 'node:crypto';
|
||||
import { lookup } from 'node:dns/promises';
|
||||
import { isIP } from 'node:net';
|
||||
import sanitizeHtml from 'sanitize-html';
|
||||
import { XMLParser } from 'fast-xml-parser';
|
||||
import { createPiece, getPiece, savePiece } from './content.js';
|
||||
import { getDatabase } from './database.js';
|
||||
|
||||
const MAX_FEED_BYTES = 2 * 1024 * 1024;
|
||||
const FETCH_TIMEOUT_MS = 8_000;
|
||||
const MAX_REDIRECTS = 3;
|
||||
|
||||
export type FeedSource = {
|
||||
id: string;
|
||||
name: string;
|
||||
url: string;
|
||||
isEnabled: boolean;
|
||||
refreshIntervalMinutes: number;
|
||||
defaultCategoryId: string | null;
|
||||
lastFetchedAtUtc: string | null;
|
||||
nextFetchAtUtc: string | null;
|
||||
lastError: string;
|
||||
};
|
||||
|
||||
export type FeedEntry = {
|
||||
id: string;
|
||||
feedId: string;
|
||||
feedName: string;
|
||||
title: string;
|
||||
url: string;
|
||||
summary: string;
|
||||
publishedAtUtc: string | null;
|
||||
status: 'new' | 'imported' | 'discarded';
|
||||
pieceId: string | null;
|
||||
defaultCategoryId: string | null;
|
||||
};
|
||||
|
||||
function clean(value: unknown, maximum: number) {
|
||||
return String(value ?? '')
|
||||
.trim()
|
||||
.slice(0, maximum);
|
||||
}
|
||||
|
||||
function validHttpUrl(value: string) {
|
||||
try {
|
||||
const url = new URL(value);
|
||||
return ['http:', 'https:'].includes(url.protocol) && !url.username && !url.password;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function privateIpv4(address: string) {
|
||||
const p = address.split('.').map(Number);
|
||||
return (
|
||||
p[0] === 0 ||
|
||||
p[0] === 10 ||
|
||||
p[0] === 127 ||
|
||||
(p[0] === 169 && p[1] === 254) ||
|
||||
(p[0] === 172 && p[1] >= 16 && p[1] <= 31) ||
|
||||
(p[0] === 192 && p[1] === 168) ||
|
||||
p[0] >= 224
|
||||
);
|
||||
}
|
||||
|
||||
function privateAddress(address: string) {
|
||||
if (isIP(address) === 4) return privateIpv4(address);
|
||||
const value = address.toLowerCase().split('%')[0];
|
||||
if (value === '::' || value === '::1' || value.startsWith('fc') || value.startsWith('fd'))
|
||||
return true;
|
||||
if (/^fe[89ab]/.test(value)) return true;
|
||||
const mapped = value.match(/^::ffff:(\d+\.\d+\.\d+\.\d+)$/)?.[1];
|
||||
return mapped ? privateIpv4(mapped) : false;
|
||||
}
|
||||
|
||||
async function assertPublic(url: URL) {
|
||||
if (!validHttpUrl(url.href) || (url.port && !['80', '443'].includes(url.port)))
|
||||
throw new Error('FEED_BLOCKED');
|
||||
const hostname = url.hostname.replace(/^\[|\]$/g, '');
|
||||
if (hostname === 'localhost' || hostname.endsWith('.localhost')) throw new Error('FEED_BLOCKED');
|
||||
const addresses = isIP(hostname)
|
||||
? [{ address: hostname }]
|
||||
: await lookup(hostname, { all: true, verbatim: true });
|
||||
if (!addresses.length || addresses.some((entry) => privateAddress(entry.address)))
|
||||
throw new Error('FEED_BLOCKED');
|
||||
}
|
||||
|
||||
async function fetchXml(
|
||||
input: string,
|
||||
headers: Record<string, string>,
|
||||
redirects = 0
|
||||
): Promise<{ xml: string; etag: string; lastModified: string; unchanged: boolean }> {
|
||||
const url = new URL(input);
|
||||
await assertPublic(url);
|
||||
const response = await fetch(url, {
|
||||
headers: {
|
||||
Accept: 'application/rss+xml, application/atom+xml, application/xml, text/xml',
|
||||
...headers
|
||||
},
|
||||
redirect: 'manual',
|
||||
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
|
||||
});
|
||||
if ([301, 302, 303, 307, 308].includes(response.status)) {
|
||||
if (redirects >= MAX_REDIRECTS) throw new Error('FEED_REDIRECT');
|
||||
const location = response.headers.get('location');
|
||||
if (!location) throw new Error('FEED_FETCH');
|
||||
return fetchXml(new URL(location, url).href, headers, redirects + 1);
|
||||
}
|
||||
if (response.status === 304)
|
||||
return {
|
||||
xml: '',
|
||||
etag: headers['If-None-Match'] ?? '',
|
||||
lastModified: headers['If-Modified-Since'] ?? '',
|
||||
unchanged: true
|
||||
};
|
||||
if (!response.ok) throw new Error(`FEED_HTTP_${response.status}`);
|
||||
const declared = Number(response.headers.get('content-length') ?? 0);
|
||||
if (declared > MAX_FEED_BYTES) throw new Error('FEED_TOO_LARGE');
|
||||
const buffer = Buffer.from(await response.arrayBuffer());
|
||||
if (buffer.length > MAX_FEED_BYTES) throw new Error('FEED_TOO_LARGE');
|
||||
return {
|
||||
xml: buffer.toString('utf8'),
|
||||
etag: response.headers.get('etag') ?? '',
|
||||
lastModified: response.headers.get('last-modified') ?? '',
|
||||
unchanged: false
|
||||
};
|
||||
}
|
||||
|
||||
function values<T>(value: T | T[] | undefined): T[] {
|
||||
return value === undefined ? [] : Array.isArray(value) ? value : [value];
|
||||
}
|
||||
|
||||
function textFrom(value: unknown): string {
|
||||
if (typeof value === 'string' || typeof value === 'number') return String(value);
|
||||
if (value && typeof value === 'object') {
|
||||
const record = value as Record<string, unknown>;
|
||||
return textFrom(record['#text'] ?? record.__cdata ?? '');
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
function entryLink(value: unknown) {
|
||||
for (const link of values(
|
||||
value as Record<string, unknown> | Record<string, unknown>[] | string | undefined
|
||||
)) {
|
||||
if (typeof link === 'string') return link;
|
||||
if (link && typeof link === 'object') {
|
||||
const href = clean((link as Record<string, unknown>)['@_href'], 2_000);
|
||||
const rel = clean((link as Record<string, unknown>)['@_rel'], 30);
|
||||
if (href && (!rel || rel === 'alternate')) return href;
|
||||
}
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
function parseDate(value: unknown) {
|
||||
const raw = textFrom(value);
|
||||
if (!raw) return null;
|
||||
const date = new Date(raw);
|
||||
return Number.isNaN(date.valueOf()) ? null : date.toISOString();
|
||||
}
|
||||
|
||||
function parseFeed(xml: string) {
|
||||
let document: Record<string, unknown>;
|
||||
try {
|
||||
document = new XMLParser({
|
||||
ignoreAttributes: false,
|
||||
processEntities: false,
|
||||
trimValues: true
|
||||
}).parse(xml) as Record<string, unknown>;
|
||||
} catch {
|
||||
throw new Error('INVALID_FEED');
|
||||
}
|
||||
const rssChannel = (document.rss as Record<string, unknown> | undefined)?.channel as
|
||||
Record<string, unknown> | undefined;
|
||||
const atom = document.feed as Record<string, unknown> | undefined;
|
||||
if (!rssChannel && !atom) throw new Error('INVALID_FEED');
|
||||
const rawEntries = values(
|
||||
(rssChannel?.item ?? atom?.entry) as
|
||||
Record<string, unknown> | Record<string, unknown>[] | undefined
|
||||
);
|
||||
return rawEntries.slice(0, 200).flatMap((entry) => {
|
||||
const title = clean(textFrom(entry.title), 300);
|
||||
const url = clean(entryLink(entry.link) || textFrom(entry.link), 2_000);
|
||||
if (!title || !validHttpUrl(url)) return [];
|
||||
const guid = clean(textFrom(entry.guid ?? entry.id), 2_000);
|
||||
const externalId = guid || createHash('sha256').update(url).digest('hex');
|
||||
const rawSummary = textFrom(entry.description ?? entry.summary ?? entry.content);
|
||||
const summary = clean(
|
||||
sanitizeHtml(rawSummary, { allowedTags: [], allowedAttributes: {} }),
|
||||
5_000
|
||||
);
|
||||
return [
|
||||
{
|
||||
externalId,
|
||||
title,
|
||||
url,
|
||||
summary,
|
||||
publishedAtUtc: parseDate(entry.pubDate ?? entry.published ?? entry.updated)
|
||||
}
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
export function listFeedSources(): FeedSource[] {
|
||||
return (
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`SELECT id, name, url, is_enabled, refresh_interval_minutes,
|
||||
default_category_id, last_fetched_at_utc, next_fetch_at_utc, last_error FROM feed_sources ORDER BY name`
|
||||
)
|
||||
.all() as Array<Record<string, unknown>>
|
||||
).map((row) => ({
|
||||
id: String(row.id),
|
||||
name: String(row.name),
|
||||
url: String(row.url),
|
||||
isEnabled: row.is_enabled === 1,
|
||||
refreshIntervalMinutes: Number(row.refresh_interval_minutes),
|
||||
defaultCategoryId: row.default_category_id ? String(row.default_category_id) : null,
|
||||
lastFetchedAtUtc: row.last_fetched_at_utc ? String(row.last_fetched_at_utc) : null,
|
||||
nextFetchAtUtc: row.next_fetch_at_utc ? String(row.next_fetch_at_utc) : null,
|
||||
lastError: String(row.last_error)
|
||||
}));
|
||||
}
|
||||
|
||||
export function saveFeedSource(
|
||||
id: string | null,
|
||||
input: {
|
||||
name: string;
|
||||
url: string;
|
||||
isEnabled: boolean;
|
||||
refreshIntervalMinutes: number;
|
||||
defaultCategoryId: string | null;
|
||||
}
|
||||
) {
|
||||
const name = clean(input.name, 120);
|
||||
const url = clean(input.url, 2_000);
|
||||
if (
|
||||
!name ||
|
||||
!validHttpUrl(url) ||
|
||||
!Number.isInteger(input.refreshIntervalMinutes) ||
|
||||
input.refreshIntervalMinutes < 15 ||
|
||||
input.refreshIntervalMinutes > 10080
|
||||
)
|
||||
throw new Error('INVALID_FEED');
|
||||
const database = getDatabase();
|
||||
if (
|
||||
input.defaultCategoryId &&
|
||||
!database.prepare('SELECT 1 FROM section_categories WHERE id = ?').get(input.defaultCategoryId)
|
||||
)
|
||||
throw new Error('INVALID_TAXONOMY');
|
||||
const now = new Date().toISOString();
|
||||
if (!id) {
|
||||
id = randomUUID();
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO feed_sources (id, name, url, is_enabled, refresh_interval_minutes,
|
||||
default_category_id, next_fetch_at_utc, created_at_utc, updated_at_utc) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
|
||||
)
|
||||
.run(
|
||||
id,
|
||||
name,
|
||||
url,
|
||||
input.isEnabled ? 1 : 0,
|
||||
input.refreshIntervalMinutes,
|
||||
input.defaultCategoryId,
|
||||
input.isEnabled ? now : null,
|
||||
now,
|
||||
now
|
||||
);
|
||||
} else {
|
||||
const result = database
|
||||
.prepare(
|
||||
`UPDATE feed_sources SET name = ?, url = ?, is_enabled = ?, refresh_interval_minutes = ?,
|
||||
default_category_id = ?, next_fetch_at_utc = CASE WHEN ? = 1 THEN COALESCE(next_fetch_at_utc, ?) ELSE NULL END,
|
||||
updated_at_utc = ? WHERE id = ?`
|
||||
)
|
||||
.run(
|
||||
name,
|
||||
url,
|
||||
input.isEnabled ? 1 : 0,
|
||||
input.refreshIntervalMinutes,
|
||||
input.defaultCategoryId,
|
||||
input.isEnabled ? 1 : 0,
|
||||
now,
|
||||
now,
|
||||
id
|
||||
);
|
||||
if (!result.changes) throw new Error('NOT_FOUND');
|
||||
}
|
||||
return id;
|
||||
}
|
||||
|
||||
export function deleteFeedSource(id: string) {
|
||||
if (!getDatabase().prepare('DELETE FROM feed_sources WHERE id = ?').run(id).changes)
|
||||
throw new Error('NOT_FOUND');
|
||||
}
|
||||
|
||||
export function listFeedEntries(status: 'new' | 'imported' | 'discarded' = 'new'): FeedEntry[] {
|
||||
return (
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`SELECT e.id, e.feed_id, f.name AS feed_name, e.title, e.url, e.summary,
|
||||
e.published_at_utc, e.status, e.piece_id, f.default_category_id FROM feed_entries e
|
||||
JOIN feed_sources f ON f.id = e.feed_id WHERE e.status = ? ORDER BY COALESCE(e.published_at_utc, e.first_seen_at_utc) DESC`
|
||||
)
|
||||
.all(status) as Array<Record<string, unknown>>
|
||||
).map((row) => ({
|
||||
id: String(row.id),
|
||||
feedId: String(row.feed_id),
|
||||
feedName: String(row.feed_name),
|
||||
title: String(row.title),
|
||||
url: String(row.url),
|
||||
summary: String(row.summary),
|
||||
publishedAtUtc: row.published_at_utc ? String(row.published_at_utc) : null,
|
||||
status: row.status as FeedEntry['status'],
|
||||
pieceId: row.piece_id ? String(row.piece_id) : null,
|
||||
defaultCategoryId: row.default_category_id ? String(row.default_category_id) : null
|
||||
}));
|
||||
}
|
||||
|
||||
export async function fetchFeed(feedId: string) {
|
||||
const database = getDatabase();
|
||||
const feed = database.prepare('SELECT * FROM feed_sources WHERE id = ?').get(feedId) as
|
||||
Record<string, unknown> | undefined;
|
||||
if (!feed) throw new Error('NOT_FOUND');
|
||||
const now = new Date();
|
||||
try {
|
||||
const response = await fetchXml(String(feed.url), {
|
||||
...(feed.etag ? { 'If-None-Match': String(feed.etag) } : {}),
|
||||
...(feed.last_modified ? { 'If-Modified-Since': String(feed.last_modified) } : {})
|
||||
});
|
||||
let inserted = 0;
|
||||
if (!response.unchanged) {
|
||||
const add =
|
||||
database.prepare(`INSERT INTO feed_entries (id, feed_id, external_id, title, url, summary,
|
||||
published_at_utc, first_seen_at_utc, updated_at_utc) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
ON CONFLICT(feed_id, external_id) DO UPDATE SET title = excluded.title, url = excluded.url,
|
||||
summary = excluded.summary, published_at_utc = excluded.published_at_utc, updated_at_utc = excluded.updated_at_utc`);
|
||||
for (const entry of parseFeed(response.xml)) {
|
||||
const existed = database
|
||||
.prepare('SELECT 1 FROM feed_entries WHERE feed_id = ? AND external_id = ?')
|
||||
.get(feedId, entry.externalId);
|
||||
add.run(
|
||||
randomUUID(),
|
||||
feedId,
|
||||
entry.externalId,
|
||||
entry.title,
|
||||
entry.url,
|
||||
entry.summary,
|
||||
entry.publishedAtUtc,
|
||||
now.toISOString(),
|
||||
now.toISOString()
|
||||
);
|
||||
if (!existed) inserted += 1;
|
||||
}
|
||||
}
|
||||
const next = new Date(
|
||||
now.getTime() + Number(feed.refresh_interval_minutes) * 60_000
|
||||
).toISOString();
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE feed_sources SET etag = ?, last_modified = ?, last_fetched_at_utc = ?,
|
||||
next_fetch_at_utc = ?, last_error = '', updated_at_utc = ? WHERE id = ?`
|
||||
)
|
||||
.run(
|
||||
response.etag,
|
||||
response.lastModified,
|
||||
now.toISOString(),
|
||||
next,
|
||||
now.toISOString(),
|
||||
feedId
|
||||
);
|
||||
return { inserted, unchanged: response.unchanged };
|
||||
} catch (cause) {
|
||||
const message = cause instanceof Error ? cause.message.slice(0, 500) : 'FEED_FETCH';
|
||||
const next = new Date(
|
||||
now.getTime() + Number(feed.refresh_interval_minutes) * 60_000
|
||||
).toISOString();
|
||||
database
|
||||
.prepare(
|
||||
'UPDATE feed_sources SET last_fetched_at_utc = ?, next_fetch_at_utc = ?, last_error = ?, updated_at_utc = ? WHERE id = ?'
|
||||
)
|
||||
.run(now.toISOString(), next, message, now.toISOString(), feedId);
|
||||
throw cause;
|
||||
}
|
||||
}
|
||||
|
||||
export async function fetchDueFeeds() {
|
||||
const rows = getDatabase()
|
||||
.prepare(
|
||||
`SELECT id FROM feed_sources WHERE is_enabled = 1
|
||||
AND (next_fetch_at_utc IS NULL OR next_fetch_at_utc <= ?) ORDER BY next_fetch_at_utc LIMIT 10`
|
||||
)
|
||||
.all(new Date().toISOString()) as { id: string }[];
|
||||
for (const row of rows) await fetchFeed(row.id).catch(() => undefined);
|
||||
}
|
||||
|
||||
export function importFeedEntries(entryIds: string[], categoryIds: string[]) {
|
||||
const database = getDatabase();
|
||||
const categories = [...new Set(categoryIds.filter(Boolean))];
|
||||
if (categories.length > 20) throw new Error('INVALID_TAXONOMY');
|
||||
for (const category of categories)
|
||||
if (!database.prepare('SELECT 1 FROM section_categories WHERE id = ?').get(category))
|
||||
throw new Error('INVALID_TAXONOMY');
|
||||
return database.transaction(() =>
|
||||
entryIds.map((entryId) => {
|
||||
const entry = database
|
||||
.prepare(
|
||||
`SELECT e.*, f.default_category_id FROM feed_entries e JOIN feed_sources f ON f.id = e.feed_id
|
||||
WHERE e.id = ? AND e.status = 'new'`
|
||||
)
|
||||
.get(entryId) as Record<string, unknown> | undefined;
|
||||
if (!entry) throw new Error('NOT_FOUND');
|
||||
const pieceId = createPiece('blank');
|
||||
const piece = getPiece(pieceId)!;
|
||||
const assigned = categories.length
|
||||
? categories
|
||||
: entry.default_category_id
|
||||
? [String(entry.default_category_id)]
|
||||
: [];
|
||||
savePiece(pieceId, piece.revision, {
|
||||
...piece,
|
||||
title: String(entry.title),
|
||||
summary: String(entry.summary),
|
||||
status: 'inbox',
|
||||
categoryIds: assigned,
|
||||
sources: [{ label: 'RSS: Originalbeitrag', url: String(entry.url), timecodeSeconds: null }]
|
||||
});
|
||||
database
|
||||
.prepare(
|
||||
"UPDATE feed_entries SET status = 'imported', piece_id = ?, updated_at_utc = ? WHERE id = ?"
|
||||
)
|
||||
.run(pieceId, new Date().toISOString(), entryId);
|
||||
return pieceId;
|
||||
})
|
||||
)();
|
||||
}
|
||||
|
||||
export function discardFeedEntries(entryIds: string[]) {
|
||||
const database = getDatabase();
|
||||
const update = database.prepare(
|
||||
"UPDATE feed_entries SET status = 'discarded', updated_at_utc = ? WHERE id = ? AND status = 'new'"
|
||||
);
|
||||
const now = new Date().toISOString();
|
||||
return database.transaction(() =>
|
||||
entryIds.reduce((count, id) => count + update.run(now, id).changes, 0)
|
||||
)();
|
||||
}
|
||||
|
||||
let schedulerStarted = false;
|
||||
export function startFeedScheduler() {
|
||||
if (schedulerStarted || process.env.NODE_ENV === 'test') return;
|
||||
schedulerStarted = true;
|
||||
void fetchDueFeeds();
|
||||
setInterval(() => void fetchDueFeeds(), 60_000).unref();
|
||||
}
|
||||
@@ -7,8 +7,9 @@ import { closeDatabase, getDatabase } from './database.js';
|
||||
import {
|
||||
completeCurrent,
|
||||
clearPresentationChannel,
|
||||
getPresentationChannelView,
|
||||
getLiveView,
|
||||
getPresentationChannelStatus,
|
||||
getPresentationChannelView,
|
||||
getPresentationMedia,
|
||||
getPresentationView,
|
||||
goBack,
|
||||
@@ -16,6 +17,7 @@ import {
|
||||
moveOpenUsage,
|
||||
presentationChannelAccess,
|
||||
presentUsage,
|
||||
resumeUsage,
|
||||
rotatePresentationChannelKey,
|
||||
selectUsage,
|
||||
skipCurrent,
|
||||
@@ -40,7 +42,7 @@ afterEach(() => {
|
||||
});
|
||||
|
||||
describe('live mode', () => {
|
||||
it('persists a frozen section countdown across usage changes and reloads', () => {
|
||||
it('keeps elapsed section time while applying an updated section plan', () => {
|
||||
getDatabase()
|
||||
.prepare(
|
||||
"UPDATE show_sections SET explicit_duration_seconds = 300 WHERE id = 'section-stories'"
|
||||
@@ -59,6 +61,11 @@ describe('live mode', () => {
|
||||
"UPDATE show_sections SET explicit_duration_seconds = 600 WHERE id = 'section-stories'"
|
||||
)
|
||||
.run();
|
||||
live = getLiveView('show-october', new Date('2026-10-23T18:01:40.000Z'));
|
||||
expect(live.sectionTimer).toMatchObject({
|
||||
plannedDurationSeconds: 600,
|
||||
elapsedSeconds: 100
|
||||
});
|
||||
completeCurrent(
|
||||
'show-october',
|
||||
'timer-next-piece',
|
||||
@@ -68,7 +75,7 @@ describe('live mode', () => {
|
||||
live = getLiveView('show-october', new Date('2026-10-23T18:04:00.000Z'));
|
||||
expect(live.current?.id).toBe('usage-effects');
|
||||
expect(live.sectionTimer).toMatchObject({
|
||||
plannedDurationSeconds: 300,
|
||||
plannedDurationSeconds: 600,
|
||||
elapsedSeconds: 240
|
||||
});
|
||||
completeCurrent(
|
||||
@@ -104,15 +111,58 @@ describe('live mode', () => {
|
||||
.find((usage) => usage.id === 'usage-console')?.status
|
||||
).toBe('done');
|
||||
|
||||
selectUsage('show-october', 'usage-console', 'return-to-completed', live.liveRevision);
|
||||
expect(() =>
|
||||
selectUsage('show-october', 'usage-console', 'return-to-completed', live.liveRevision)
|
||||
).toThrow('INVALID_STATUS');
|
||||
resumeUsage('show-october', 'usage-console', 'resume-completed', live.liveRevision);
|
||||
expect(getLiveView('show-october').current).toMatchObject({
|
||||
id: 'usage-console',
|
||||
status: 'current'
|
||||
});
|
||||
});
|
||||
|
||||
it('resumes a completed piece and its earlier section timer without resetting total time', () => {
|
||||
const database = getDatabase();
|
||||
database
|
||||
.prepare(
|
||||
"UPDATE show_sections SET explicit_duration_seconds = 300 WHERE id = 'section-stories'"
|
||||
)
|
||||
.run();
|
||||
database
|
||||
.prepare("UPDATE show_sections SET explicit_duration_seconds = 200 WHERE id = 'section-game'")
|
||||
.run();
|
||||
database
|
||||
.prepare(
|
||||
"UPDATE piece_usages SET show_section_id = 'section-game', position = 0 WHERE id = 'usage-effects'"
|
||||
)
|
||||
.run();
|
||||
const start = new Date('2026-10-23T18:00:00.000Z');
|
||||
startOrResumeLive('show-october', 'resume-start', 0, start);
|
||||
completeCurrent('show-october', 'resume-next', 1, new Date('2026-10-23T18:01:00.000Z'));
|
||||
let live = getLiveView('show-october', new Date('2026-10-23T18:01:30.000Z'));
|
||||
expect(live.current?.id).toBe('usage-effects');
|
||||
resumeUsage(
|
||||
'show-october',
|
||||
'usage-console',
|
||||
'resume-earlier',
|
||||
live.liveRevision,
|
||||
new Date('2026-10-23T18:01:30.000Z')
|
||||
);
|
||||
live = getLiveView('show-october', new Date('2026-10-23T18:02:00.000Z'));
|
||||
expect(live.current).toMatchObject({ id: 'usage-console', status: 'current' });
|
||||
expect(live.completedCount).toBe(0);
|
||||
expect(live.sectionTimer).toMatchObject({
|
||||
sectionId: 'section-stories',
|
||||
plannedDurationSeconds: 300,
|
||||
elapsedSeconds: 90
|
||||
});
|
||||
expect(live.totalTimer.elapsedSeconds).toBe(120);
|
||||
});
|
||||
|
||||
it('keeps one stable output channel until its key is explicitly rotated', () => {
|
||||
expect(getPresentationChannelStatus('show-october')).toBe('disconnected');
|
||||
const key = issuePresentationAccess('show-october');
|
||||
expect(getPresentationChannelStatus('show-october')).toBe('connected');
|
||||
expect(issuePresentationAccess('show-october')).toBe(key);
|
||||
expect(presentationChannelAccess('default', key)).toBe(true);
|
||||
expect(getPresentationChannelView('default')).toEqual({
|
||||
@@ -128,6 +178,7 @@ describe('live mode', () => {
|
||||
presentUsage('show-october', 'usage-console', 'present-channel', 1);
|
||||
expect(getPresentationChannelView('default')?.content).not.toBeNull();
|
||||
clearPresentationChannel();
|
||||
expect(getPresentationChannelStatus('show-october')).toBe('disconnected');
|
||||
expect(getPresentationChannelView('default')?.content).toBeNull();
|
||||
issuePresentationAccess('show-october');
|
||||
expect(getPresentationChannelView('default')?.content).toBeNull();
|
||||
@@ -239,6 +290,40 @@ describe('live mode', () => {
|
||||
expect(media).toBeNull();
|
||||
expect(await getPresentationMedia(token, 'unknown-image')).toBeNull();
|
||||
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`INSERT INTO usage_media_snapshots
|
||||
(id, usage_id, original_media_id, alt_text, position, is_presentation)
|
||||
VALUES ('presentation-snapshot', 'usage-console', 'presentation-image',
|
||||
'Konsole auf dem Tisch', 0, 1)`
|
||||
)
|
||||
.run();
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`UPDATE piece_usages SET presentation_mode_snapshot = 'text',
|
||||
presentation_image_only_snapshot = 1,
|
||||
presentation_image_url_snapshot = 'https://private.example.test/not-for-image-mode'
|
||||
WHERE id = 'usage-console'`
|
||||
)
|
||||
.run();
|
||||
presentUsage(
|
||||
'show-october',
|
||||
'usage-console',
|
||||
'present-image-only',
|
||||
getLiveView('show-october').liveRevision
|
||||
);
|
||||
expect(getPresentationView(token)?.content).toMatchObject({
|
||||
mode: 'image',
|
||||
imageUrl: '',
|
||||
images: [{ id: 'presentation-snapshot', altText: 'Konsole auf dem Tisch' }],
|
||||
sources: []
|
||||
});
|
||||
expect(await getPresentationMedia(token, 'presentation-snapshot')).toMatchObject({
|
||||
mimeType: 'image/png',
|
||||
byteSize: 10,
|
||||
altText: 'Konsole auf dem Tisch'
|
||||
});
|
||||
|
||||
const replacementToken = issuePresentationAccess('show-october');
|
||||
expect(replacementToken).toBe(token);
|
||||
expect(getPresentationView(token)?.content?.title).toBe(
|
||||
|
||||
+509
-29
@@ -11,6 +11,7 @@ import {
|
||||
movePieceUsage,
|
||||
type MovePieceUsageInput,
|
||||
type PieceUsage,
|
||||
type ShowStatus,
|
||||
type ShowSection
|
||||
} from './shows.js';
|
||||
|
||||
@@ -41,6 +42,7 @@ export type LiveUsage = PieceUsage & {
|
||||
introHtml: string;
|
||||
researchHtml: string;
|
||||
moderationHtml: string;
|
||||
interactionHtml: string;
|
||||
transitionHtml: string;
|
||||
};
|
||||
|
||||
@@ -55,7 +57,10 @@ export type LiveView = {
|
||||
totalDurationSeconds: number;
|
||||
};
|
||||
liveRevision: number;
|
||||
calculatedAtUtc: string;
|
||||
startedAtUtc: string | null;
|
||||
endedAtUtc: string | null;
|
||||
isPaused: boolean;
|
||||
updatedAtUtc: string;
|
||||
presentationUsageId: string | null;
|
||||
presentationRevision: number;
|
||||
@@ -72,6 +77,15 @@ export type LiveView = {
|
||||
elapsedSeconds: number;
|
||||
runningSinceUtc: string | null;
|
||||
};
|
||||
totalTimer: {
|
||||
elapsedSeconds: number;
|
||||
runningSinceUtc: string | null;
|
||||
};
|
||||
remainingEstimate: {
|
||||
seconds: number;
|
||||
activeCountdownSeconds: number;
|
||||
unplannedSectionCount: number;
|
||||
};
|
||||
};
|
||||
|
||||
export type PresentationView = {
|
||||
@@ -135,12 +149,13 @@ function orderedUsages(database: Database.Database, showId: string): OrderedUsag
|
||||
function usageBelongsToShow(database: Database.Database, showId: string, usageId: string) {
|
||||
const row = database
|
||||
.prepare(
|
||||
`SELECT s.is_reserve_bank FROM piece_usages u
|
||||
`SELECT s.is_reserve_bank, u.status FROM piece_usages u
|
||||
JOIN show_sections s ON s.id = u.show_section_id
|
||||
WHERE u.id = ? AND s.show_id = ?`
|
||||
)
|
||||
.get(usageId, showId) as { is_reserve_bank: number } | undefined;
|
||||
.get(usageId, showId) as { is_reserve_bank: number; status: string } | undefined;
|
||||
if (!row || row.is_reserve_bank) throw new Error('NOT_FOUND');
|
||||
return row;
|
||||
}
|
||||
|
||||
function closeActiveRun(database: Database.Database, showId: string, now: string) {
|
||||
@@ -152,6 +167,52 @@ function closeActiveRun(database: Database.Database, showId: string, now: string
|
||||
.run(now, showId);
|
||||
}
|
||||
|
||||
function closeShowTimerRun(database: Database.Database, showId: string, now: string) {
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE live_show_timer_runs SET ended_at_utc = ?
|
||||
WHERE show_id = ? AND ended_at_utc IS NULL`
|
||||
)
|
||||
.run(now, showId);
|
||||
}
|
||||
|
||||
function openShowTimerRun(database: Database.Database, showId: string, now: string) {
|
||||
const active = database
|
||||
.prepare('SELECT 1 FROM live_show_timer_runs WHERE show_id = ? AND ended_at_utc IS NULL')
|
||||
.get(showId);
|
||||
if (!active) {
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO live_show_timer_runs (id, show_id, started_at_utc)
|
||||
VALUES (?, ?, ?)`
|
||||
)
|
||||
.run(randomUUID(), showId, now);
|
||||
}
|
||||
}
|
||||
|
||||
function showTimerRunning(database: Database.Database, showId: string) {
|
||||
return Boolean(
|
||||
database
|
||||
.prepare('SELECT 1 FROM live_show_timer_runs WHERE show_id = ? AND ended_at_utc IS NULL')
|
||||
.get(showId)
|
||||
);
|
||||
}
|
||||
|
||||
function elapsedRuns(runs: { started_at_utc: string; ended_at_utc: string | null }[], now: string) {
|
||||
return runs.reduce(
|
||||
(total, run) =>
|
||||
total +
|
||||
Math.max(
|
||||
0,
|
||||
Math.floor(
|
||||
(new Date(run.ended_at_utc ?? now).getTime() - new Date(run.started_at_utc).getTime()) /
|
||||
1_000
|
||||
)
|
||||
),
|
||||
0
|
||||
);
|
||||
}
|
||||
|
||||
function closeSectionTimer(database: Database.Database, showId: string, now: string) {
|
||||
const timer = database
|
||||
.prepare('SELECT id FROM live_section_timers WHERE show_id = ? AND ended_at_utc IS NULL')
|
||||
@@ -167,6 +228,24 @@ function closeSectionTimer(database: Database.Database, showId: string, now: str
|
||||
.run(now, timer.id);
|
||||
}
|
||||
|
||||
function resumeSectionTimerRun(database: Database.Database, showId: string, now: string) {
|
||||
const timer = database
|
||||
.prepare('SELECT id FROM live_section_timers WHERE show_id = ? AND ended_at_utc IS NULL')
|
||||
.get(showId) as { id: string } | undefined;
|
||||
if (!timer) return;
|
||||
const running = database
|
||||
.prepare('SELECT 1 FROM live_section_timer_runs WHERE timer_id = ? AND ended_at_utc IS NULL')
|
||||
.get(timer.id);
|
||||
if (!running) {
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO live_section_timer_runs (id, timer_id, started_at_utc)
|
||||
VALUES (?, ?, ?)`
|
||||
)
|
||||
.run(randomUUID(), timer.id, now);
|
||||
}
|
||||
}
|
||||
|
||||
function syncSectionTimer(
|
||||
database: Database.Database,
|
||||
showId: string,
|
||||
@@ -183,12 +262,46 @@ function syncSectionTimer(
|
||||
if (!section) throw new Error('NOT_FOUND');
|
||||
const active = database
|
||||
.prepare(
|
||||
'SELECT id, section_id FROM live_section_timers WHERE show_id = ? AND ended_at_utc IS NULL'
|
||||
`SELECT id, section_id, planned_duration_seconds
|
||||
FROM live_section_timers WHERE show_id = ? AND ended_at_utc IS NULL`
|
||||
)
|
||||
.get(showId) as { id: string; section_id: string } | undefined;
|
||||
if (active?.section_id === section.id) return;
|
||||
.get(showId) as
|
||||
{ id: string; section_id: string; planned_duration_seconds: number } | undefined;
|
||||
if (active?.section_id === section.id) {
|
||||
if (!section.explicit_duration_seconds || section.explicit_duration_seconds <= 0) {
|
||||
closeSectionTimer(database, showId, now);
|
||||
} else if (active.planned_duration_seconds !== section.explicit_duration_seconds) {
|
||||
database
|
||||
.prepare('UPDATE live_section_timers SET planned_duration_seconds = ? WHERE id = ?')
|
||||
.run(section.explicit_duration_seconds, active.id);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (active) closeSectionTimer(database, showId, now);
|
||||
if (!section.explicit_duration_seconds || section.explicit_duration_seconds <= 0) return;
|
||||
const previous = database
|
||||
.prepare(
|
||||
`SELECT id FROM live_section_timers WHERE show_id = ? AND section_id = ?
|
||||
ORDER BY started_at_utc DESC LIMIT 1`
|
||||
)
|
||||
.get(showId, section.id) as { id: string } | undefined;
|
||||
if (previous) {
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE live_section_timers SET planned_duration_seconds = ?, ended_at_utc = NULL
|
||||
WHERE id = ?`
|
||||
)
|
||||
.run(section.explicit_duration_seconds, previous.id);
|
||||
if (showTimerRunning(database, showId)) {
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO live_section_timer_runs (id, timer_id, started_at_utc)
|
||||
VALUES (?, ?, ?)`
|
||||
)
|
||||
.run(randomUUID(), previous.id, now);
|
||||
}
|
||||
return;
|
||||
}
|
||||
const timerId = randomUUID();
|
||||
database
|
||||
.prepare(
|
||||
@@ -197,6 +310,7 @@ function syncSectionTimer(
|
||||
VALUES (?, ?, ?, ?, ?)`
|
||||
)
|
||||
.run(timerId, showId, section.id, section.explicit_duration_seconds, now);
|
||||
if (showTimerRunning(database, showId)) {
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO live_section_timer_runs (id, timer_id, started_at_utc)
|
||||
@@ -204,6 +318,7 @@ function syncSectionTimer(
|
||||
)
|
||||
.run(randomUUID(), timerId, now);
|
||||
}
|
||||
}
|
||||
|
||||
function activateUsage(database: Database.Database, showId: string, usageId: string, now: string) {
|
||||
usageBelongsToShow(database, showId, usageId);
|
||||
@@ -237,7 +352,8 @@ function executeCommand(
|
||||
expectedRevision: number,
|
||||
action: string,
|
||||
operation: (database: Database.Database, state: LiveStateRow, now: string) => void,
|
||||
nowValue?: Date
|
||||
nowValue?: Date,
|
||||
allowCompleted = false
|
||||
) {
|
||||
requireCommandId(commandId);
|
||||
const database = getDatabase();
|
||||
@@ -251,7 +367,10 @@ function executeCommand(
|
||||
const show = database.prepare('SELECT status FROM shows WHERE id = ?').get(showId) as {
|
||||
status: string;
|
||||
};
|
||||
if (show.status === 'completed') throw new Error('SHOW_COMPLETED');
|
||||
if (database.prepare('SELECT 1 FROM show_finalizations WHERE show_id = ?').get(showId)) {
|
||||
throw new Error('SHOW_COMPLETED');
|
||||
}
|
||||
if (show.status === 'completed' && !allowCompleted) throw new Error('SHOW_COMPLETED');
|
||||
if (state.revision !== expectedRevision) throw new Error('CONFLICT');
|
||||
operation(database, state, now);
|
||||
const updated = database
|
||||
@@ -307,6 +426,7 @@ function liveUsage(
|
||||
introHtml: renderMarkdown(usage.intro),
|
||||
researchHtml: renderMarkdown(usage.research),
|
||||
moderationHtml: renderMarkdown(usage.moderation),
|
||||
interactionHtml: renderMarkdown(usage.interaction),
|
||||
transitionHtml: renderMarkdown(usage.transition)
|
||||
};
|
||||
}
|
||||
@@ -317,6 +437,9 @@ export function getLiveView(showId: string, nowValue?: Date): LiveView {
|
||||
const state = ensureLiveState(database, showId, now);
|
||||
const show = getShow(showId);
|
||||
if (!show) throw new Error('NOT_FOUND');
|
||||
if (state.started_at_utc && !state.ended_at_utc && state.current_usage_id) {
|
||||
syncSectionTimer(database, showId, state.current_usage_id, now);
|
||||
}
|
||||
const durations = actualDurations(database, showId, now);
|
||||
const sections = show.sections.map((section) => ({
|
||||
...section,
|
||||
@@ -351,18 +474,7 @@ export function getLiveView(showId: string, nowValue?: Date): LiveView {
|
||||
)
|
||||
.all(timer.id) as { started_at_utc: string; ended_at_utc: string | null }[];
|
||||
const running = runs.find((run) => run.ended_at_utc === null) ?? null;
|
||||
const elapsedSeconds = runs.reduce(
|
||||
(total, run) =>
|
||||
total +
|
||||
Math.max(
|
||||
0,
|
||||
Math.floor(
|
||||
(new Date(run.ended_at_utc ?? now).getTime() - new Date(run.started_at_utc).getTime()) /
|
||||
1_000
|
||||
)
|
||||
),
|
||||
0
|
||||
);
|
||||
const elapsedSeconds = elapsedRuns(runs, now);
|
||||
sectionTimer = {
|
||||
sectionId: timer.section_id,
|
||||
sectionName: timer.section_name,
|
||||
@@ -371,6 +483,50 @@ export function getLiveView(showId: string, nowValue?: Date): LiveView {
|
||||
runningSinceUtc: running?.started_at_utc ?? null
|
||||
};
|
||||
}
|
||||
const totalTimerRuns = database
|
||||
.prepare(
|
||||
`SELECT started_at_utc, ended_at_utc FROM live_show_timer_runs
|
||||
WHERE show_id = ? ORDER BY started_at_utc`
|
||||
)
|
||||
.all(showId) as { started_at_utc: string; ended_at_utc: string | null }[];
|
||||
const runningTotalTimer = totalTimerRuns.find((run) => run.ended_at_utc === null) ?? null;
|
||||
const totalElapsedSeconds = elapsedRuns(totalTimerRuns, now);
|
||||
const remainingAnchor = current ?? next;
|
||||
let reachedRemaining = !remainingAnchor;
|
||||
let remainingSeconds = 0;
|
||||
let activeCountdownSeconds = 0;
|
||||
let unplannedSectionCount = 0;
|
||||
for (const section of sections) {
|
||||
if (section.id === remainingAnchor?.sectionId) reachedRemaining = true;
|
||||
if (!reachedRemaining) continue;
|
||||
const remainingUsages = section.usages.filter(
|
||||
(usage) => usage.status === 'open' || usage.status === 'current'
|
||||
);
|
||||
if (remainingUsages.length === 0) continue;
|
||||
|
||||
if (section.id === current?.sectionId) {
|
||||
if (section.durationSeconds > 0 && sectionTimer?.sectionId === section.id) {
|
||||
activeCountdownSeconds = Math.max(0, section.durationSeconds - sectionTimer.elapsedSeconds);
|
||||
remainingSeconds += activeCountdownSeconds;
|
||||
} else {
|
||||
remainingSeconds += remainingUsages.reduce((total, usage) => {
|
||||
const elapsed = usage.id === current?.id ? usage.actualDurationSeconds : 0;
|
||||
const remainder = Math.max(0, usage.durationSeconds - elapsed);
|
||||
if (usage.id === current?.id) activeCountdownSeconds = remainder;
|
||||
return total + remainder;
|
||||
}, 0);
|
||||
if (section.durationSeconds <= 0) unplannedSectionCount += 1;
|
||||
}
|
||||
} else if (section.durationSeconds > 0) {
|
||||
remainingSeconds += section.durationSeconds;
|
||||
} else {
|
||||
remainingSeconds += remainingUsages.reduce(
|
||||
(total, usage) => total + usage.durationSeconds,
|
||||
0
|
||||
);
|
||||
unplannedSectionCount += 1;
|
||||
}
|
||||
}
|
||||
return {
|
||||
show: {
|
||||
id: show.id,
|
||||
@@ -380,7 +536,10 @@ export function getLiveView(showId: string, nowValue?: Date): LiveView {
|
||||
totalDurationSeconds: show.totalDurationSeconds
|
||||
},
|
||||
liveRevision: state.revision,
|
||||
calculatedAtUtc: now,
|
||||
startedAtUtc: state.started_at_utc,
|
||||
endedAtUtc: state.ended_at_utc,
|
||||
isPaused: Boolean(state.started_at_utc && !state.ended_at_utc && !runningTotalTimer),
|
||||
updatedAtUtc: state.updated_at_utc,
|
||||
presentationUsageId: state.presentation_usage_id,
|
||||
presentationRevision: state.presentation_revision,
|
||||
@@ -391,7 +550,16 @@ export function getLiveView(showId: string, nowValue?: Date): LiveView {
|
||||
completedCount: usages.filter((usage) => usage.status === 'done' || usage.status === 'skipped')
|
||||
.length,
|
||||
totalCount: usages.length,
|
||||
sectionTimer
|
||||
sectionTimer,
|
||||
totalTimer: {
|
||||
elapsedSeconds: totalElapsedSeconds,
|
||||
runningSinceUtc: runningTotalTimer?.started_at_utc ?? null
|
||||
},
|
||||
remainingEstimate: {
|
||||
seconds: remainingSeconds,
|
||||
activeCountdownSeconds,
|
||||
unplannedSectionCount
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -409,7 +577,7 @@ export function startOrResumeLive(
|
||||
(database, state, now) => {
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE shows SET status = 'live', updated_at_utc = ?
|
||||
`UPDATE shows SET status = 'live', revision = revision + 1, updated_at_utc = ?
|
||||
WHERE id = ? AND status != 'completed'`
|
||||
)
|
||||
.run(now, showId);
|
||||
@@ -419,10 +587,14 @@ export function startOrResumeLive(
|
||||
WHERE show_id = ?`
|
||||
)
|
||||
.run(now, showId);
|
||||
openShowTimerRun(database, showId, now);
|
||||
const activeRun = database
|
||||
.prepare('SELECT 1 FROM live_usage_runs WHERE show_id = ? AND ended_at_utc IS NULL')
|
||||
.get(showId);
|
||||
if (state.current_usage_id && activeRun) return;
|
||||
if (state.current_usage_id && activeRun) {
|
||||
resumeSectionTimerRun(database, showId, now);
|
||||
return;
|
||||
}
|
||||
const current = state.current_usage_id
|
||||
? orderedUsages(database, showId).find((usage) => usage.id === state.current_usage_id)
|
||||
: undefined;
|
||||
@@ -434,6 +606,267 @@ export function startOrResumeLive(
|
||||
);
|
||||
}
|
||||
|
||||
export function pauseLive(
|
||||
showId: string,
|
||||
commandId: string,
|
||||
expectedRevision: number,
|
||||
nowValue?: Date
|
||||
) {
|
||||
return executeCommand(
|
||||
showId,
|
||||
commandId,
|
||||
expectedRevision,
|
||||
'pause',
|
||||
(database, state, now) => {
|
||||
if (!state.started_at_utc || state.ended_at_utc) throw new Error('NOT_LIVE');
|
||||
if (!showTimerRunning(database, showId)) throw new Error('ALREADY_PAUSED');
|
||||
closeShowTimerRun(database, showId, now);
|
||||
closeActiveRun(database, showId, now);
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE live_section_timer_runs SET ended_at_utc = ?
|
||||
WHERE timer_id IN (
|
||||
SELECT id FROM live_section_timers WHERE show_id = ? AND ended_at_utc IS NULL
|
||||
) AND ended_at_utc IS NULL`
|
||||
)
|
||||
.run(now, showId);
|
||||
},
|
||||
nowValue
|
||||
);
|
||||
}
|
||||
|
||||
export function resumeLive(
|
||||
showId: string,
|
||||
commandId: string,
|
||||
expectedRevision: number,
|
||||
nowValue?: Date
|
||||
) {
|
||||
return executeCommand(
|
||||
showId,
|
||||
commandId,
|
||||
expectedRevision,
|
||||
'resume',
|
||||
(database, state, now) => {
|
||||
if (!state.started_at_utc || state.ended_at_utc) throw new Error('NOT_LIVE');
|
||||
if (showTimerRunning(database, showId)) throw new Error('ALREADY_RUNNING');
|
||||
openShowTimerRun(database, showId, now);
|
||||
if (state.current_usage_id) {
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO live_usage_runs (id, show_id, usage_id, started_at_utc)
|
||||
VALUES (?, ?, ?, ?)`
|
||||
)
|
||||
.run(randomUUID(), showId, state.current_usage_id, now);
|
||||
}
|
||||
resumeSectionTimerRun(database, showId, now);
|
||||
},
|
||||
nowValue
|
||||
);
|
||||
}
|
||||
|
||||
export function resetSectionTimer(
|
||||
showId: string,
|
||||
commandId: string,
|
||||
expectedRevision: number,
|
||||
nowValue?: Date
|
||||
) {
|
||||
return executeCommand(
|
||||
showId,
|
||||
commandId,
|
||||
expectedRevision,
|
||||
'reset-section-timer',
|
||||
(database, _state, now) => {
|
||||
const timer = database
|
||||
.prepare(
|
||||
`SELECT section_id, planned_duration_seconds
|
||||
FROM live_section_timers WHERE show_id = ? AND ended_at_utc IS NULL`
|
||||
)
|
||||
.get(showId) as { section_id: string; planned_duration_seconds: number } | undefined;
|
||||
if (!timer) throw new Error('NO_SECTION_TIMER');
|
||||
const running = showTimerRunning(database, showId);
|
||||
closeSectionTimer(database, showId, now);
|
||||
const timerId = randomUUID();
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO live_section_timers
|
||||
(id, show_id, section_id, planned_duration_seconds, started_at_utc)
|
||||
VALUES (?, ?, ?, ?, ?)`
|
||||
)
|
||||
.run(timerId, showId, timer.section_id, timer.planned_duration_seconds, now);
|
||||
if (running) {
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO live_section_timer_runs (id, timer_id, started_at_utc)
|
||||
VALUES (?, ?, ?)`
|
||||
)
|
||||
.run(randomUUID(), timerId, now);
|
||||
}
|
||||
},
|
||||
nowValue
|
||||
);
|
||||
}
|
||||
|
||||
export function resetTotalTimer(
|
||||
showId: string,
|
||||
commandId: string,
|
||||
expectedRevision: number,
|
||||
nowValue?: Date
|
||||
) {
|
||||
return executeCommand(
|
||||
showId,
|
||||
commandId,
|
||||
expectedRevision,
|
||||
'reset-total-timer',
|
||||
(database, state, now) => {
|
||||
if (!state.started_at_utc || state.ended_at_utc) throw new Error('NOT_LIVE');
|
||||
const running = showTimerRunning(database, showId);
|
||||
database.prepare('DELETE FROM live_show_timer_runs WHERE show_id = ?').run(showId);
|
||||
if (running) openShowTimerRun(database, showId, now);
|
||||
},
|
||||
nowValue
|
||||
);
|
||||
}
|
||||
|
||||
export function setShowStatus(
|
||||
showId: string,
|
||||
commandId: string,
|
||||
expectedRevision: number,
|
||||
expectedShowRevision: number,
|
||||
status: Extract<ShowStatus, 'draft' | 'ready'>,
|
||||
nowValue?: Date
|
||||
) {
|
||||
return executeCommand(
|
||||
showId,
|
||||
commandId,
|
||||
expectedRevision,
|
||||
`status-${status}`,
|
||||
(database, state, now) => {
|
||||
if (state.started_at_utc) throw new Error('ALREADY_STARTED');
|
||||
const result = database
|
||||
.prepare(
|
||||
'UPDATE shows SET status = ?, revision = revision + 1, updated_at_utc = ? WHERE id = ? AND revision = ?'
|
||||
)
|
||||
.run(status, now, showId, expectedShowRevision);
|
||||
if (result.changes !== 1) throw new Error('CONFLICT');
|
||||
},
|
||||
nowValue
|
||||
);
|
||||
}
|
||||
|
||||
export function endLive(
|
||||
showId: string,
|
||||
commandId: string,
|
||||
expectedRevision: number,
|
||||
nowValue?: Date
|
||||
) {
|
||||
return executeCommand(
|
||||
showId,
|
||||
commandId,
|
||||
expectedRevision,
|
||||
'end',
|
||||
(database, state, now) => {
|
||||
if (!state.started_at_utc || state.ended_at_utc) throw new Error('NOT_LIVE');
|
||||
closeShowTimerRun(database, showId, now);
|
||||
closeActiveRun(database, showId, now);
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE live_section_timer_runs SET ended_at_utc = ?
|
||||
WHERE timer_id IN (
|
||||
SELECT id FROM live_section_timers WHERE show_id = ? AND ended_at_utc IS NULL
|
||||
) AND ended_at_utc IS NULL`
|
||||
)
|
||||
.run(now, showId);
|
||||
database
|
||||
.prepare(`UPDATE show_live_states SET ended_at_utc = ? WHERE show_id = ?`)
|
||||
.run(now, showId);
|
||||
database
|
||||
.prepare(`UPDATE shows SET revision = revision + 1, updated_at_utc = ? WHERE id = ?`)
|
||||
.run(now, showId);
|
||||
},
|
||||
nowValue
|
||||
);
|
||||
}
|
||||
|
||||
export function resumeEndedLive(
|
||||
showId: string,
|
||||
commandId: string,
|
||||
expectedRevision: number,
|
||||
nowValue?: Date
|
||||
) {
|
||||
return executeCommand(
|
||||
showId,
|
||||
commandId,
|
||||
expectedRevision,
|
||||
'resume-ended',
|
||||
(database, state, now) => {
|
||||
if (!state.ended_at_utc) throw new Error('NOT_ENDED');
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE shows SET status = 'live', revision = revision + 1, updated_at_utc = ? WHERE id = ?`
|
||||
)
|
||||
.run(now, showId);
|
||||
database
|
||||
.prepare('UPDATE show_live_states SET ended_at_utc = NULL WHERE show_id = ?')
|
||||
.run(showId);
|
||||
openShowTimerRun(database, showId, now);
|
||||
if (state.current_usage_id) {
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO live_usage_runs (id, show_id, usage_id, started_at_utc)
|
||||
VALUES (?, ?, ?, ?)`
|
||||
)
|
||||
.run(randomUUID(), showId, state.current_usage_id, now);
|
||||
resumeSectionTimerRun(database, showId, now);
|
||||
}
|
||||
},
|
||||
nowValue,
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
export function startNewLiveRun(
|
||||
showId: string,
|
||||
commandId: string,
|
||||
expectedRevision: number,
|
||||
nowValue?: Date
|
||||
) {
|
||||
return executeCommand(
|
||||
showId,
|
||||
commandId,
|
||||
expectedRevision,
|
||||
'start-new-run',
|
||||
(database, state, now) => {
|
||||
if (!state.ended_at_utc) throw new Error('NOT_ENDED');
|
||||
database.prepare('DELETE FROM live_usage_runs WHERE show_id = ?').run(showId);
|
||||
database.prepare('DELETE FROM live_show_timer_runs WHERE show_id = ?').run(showId);
|
||||
database.prepare('DELETE FROM live_section_timers WHERE show_id = ?').run(showId);
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE piece_usages SET status = 'open'
|
||||
WHERE show_section_id IN (SELECT id FROM show_sections WHERE show_id = ?)`
|
||||
)
|
||||
.run(showId);
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE show_live_states
|
||||
SET current_usage_id = NULL, started_at_utc = ?, ended_at_utc = NULL
|
||||
WHERE show_id = ?`
|
||||
)
|
||||
.run(now, showId);
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE shows SET status = 'live', revision = revision + 1, updated_at_utc = ? WHERE id = ?`
|
||||
)
|
||||
.run(now, showId);
|
||||
openShowTimerRun(database, showId, now);
|
||||
const target = orderedUsages(database, showId).find((usage) => usage.status === 'open');
|
||||
if (target) activateUsage(database, showId, target.id, now);
|
||||
},
|
||||
nowValue,
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
function advanceCurrent(
|
||||
showId: string,
|
||||
commandId: string,
|
||||
@@ -447,6 +880,7 @@ function advanceCurrent(
|
||||
expectedRevision,
|
||||
status,
|
||||
(database, state, now) => {
|
||||
if (!showTimerRunning(database, showId)) throw new Error('TIMER_PAUSED');
|
||||
if (!state.current_usage_id) throw new Error('NO_CURRENT');
|
||||
const ordered = orderedUsages(database, showId);
|
||||
const currentIndex = ordered.findIndex((usage) => usage.id === state.current_usage_id);
|
||||
@@ -498,6 +932,7 @@ export function goBack(
|
||||
expectedRevision,
|
||||
'back',
|
||||
(database, state, now) => {
|
||||
if (!showTimerRunning(database, showId)) throw new Error('TIMER_PAUSED');
|
||||
const ordered = orderedUsages(database, showId);
|
||||
const currentIndex = state.current_usage_id
|
||||
? ordered.findIndex((usage) => usage.id === state.current_usage_id)
|
||||
@@ -533,7 +968,9 @@ export function selectUsage(
|
||||
'select',
|
||||
(database, state, now) => {
|
||||
if (!state.started_at_utc) throw new Error('NOT_STARTED');
|
||||
usageBelongsToShow(database, showId, usageId);
|
||||
if (!showTimerRunning(database, showId)) throw new Error('TIMER_PAUSED');
|
||||
const target = usageBelongsToShow(database, showId, usageId);
|
||||
if (target.status !== 'open') throw new Error('INVALID_STATUS');
|
||||
if (state.current_usage_id === usageId) return;
|
||||
if (state.current_usage_id) {
|
||||
closeActiveRun(database, showId, now);
|
||||
@@ -547,6 +984,36 @@ export function selectUsage(
|
||||
);
|
||||
}
|
||||
|
||||
export function resumeUsage(
|
||||
showId: string,
|
||||
usageId: string,
|
||||
commandId: string,
|
||||
expectedRevision: number,
|
||||
nowValue?: Date
|
||||
) {
|
||||
return executeCommand(
|
||||
showId,
|
||||
commandId,
|
||||
expectedRevision,
|
||||
'resume-usage',
|
||||
(database, state, now) => {
|
||||
if (!state.started_at_utc || state.ended_at_utc) throw new Error('NOT_LIVE');
|
||||
if (!showTimerRunning(database, showId)) throw new Error('TIMER_PAUSED');
|
||||
const target = usageBelongsToShow(database, showId, usageId);
|
||||
if (target.status !== 'done' && target.status !== 'skipped')
|
||||
throw new Error('INVALID_STATUS');
|
||||
if (state.current_usage_id) {
|
||||
closeActiveRun(database, showId, now);
|
||||
database
|
||||
.prepare("UPDATE piece_usages SET status = 'open' WHERE id = ?")
|
||||
.run(state.current_usage_id);
|
||||
}
|
||||
activateUsage(database, showId, usageId, now);
|
||||
},
|
||||
nowValue
|
||||
);
|
||||
}
|
||||
|
||||
export function presentUsage(
|
||||
showId: string,
|
||||
usageId: string | null,
|
||||
@@ -691,6 +1158,14 @@ export function presentationChannelAccess(channelId: string, accessKey: string)
|
||||
);
|
||||
}
|
||||
|
||||
export function getPresentationChannelStatus(showId: string) {
|
||||
const channel = getDatabase()
|
||||
.prepare("SELECT show_id FROM presentation_channels WHERE id = 'default'")
|
||||
.get() as { show_id: string | null } | undefined;
|
||||
if (!channel?.show_id) return 'disconnected' as const;
|
||||
return channel.show_id === showId ? ('connected' as const) : ('other_show' as const);
|
||||
}
|
||||
|
||||
function presentationShowId(database: Database.Database, token: string) {
|
||||
if (!token || token.length > 200) return null;
|
||||
const channel = database
|
||||
@@ -730,7 +1205,8 @@ function getPresentationViewForShow(showId: string): PresentationView {
|
||||
const usage = database
|
||||
.prepare(
|
||||
`SELECT u.title_snapshot, u.output_title_snapshot, u.presentation_snapshot,
|
||||
u.presentation_mode_snapshot, u.presentation_source_label_snapshot,
|
||||
CASE WHEN u.presentation_image_only_snapshot = 1 THEN 'image' ELSE u.presentation_mode_snapshot END AS presentation_mode_snapshot,
|
||||
u.presentation_source_label_snapshot,
|
||||
u.presentation_source_url_snapshot, u.presentation_source_timecode_snapshot,
|
||||
u.presentation_title_meta_snapshot, u.presentation_description_snapshot,
|
||||
u.presentation_image_url_snapshot, u.presentation_site_name_snapshot,
|
||||
@@ -756,10 +1232,11 @@ function getPresentationViewForShow(showId: string): PresentationView {
|
||||
}
|
||||
| undefined;
|
||||
if (!usage) return { revision: state.presentation_revision, content: null };
|
||||
const mode = usage.presentation_mode_snapshot;
|
||||
return {
|
||||
revision: state.presentation_revision,
|
||||
content: {
|
||||
mode: usage.presentation_mode_snapshot,
|
||||
mode,
|
||||
topics: (
|
||||
database
|
||||
.prepare('SELECT name FROM usage_topic_snapshots WHERE usage_id = ? ORDER BY position')
|
||||
@@ -776,7 +1253,7 @@ function getPresentationViewForShow(showId: string): PresentationView {
|
||||
: null,
|
||||
previewTitle: usage.presentation_title_meta_snapshot,
|
||||
description: usage.presentation_description_snapshot,
|
||||
imageUrl: usage.presentation_image_url_snapshot,
|
||||
imageUrl: mode === 'link' ? usage.presentation_image_url_snapshot : '',
|
||||
siteName: usage.presentation_site_name_snapshot,
|
||||
provider: usage.presentation_provider_snapshot,
|
||||
providerId: usage.presentation_provider_id_snapshot,
|
||||
@@ -786,7 +1263,8 @@ function getPresentationViewForShow(showId: string): PresentationView {
|
||||
usage.presentation_source_timecode_snapshot
|
||||
),
|
||||
sources: [],
|
||||
images: (
|
||||
images: ['text', 'image'].includes(mode)
|
||||
? (
|
||||
database
|
||||
.prepare(
|
||||
`SELECT id, alt_text FROM usage_media_snapshots
|
||||
@@ -794,13 +1272,14 @@ function getPresentationViewForShow(showId: string): PresentationView {
|
||||
)
|
||||
.all(state.presentation_usage_id) as { id: string; alt_text: string }[]
|
||||
).map((media) => ({ id: media.id, altText: media.alt_text }))
|
||||
: []
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
export async function getPresentationPreviewImage(token: string) {
|
||||
const view = getPresentationView(token);
|
||||
if (!view?.content?.imageUrl || view.content.mode === 'text') return null;
|
||||
if (!view?.content?.imageUrl || view.content.mode !== 'link') return null;
|
||||
try {
|
||||
return await fetchPresentationImage(view.content.imageUrl);
|
||||
} catch {
|
||||
@@ -824,7 +1303,8 @@ export async function getPresentationMedia(
|
||||
JOIN show_sections s ON s.id = u.show_section_id
|
||||
JOIN piece_media pm ON pm.id = ums.original_media_id
|
||||
WHERE state.show_id = ? AND s.show_id = state.show_id
|
||||
AND s.is_reserve_bank = 0 AND ums.id = ? AND ums.is_presentation = 1`
|
||||
AND s.is_reserve_bank = 0 AND ums.id = ? AND ums.is_presentation = 1
|
||||
AND (u.presentation_image_only_snapshot = 1 OR u.presentation_mode_snapshot = 'text')`
|
||||
)
|
||||
.get(showId, snapshotId) as
|
||||
{ storage_name: string; mime_type: string; byte_size: number; alt_text: string } | undefined;
|
||||
|
||||
@@ -0,0 +1,431 @@
|
||||
import type { AuthUser } from './auth.js';
|
||||
import { PIECE_STATUSES, getPiece, listPieces, type PieceStatus } from './content.js';
|
||||
import { SHOW_STATUSES, getShow, listShows, type ShowStatus } from './shows.js';
|
||||
import { MCP_SCOPE } from './oauth.js';
|
||||
|
||||
const MAX_PAGE_SIZE = 100;
|
||||
|
||||
type JsonRpcId = string | number | null;
|
||||
type JsonRpcRequest = {
|
||||
jsonrpc: '2.0';
|
||||
id?: JsonRpcId;
|
||||
method: string;
|
||||
params?: Record<string, unknown>;
|
||||
};
|
||||
|
||||
const oauthSecurity = [{ type: 'oauth2', scopes: [MCP_SCOPE] }];
|
||||
const readOnlyAnnotations = {
|
||||
readOnlyHint: true,
|
||||
destructiveHint: false,
|
||||
idempotentHint: true,
|
||||
openWorldHint: false
|
||||
};
|
||||
|
||||
const profileOutputSchema = {
|
||||
$schema: 'https://json-schema.org/draft/2020-12/schema',
|
||||
type: 'object',
|
||||
properties: {
|
||||
id: { type: 'string', minLength: 1, pattern: '\\S' },
|
||||
name: { type: 'string' },
|
||||
email: { type: 'string' },
|
||||
nickname: { type: 'string' }
|
||||
},
|
||||
required: ['id'],
|
||||
additionalProperties: false
|
||||
};
|
||||
|
||||
const paginationSchema = {
|
||||
type: 'object',
|
||||
properties: {
|
||||
limit: { type: 'integer' },
|
||||
offset: { type: 'integer' },
|
||||
total: { type: 'integer' }
|
||||
},
|
||||
required: ['limit', 'offset', 'total'],
|
||||
additionalProperties: false
|
||||
};
|
||||
|
||||
const tools = [
|
||||
{
|
||||
name: 'get_profile',
|
||||
title: 'Sendewerk-Profil',
|
||||
description: 'Gibt das mit dieser Verbindung verknüpfte Sendewerk-Konto zurück.',
|
||||
inputSchema: { type: 'object', properties: {}, additionalProperties: false },
|
||||
outputSchema: profileOutputSchema,
|
||||
annotations: readOnlyAnnotations,
|
||||
securitySchemes: oauthSecurity,
|
||||
_meta: { 'openai/profile': true, securitySchemes: oauthSecurity }
|
||||
},
|
||||
{
|
||||
name: 'list_pieces',
|
||||
title: 'Pieces durchsuchen',
|
||||
description: 'Listet und durchsucht redaktionelle Pieces im Sendewerk-Fundus.',
|
||||
inputSchema: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
query: { type: 'string', maxLength: 200 },
|
||||
statuses: {
|
||||
type: 'array',
|
||||
items: { type: 'string', enum: PIECE_STATUSES },
|
||||
uniqueItems: true
|
||||
},
|
||||
limit: { type: 'integer', minimum: 1, maximum: MAX_PAGE_SIZE, default: 20 },
|
||||
offset: { type: 'integer', minimum: 0, default: 0 }
|
||||
},
|
||||
additionalProperties: false
|
||||
},
|
||||
outputSchema: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
pieces: { type: 'array', items: { type: 'object' } },
|
||||
pagination: paginationSchema
|
||||
},
|
||||
required: ['pieces', 'pagination'],
|
||||
additionalProperties: false
|
||||
},
|
||||
annotations: readOnlyAnnotations,
|
||||
securitySchemes: oauthSecurity,
|
||||
_meta: { securitySchemes: oauthSecurity }
|
||||
},
|
||||
{
|
||||
name: 'get_piece',
|
||||
title: 'Piece lesen',
|
||||
description: 'Liest die redaktionellen Texte und Quellen eines einzelnen Pieces.',
|
||||
inputSchema: {
|
||||
type: 'object',
|
||||
properties: { id: { type: 'string', minLength: 1, maxLength: 100 } },
|
||||
required: ['id'],
|
||||
additionalProperties: false
|
||||
},
|
||||
outputSchema: {
|
||||
type: 'object',
|
||||
properties: { id: { type: 'string' }, title: { type: 'string' } },
|
||||
required: ['id', 'title']
|
||||
},
|
||||
annotations: readOnlyAnnotations,
|
||||
securitySchemes: oauthSecurity,
|
||||
_meta: { securitySchemes: oauthSecurity }
|
||||
},
|
||||
{
|
||||
name: 'list_shows',
|
||||
title: 'Sendungen auflisten',
|
||||
description: 'Listet Sendungen mit Status, Termin, Dauer und Abschnittszahl.',
|
||||
inputSchema: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
statuses: {
|
||||
type: 'array',
|
||||
items: { type: 'string', enum: SHOW_STATUSES },
|
||||
uniqueItems: true
|
||||
},
|
||||
limit: { type: 'integer', minimum: 1, maximum: MAX_PAGE_SIZE, default: 20 },
|
||||
offset: { type: 'integer', minimum: 0, default: 0 }
|
||||
},
|
||||
additionalProperties: false
|
||||
},
|
||||
outputSchema: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
shows: { type: 'array', items: { type: 'object' } },
|
||||
pagination: paginationSchema
|
||||
},
|
||||
required: ['shows', 'pagination'],
|
||||
additionalProperties: false
|
||||
},
|
||||
annotations: readOnlyAnnotations,
|
||||
securitySchemes: oauthSecurity,
|
||||
_meta: { securitySchemes: oauthSecurity }
|
||||
},
|
||||
{
|
||||
name: 'get_show_rundown',
|
||||
title: 'Sendungsablauf lesen',
|
||||
description: 'Liest Metadaten, Abschnitte, eingeplante Pieces und Reserve einer Sendung.',
|
||||
inputSchema: {
|
||||
type: 'object',
|
||||
properties: { id: { type: 'string', minLength: 1, maxLength: 100 } },
|
||||
required: ['id'],
|
||||
additionalProperties: false
|
||||
},
|
||||
outputSchema: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
id: { type: 'string' },
|
||||
title: { type: 'string' },
|
||||
sections: { type: 'array', items: { type: 'object' } },
|
||||
reserve: { type: 'array', items: { type: 'object' } }
|
||||
},
|
||||
required: ['id', 'title', 'sections', 'reserve']
|
||||
},
|
||||
annotations: readOnlyAnnotations,
|
||||
securitySchemes: oauthSecurity,
|
||||
_meta: { securitySchemes: oauthSecurity }
|
||||
}
|
||||
];
|
||||
|
||||
function isObject(value: unknown): value is Record<string, unknown> {
|
||||
return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
|
||||
}
|
||||
|
||||
function integer(
|
||||
value: unknown,
|
||||
fallback: number,
|
||||
minimum: number,
|
||||
maximum = Number.MAX_SAFE_INTEGER
|
||||
) {
|
||||
if (value === undefined) return fallback;
|
||||
if (!Number.isInteger(value) || Number(value) < minimum || Number(value) > maximum) {
|
||||
throw new Error('INVALID_ARGUMENTS');
|
||||
}
|
||||
return Number(value);
|
||||
}
|
||||
|
||||
function stringArgument(value: unknown, maximum: number, required = false): string {
|
||||
if (value === undefined && !required) return '';
|
||||
if (typeof value !== 'string' || (required && !value) || value.length > maximum) {
|
||||
throw new Error('INVALID_ARGUMENTS');
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
function enumArray<T extends string>(value: unknown, allowed: readonly T[], fallback: T[]): T[] {
|
||||
if (value === undefined) return fallback;
|
||||
if (!Array.isArray(value) || value.some((item) => !allowed.includes(item as T))) {
|
||||
throw new Error('INVALID_ARGUMENTS');
|
||||
}
|
||||
return [...new Set(value as T[])];
|
||||
}
|
||||
|
||||
function exactKeys(input: Record<string, unknown>, allowed: string[]): void {
|
||||
if (Object.keys(input).some((key) => !allowed.includes(key)))
|
||||
throw new Error('INVALID_ARGUMENTS');
|
||||
}
|
||||
|
||||
function toolResult(value: unknown) {
|
||||
return {
|
||||
content: [{ type: 'text', text: JSON.stringify(value) }],
|
||||
structuredContent: value,
|
||||
isError: false
|
||||
};
|
||||
}
|
||||
|
||||
function toolError(message: string) {
|
||||
return { content: [{ type: 'text', text: message }], isError: true };
|
||||
}
|
||||
|
||||
function projectPieceUsage(
|
||||
usage: NonNullable<ReturnType<typeof getShow>>['sections'][number]['usages'][number]
|
||||
) {
|
||||
return {
|
||||
id: usage.id,
|
||||
originalPieceId: usage.originalPieceId,
|
||||
position: usage.position,
|
||||
status: usage.status,
|
||||
preparationStatus: usage.preparationStatus,
|
||||
preparationEffort: usage.preparationEffort,
|
||||
durationSeconds: usage.durationSeconds,
|
||||
title: usage.title,
|
||||
outputTitle: usage.outputTitle,
|
||||
intro: usage.intro,
|
||||
research: usage.research,
|
||||
moderation: usage.moderation,
|
||||
interaction: usage.interaction,
|
||||
transition: usage.transition,
|
||||
presentation: usage.presentation,
|
||||
ownNotes: usage.ownNotes,
|
||||
sources: usage.sources.map(({ label, url, timecodeSeconds }) => ({
|
||||
label,
|
||||
url,
|
||||
timecodeSeconds
|
||||
})),
|
||||
topics: usage.topics.map(({ name }) => name)
|
||||
};
|
||||
}
|
||||
|
||||
function callTool(name: string, input: unknown, user: AuthUser) {
|
||||
if (!isObject(input)) throw new Error('INVALID_ARGUMENTS');
|
||||
switch (name) {
|
||||
case 'get_profile': {
|
||||
exactKeys(input, []);
|
||||
const profile = { id: user.id, name: user.displayName };
|
||||
return {
|
||||
content: [{ type: 'text', text: JSON.stringify(profile) }],
|
||||
structuredContent: profile,
|
||||
isError: false
|
||||
};
|
||||
}
|
||||
case 'list_pieces': {
|
||||
exactKeys(input, ['query', 'statuses', 'limit', 'offset']);
|
||||
const statuses = enumArray<PieceStatus>(input.statuses, PIECE_STATUSES, [
|
||||
'inbox',
|
||||
'preparing',
|
||||
'ready'
|
||||
]);
|
||||
const query = stringArgument(input.query, 200);
|
||||
const limit = integer(input.limit, 20, 1, MAX_PAGE_SIZE);
|
||||
const offset = integer(input.offset, 0, 0);
|
||||
const all = listPieces({ statuses, query });
|
||||
return toolResult({
|
||||
pieces: all
|
||||
.slice(offset, offset + limit)
|
||||
.map(({ mediaId: _mediaId, formatId: _formatId, ...piece }) => piece),
|
||||
pagination: { limit, offset, total: all.length }
|
||||
});
|
||||
}
|
||||
case 'get_piece': {
|
||||
exactKeys(input, ['id']);
|
||||
const id = stringArgument(input.id, 100, true);
|
||||
const piece = getPiece(id);
|
||||
if (!piece) return toolError('Piece nicht gefunden.');
|
||||
const listEntry = listPieces({ statuses: [...PIECE_STATUSES] }).find(
|
||||
(entry) => entry.id === id
|
||||
);
|
||||
return toolResult({
|
||||
id: piece.id,
|
||||
title: piece.title,
|
||||
outputTitle: piece.outputTitle,
|
||||
summary: piece.summary,
|
||||
status: piece.status,
|
||||
preparationEffort: piece.preparationEffort,
|
||||
durationSeconds: piece.durationSeconds,
|
||||
format: listEntry?.format ?? '',
|
||||
categories: listEntry?.categories.map(({ name }) => name) ?? [],
|
||||
topics: listEntry?.topics.map(({ name }) => name) ?? [],
|
||||
intro: piece.intro,
|
||||
research: piece.researchText,
|
||||
moderation: piece.moderationNotes,
|
||||
interaction: piece.interactionText,
|
||||
transition: piece.transitionText,
|
||||
presentation: piece.presentationText,
|
||||
sources: piece.sources,
|
||||
createdAtUtc: piece.createdAtUtc,
|
||||
updatedAtUtc: piece.updatedAtUtc
|
||||
});
|
||||
}
|
||||
case 'list_shows': {
|
||||
exactKeys(input, ['statuses', 'limit', 'offset']);
|
||||
const statuses = enumArray<ShowStatus>(input.statuses, SHOW_STATUSES, [...SHOW_STATUSES]);
|
||||
const limit = integer(input.limit, 20, 1, MAX_PAGE_SIZE);
|
||||
const offset = integer(input.offset, 0, 0);
|
||||
const all = listShows(statuses);
|
||||
return toolResult({
|
||||
shows: all.slice(offset, offset + limit),
|
||||
pagination: { limit, offset, total: all.length }
|
||||
});
|
||||
}
|
||||
case 'get_show_rundown': {
|
||||
exactKeys(input, ['id']);
|
||||
const show = getShow(stringArgument(input.id, 100, true));
|
||||
if (!show) return toolError('Sendung nicht gefunden.');
|
||||
return toolResult({
|
||||
id: show.id,
|
||||
title: show.title,
|
||||
startsAtUtc: show.startsAtUtc,
|
||||
twitchTitle: show.twitchTitle,
|
||||
announcementText: show.announcementText,
|
||||
status: show.status,
|
||||
totalDurationSeconds: show.totalDurationSeconds,
|
||||
sections: show.sections.map((section) => ({
|
||||
id: section.id,
|
||||
name: section.name,
|
||||
category: section.category,
|
||||
position: section.position,
|
||||
explicitDurationSeconds: section.explicitDurationSeconds,
|
||||
durationSeconds: section.durationSeconds,
|
||||
twitchTags: section.twitchTags,
|
||||
pieces: section.usages.map(projectPieceUsage)
|
||||
})),
|
||||
reserve: show.reserve.map(projectPieceUsage),
|
||||
createdAtUtc: show.createdAtUtc,
|
||||
updatedAtUtc: show.updatedAtUtc,
|
||||
completedAtUtc: show.completedAtUtc
|
||||
});
|
||||
}
|
||||
default:
|
||||
throw new Error('UNKNOWN_TOOL');
|
||||
}
|
||||
}
|
||||
|
||||
export function validJsonRpcRequest(value: unknown): value is JsonRpcRequest {
|
||||
if (!isObject(value) || value.jsonrpc !== '2.0' || typeof value.method !== 'string') return false;
|
||||
if (
|
||||
'id' in value &&
|
||||
value.id !== null &&
|
||||
typeof value.id !== 'string' &&
|
||||
typeof value.id !== 'number'
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
return value.params === undefined || isObject(value.params);
|
||||
}
|
||||
|
||||
export function handleMcpRequest(request: JsonRpcRequest, user: AuthUser) {
|
||||
const id = request.id ?? null;
|
||||
try {
|
||||
switch (request.method) {
|
||||
case 'server/discover':
|
||||
return {
|
||||
jsonrpc: '2.0',
|
||||
id,
|
||||
result: {
|
||||
resultType: 'complete',
|
||||
supportedVersions: ['2026-07-28', '2025-11-25', '2025-06-18', '2025-03-26'],
|
||||
capabilities: { tools: { listChanged: false } },
|
||||
_meta: {
|
||||
'io.modelcontextprotocol/serverInfo': { name: 'Sendewerk', version: '0.7.3' }
|
||||
},
|
||||
instructions: 'Lesezugriff auf Pieces, Sendungen und redaktionelle Abläufe.',
|
||||
ttlMs: 3_600_000,
|
||||
cacheScope: 'private'
|
||||
}
|
||||
};
|
||||
case 'initialize': {
|
||||
const requestedVersion = request.params?.protocolVersion;
|
||||
const supported = ['2025-11-25', '2025-06-18', '2025-03-26'];
|
||||
const protocolVersion =
|
||||
typeof requestedVersion === 'string' && supported.includes(requestedVersion)
|
||||
? requestedVersion
|
||||
: supported[0];
|
||||
return {
|
||||
jsonrpc: '2.0',
|
||||
id,
|
||||
result: {
|
||||
protocolVersion,
|
||||
capabilities: { tools: { listChanged: false } },
|
||||
serverInfo: { name: 'Sendewerk', version: '0.7.3' },
|
||||
instructions: 'Lesezugriff auf Pieces, Sendungen und redaktionelle Abläufe.'
|
||||
}
|
||||
};
|
||||
}
|
||||
case 'ping':
|
||||
return { jsonrpc: '2.0', id, result: { resultType: 'complete' } };
|
||||
case 'tools/list':
|
||||
return { jsonrpc: '2.0', id, result: { resultType: 'complete', tools } };
|
||||
case 'tools/call': {
|
||||
const name = request.params?.name;
|
||||
if (typeof name !== 'string') throw new Error('INVALID_ARGUMENTS');
|
||||
return {
|
||||
jsonrpc: '2.0',
|
||||
id,
|
||||
result: {
|
||||
resultType: 'complete',
|
||||
...callTool(name, request.params?.arguments ?? {}, user)
|
||||
}
|
||||
};
|
||||
}
|
||||
default:
|
||||
return { jsonrpc: '2.0', id, error: { code: -32601, message: 'Method not found' } };
|
||||
}
|
||||
} catch (cause) {
|
||||
const message = cause instanceof Error ? cause.message : '';
|
||||
return {
|
||||
jsonrpc: '2.0',
|
||||
id,
|
||||
error:
|
||||
message === 'INVALID_ARGUMENTS'
|
||||
? { code: -32602, message: 'Invalid params' }
|
||||
: message === 'UNKNOWN_TOOL'
|
||||
? { code: -32602, message: 'Unknown tool' }
|
||||
: { code: -32603, message: 'Internal error' }
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,425 @@
|
||||
import { createHash, randomBytes, randomUUID } from 'node:crypto';
|
||||
import type { AuthUser } from './auth.js';
|
||||
import { getAuthConfig } from './config.js';
|
||||
import { getDatabase } from './database.js';
|
||||
|
||||
export const MCP_SCOPE = 'sendewerk:read';
|
||||
const AUTHORIZATION_CODE_DURATION_MS = 5 * 60 * 1000;
|
||||
const ACCESS_TOKEN_DURATION_SECONDS = 60 * 60;
|
||||
const MAX_REGISTERED_CLIENTS = 1000;
|
||||
const MCP_REQUEST_LIMIT_PER_HOUR = 600;
|
||||
|
||||
type OAuthClientRow = {
|
||||
id: string;
|
||||
name: string;
|
||||
redirect_uris_json: string;
|
||||
};
|
||||
|
||||
type AuthorizationCodeRow = {
|
||||
client_id: string;
|
||||
user_id: string;
|
||||
redirect_uri: string;
|
||||
scope: string;
|
||||
resource: string;
|
||||
code_challenge: string;
|
||||
expires_at_utc: string;
|
||||
consumed_at_utc: string | null;
|
||||
};
|
||||
|
||||
export type OAuthClient = {
|
||||
id: string;
|
||||
name: string;
|
||||
redirectUris: string[];
|
||||
};
|
||||
|
||||
export type OAuthAuthorizationRequest = {
|
||||
client: OAuthClient;
|
||||
redirectUri: string;
|
||||
state: string;
|
||||
scope: typeof MCP_SCOPE;
|
||||
resource: string;
|
||||
codeChallenge: string;
|
||||
};
|
||||
|
||||
export class OAuthError extends Error {
|
||||
constructor(
|
||||
public code: string,
|
||||
message: string,
|
||||
public status = 400
|
||||
) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
|
||||
function nowUtc(): string {
|
||||
return new Date().toISOString();
|
||||
}
|
||||
|
||||
function futureUtc(durationMs: number): string {
|
||||
return new Date(Date.now() + durationMs).toISOString();
|
||||
}
|
||||
|
||||
function tokenHash(token: string): string {
|
||||
return createHash('sha256').update(token).digest('hex');
|
||||
}
|
||||
|
||||
function randomToken(): string {
|
||||
return randomBytes(32).toString('base64url');
|
||||
}
|
||||
|
||||
export function oauthIssuer(): string {
|
||||
return getAuthConfig().origin.origin;
|
||||
}
|
||||
|
||||
export function mcpResource(): string {
|
||||
return new URL('/mcp', getAuthConfig().origin).toString();
|
||||
}
|
||||
|
||||
export function protectedResourceMetadataUrl(): string {
|
||||
return new URL('/.well-known/oauth-protected-resource/mcp', getAuthConfig().origin).toString();
|
||||
}
|
||||
|
||||
function validRedirectUri(value: string): boolean {
|
||||
try {
|
||||
const url = new URL(value);
|
||||
if (url.hash || url.username || url.password) return false;
|
||||
if (url.protocol === 'https:') return true;
|
||||
return (
|
||||
url.protocol === 'http:' &&
|
||||
(url.hostname === 'localhost' || url.hostname === '127.0.0.1' || url.hostname === '[::1]')
|
||||
);
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function clientFromRow(row: OAuthClientRow): OAuthClient {
|
||||
return { id: row.id, name: row.name, redirectUris: JSON.parse(row.redirect_uris_json) };
|
||||
}
|
||||
|
||||
export function registerOAuthClient(input: unknown): OAuthClient {
|
||||
if (!input || typeof input !== 'object' || Array.isArray(input)) {
|
||||
throw new OAuthError('invalid_client_metadata', 'Client-Metadaten fehlen.');
|
||||
}
|
||||
const metadata = input as Record<string, unknown>;
|
||||
const name = typeof metadata.client_name === 'string' ? metadata.client_name.trim() : '';
|
||||
const redirectUris = Array.isArray(metadata.redirect_uris)
|
||||
? [...new Set(metadata.redirect_uris.filter((uri): uri is string => typeof uri === 'string'))]
|
||||
: [];
|
||||
if (
|
||||
!name ||
|
||||
name.length > 120 ||
|
||||
/[\u0000-\u001f\u007f-\u009f\u202a-\u202e\u2066-\u2069]/u.test(name) ||
|
||||
!redirectUris.length ||
|
||||
redirectUris.length > 10
|
||||
) {
|
||||
throw new OAuthError('invalid_client_metadata', 'Name und Redirect-URIs sind erforderlich.');
|
||||
}
|
||||
if (redirectUris.some((uri) => uri.length > 1000 || !validRedirectUri(uri))) {
|
||||
throw new OAuthError(
|
||||
'invalid_redirect_uri',
|
||||
'Redirect-URIs müssen HTTPS oder lokale HTTP-Adressen sein.'
|
||||
);
|
||||
}
|
||||
if (
|
||||
metadata.token_endpoint_auth_method !== undefined &&
|
||||
metadata.token_endpoint_auth_method !== 'none'
|
||||
) {
|
||||
throw new OAuthError(
|
||||
'invalid_client_metadata',
|
||||
'Nur öffentliche PKCE-Clients werden unterstützt.'
|
||||
);
|
||||
}
|
||||
if (
|
||||
(Array.isArray(metadata.grant_types) && !metadata.grant_types.includes('authorization_code')) ||
|
||||
(Array.isArray(metadata.response_types) && !metadata.response_types.includes('code'))
|
||||
) {
|
||||
throw new OAuthError('invalid_client_metadata', 'Nur Authorization Code wird unterstützt.');
|
||||
}
|
||||
const client: OAuthClient = { id: randomToken(), name, redirectUris };
|
||||
const database = getDatabase();
|
||||
const timestamp = nowUtc();
|
||||
database
|
||||
.prepare('DELETE FROM oauth_authorization_codes WHERE expires_at_utc <= ?')
|
||||
.run(timestamp);
|
||||
database
|
||||
.prepare(
|
||||
'DELETE FROM oauth_access_tokens WHERE expires_at_utc <= ? OR revoked_at_utc IS NOT NULL'
|
||||
)
|
||||
.run(timestamp);
|
||||
database
|
||||
.prepare(
|
||||
`DELETE FROM oauth_clients WHERE created_at_utc < ?
|
||||
AND NOT EXISTS (SELECT 1 FROM oauth_authorization_codes c WHERE c.client_id = oauth_clients.id)
|
||||
AND NOT EXISTS (SELECT 1 FROM oauth_access_tokens t WHERE t.client_id = oauth_clients.id)`
|
||||
)
|
||||
.run(new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString());
|
||||
const count = database.prepare('SELECT count(*) AS count FROM oauth_clients').get() as {
|
||||
count: number;
|
||||
};
|
||||
if (count.count >= MAX_REGISTERED_CLIENTS) {
|
||||
throw new OAuthError(
|
||||
'temporarily_unavailable',
|
||||
'Derzeit sind keine weiteren Registrierungen möglich.',
|
||||
503
|
||||
);
|
||||
}
|
||||
database
|
||||
.prepare(
|
||||
'INSERT INTO oauth_clients (id, name, redirect_uris_json, created_at_utc) VALUES (?, ?, ?, ?)'
|
||||
)
|
||||
.run(client.id, client.name, JSON.stringify(client.redirectUris), timestamp);
|
||||
return client;
|
||||
}
|
||||
|
||||
export function reserveOAuthAttempt(kind: 'registration' | 'token', address: string): boolean {
|
||||
const database = getDatabase();
|
||||
const since = new Date(Date.now() - 60 * 60 * 1000).toISOString();
|
||||
const limit = kind === 'registration' ? 20 : 120;
|
||||
const addressHash = tokenHash(address || 'unknown');
|
||||
return database.transaction(() => {
|
||||
database.prepare('DELETE FROM oauth_rate_limit_attempts WHERE attempted_at_utc < ?').run(since);
|
||||
const row = database
|
||||
.prepare(
|
||||
`SELECT count(*) AS count FROM oauth_rate_limit_attempts
|
||||
WHERE kind = ? AND address_hash = ? AND attempted_at_utc >= ?`
|
||||
)
|
||||
.get(kind, addressHash, since) as { count: number };
|
||||
if (row.count >= limit) return false;
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO oauth_rate_limit_attempts (id, kind, address_hash, attempted_at_utc)
|
||||
VALUES (?, ?, ?, ?)`
|
||||
)
|
||||
.run(randomUUID(), kind, addressHash, nowUtc());
|
||||
return true;
|
||||
})();
|
||||
}
|
||||
|
||||
export function getOAuthClient(clientId: string): OAuthClient | null {
|
||||
if (!clientId || clientId.length > 200) return null;
|
||||
const row = getDatabase()
|
||||
.prepare('SELECT id, name, redirect_uris_json FROM oauth_clients WHERE id = ?')
|
||||
.get(clientId) as OAuthClientRow | undefined;
|
||||
return row ? clientFromRow(row) : null;
|
||||
}
|
||||
|
||||
export function parseAuthorizationRequest(url: URL): OAuthAuthorizationRequest {
|
||||
const client = getOAuthClient(url.searchParams.get('client_id') ?? '');
|
||||
if (!client) throw new OAuthError('invalid_client', 'Der OAuth-Client ist nicht registriert.');
|
||||
const redirectUri = url.searchParams.get('redirect_uri') ?? '';
|
||||
if (!client.redirectUris.includes(redirectUri)) {
|
||||
throw new OAuthError('invalid_request', 'Die Redirect-URI ist nicht registriert.');
|
||||
}
|
||||
if (url.searchParams.get('response_type') !== 'code') {
|
||||
throw new OAuthError('unsupported_response_type', 'Nur response_type=code wird unterstützt.');
|
||||
}
|
||||
const scope = url.searchParams.get('scope') ?? '';
|
||||
if (scope !== MCP_SCOPE)
|
||||
throw new OAuthError('invalid_scope', 'Der angeforderte Scope ist ungültig.');
|
||||
const resource = url.searchParams.get('resource') ?? '';
|
||||
if (resource !== mcpResource()) {
|
||||
throw new OAuthError('invalid_target', 'Die angeforderte MCP-Ressource ist ungültig.');
|
||||
}
|
||||
const codeChallenge = url.searchParams.get('code_challenge') ?? '';
|
||||
if (
|
||||
url.searchParams.get('code_challenge_method') !== 'S256' ||
|
||||
!/^[A-Za-z0-9_-]{43}$/.test(codeChallenge)
|
||||
) {
|
||||
throw new OAuthError('invalid_request', 'PKCE mit S256 ist erforderlich.');
|
||||
}
|
||||
const state = url.searchParams.get('state') ?? '';
|
||||
if (state.length > 1000) throw new OAuthError('invalid_request', 'Der OAuth-State ist zu lang.');
|
||||
return { client, redirectUri, state, scope: MCP_SCOPE, resource, codeChallenge };
|
||||
}
|
||||
|
||||
export function authorizationErrorRedirect(url: URL, problem: OAuthError): string | null {
|
||||
const client = getOAuthClient(url.searchParams.get('client_id') ?? '');
|
||||
const redirectUri = url.searchParams.get('redirect_uri') ?? '';
|
||||
if (!client?.redirectUris.includes(redirectUri)) return null;
|
||||
const target = new URL(redirectUri);
|
||||
target.searchParams.set('error', problem.code);
|
||||
target.searchParams.set('error_description', problem.message);
|
||||
const state = url.searchParams.get('state') ?? '';
|
||||
if (state && state.length <= 1000) target.searchParams.set('state', state);
|
||||
target.searchParams.set('iss', oauthIssuer());
|
||||
return target.toString();
|
||||
}
|
||||
|
||||
export function authorizationRedirect(
|
||||
request: OAuthAuthorizationRequest,
|
||||
values: Record<string, string>
|
||||
): string {
|
||||
const target = new URL(request.redirectUri);
|
||||
for (const [key, value] of Object.entries(values)) target.searchParams.set(key, value);
|
||||
if (request.state) target.searchParams.set('state', request.state);
|
||||
target.searchParams.set('iss', oauthIssuer());
|
||||
return target.toString();
|
||||
}
|
||||
|
||||
export function createAuthorizationCode(
|
||||
request: OAuthAuthorizationRequest,
|
||||
user: AuthUser
|
||||
): string {
|
||||
const code = randomToken();
|
||||
const timestamp = nowUtc();
|
||||
const database = getDatabase();
|
||||
const store = database.transaction(() => {
|
||||
database
|
||||
.prepare('DELETE FROM oauth_authorization_codes WHERE expires_at_utc <= ?')
|
||||
.run(timestamp);
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO oauth_authorization_codes (
|
||||
code_hash, client_id, user_id, redirect_uri, scope, resource, code_challenge,
|
||||
created_at_utc, expires_at_utc
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
|
||||
)
|
||||
.run(
|
||||
tokenHash(code),
|
||||
request.client.id,
|
||||
user.id,
|
||||
request.redirectUri,
|
||||
request.scope,
|
||||
request.resource,
|
||||
request.codeChallenge,
|
||||
timestamp,
|
||||
futureUtc(AUTHORIZATION_CODE_DURATION_MS)
|
||||
);
|
||||
});
|
||||
store();
|
||||
return code;
|
||||
}
|
||||
|
||||
function pkceChallenge(verifier: string): string {
|
||||
return createHash('sha256').update(verifier).digest('base64url');
|
||||
}
|
||||
|
||||
export function exchangeAuthorizationCode(input: {
|
||||
code: string;
|
||||
clientId: string;
|
||||
redirectUri: string;
|
||||
codeVerifier: string;
|
||||
resource: string;
|
||||
}) {
|
||||
if (!/^[A-Za-z0-9._~-]{43,128}$/.test(input.codeVerifier)) {
|
||||
throw new OAuthError('invalid_grant', 'Der PKCE-Verifier ist ungültig.');
|
||||
}
|
||||
const database = getDatabase();
|
||||
const exchange = database.transaction(() => {
|
||||
const timestamp = nowUtc();
|
||||
const row = database
|
||||
.prepare(
|
||||
`SELECT client_id, user_id, redirect_uri, scope, resource, code_challenge,
|
||||
expires_at_utc, consumed_at_utc
|
||||
FROM oauth_authorization_codes WHERE code_hash = ?`
|
||||
)
|
||||
.get(tokenHash(input.code)) as AuthorizationCodeRow | undefined;
|
||||
if (
|
||||
!row ||
|
||||
row.consumed_at_utc ||
|
||||
row.expires_at_utc <= timestamp ||
|
||||
row.client_id !== input.clientId ||
|
||||
row.redirect_uri !== input.redirectUri ||
|
||||
row.resource !== input.resource ||
|
||||
row.code_challenge !== pkceChallenge(input.codeVerifier)
|
||||
) {
|
||||
throw new OAuthError('invalid_grant', 'Der Autorisierungscode ist ungültig oder abgelaufen.');
|
||||
}
|
||||
const user = database
|
||||
.prepare('SELECT 1 FROM users WHERE id = ? AND locked_at_utc IS NULL')
|
||||
.get(row.user_id);
|
||||
if (!user) throw new OAuthError('invalid_grant', 'Das zugehörige Konto ist nicht aktiv.');
|
||||
const token = randomToken();
|
||||
database
|
||||
.prepare('UPDATE oauth_authorization_codes SET consumed_at_utc = ? WHERE code_hash = ?')
|
||||
.run(timestamp, tokenHash(input.code));
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO oauth_access_tokens (
|
||||
token_hash, client_id, user_id, scope, resource, created_at_utc, expires_at_utc,
|
||||
request_window_started_at_utc
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
|
||||
)
|
||||
.run(
|
||||
tokenHash(token),
|
||||
row.client_id,
|
||||
row.user_id,
|
||||
row.scope,
|
||||
row.resource,
|
||||
timestamp,
|
||||
futureUtc(ACCESS_TOKEN_DURATION_SECONDS * 1000),
|
||||
timestamp
|
||||
);
|
||||
return { accessToken: token, scope: row.scope };
|
||||
});
|
||||
return exchange();
|
||||
}
|
||||
|
||||
export function authenticateOAuth(request: Request): AuthUser {
|
||||
const authorization = request.headers.get('authorization') ?? '';
|
||||
const token = authorization.startsWith('Bearer ') ? authorization.slice(7).trim() : '';
|
||||
if (!token || token.length > 100)
|
||||
throw new OAuthError('invalid_token', 'OAuth-Token fehlt.', 401);
|
||||
const timestamp = nowUtc();
|
||||
const database = getDatabase();
|
||||
const row = database.transaction(() => {
|
||||
const current = database
|
||||
.prepare(
|
||||
`SELECT u.id, u.email, u.display_name AS displayName, u.role,
|
||||
u.locked_at_utc AS lockedAtUtc, t.token_hash,
|
||||
t.request_window_started_at_utc, t.request_count
|
||||
FROM oauth_access_tokens t JOIN users u ON u.id = t.user_id
|
||||
WHERE t.token_hash = ? AND t.revoked_at_utc IS NULL AND t.expires_at_utc > ?
|
||||
AND t.scope = ? AND t.resource = ? AND u.locked_at_utc IS NULL`
|
||||
)
|
||||
.get(tokenHash(token), timestamp, MCP_SCOPE, mcpResource()) as
|
||||
| (AuthUser & {
|
||||
token_hash: string;
|
||||
request_window_started_at_utc: string;
|
||||
request_count: number;
|
||||
})
|
||||
| undefined;
|
||||
if (!current) {
|
||||
throw new OAuthError('invalid_token', 'OAuth-Token ist ungültig oder abgelaufen.', 401);
|
||||
}
|
||||
const windowExpired =
|
||||
current.request_window_started_at_utc <= new Date(Date.now() - 60 * 60 * 1000).toISOString();
|
||||
if (!windowExpired && current.request_count >= MCP_REQUEST_LIMIT_PER_HOUR) {
|
||||
throw new OAuthError('temporarily_unavailable', 'Zu viele MCP-Anfragen.', 429);
|
||||
}
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE oauth_access_tokens SET last_used_at_utc = ?,
|
||||
request_window_started_at_utc = ?, request_count = ? WHERE token_hash = ?`
|
||||
)
|
||||
.run(
|
||||
timestamp,
|
||||
windowExpired ? timestamp : current.request_window_started_at_utc,
|
||||
windowExpired ? 1 : current.request_count + 1,
|
||||
current.token_hash
|
||||
);
|
||||
return current;
|
||||
})();
|
||||
return {
|
||||
id: row.id,
|
||||
email: row.email,
|
||||
displayName: row.displayName,
|
||||
role: row.role,
|
||||
lockedAtUtc: row.lockedAtUtc
|
||||
};
|
||||
}
|
||||
|
||||
export function revokeOAuthToken(token: string, clientId: string): void {
|
||||
if (!token || token.length > 200 || !clientId || clientId.length > 200) return;
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`UPDATE oauth_access_tokens SET revoked_at_utc = ?
|
||||
WHERE token_hash = ? AND client_id = ? AND revoked_at_utc IS NULL`
|
||||
)
|
||||
.run(nowUtc(), tokenHash(token), clientId);
|
||||
}
|
||||
|
||||
export function oauthTokenDurationSeconds(): number {
|
||||
return ACCESS_TOKEN_DURATION_SECONDS;
|
||||
}
|
||||
@@ -8,7 +8,7 @@ import image from 'metascraper-image';
|
||||
import publisher from 'metascraper-publisher';
|
||||
import title from 'metascraper-title';
|
||||
|
||||
export type PresentationMode = 'text' | 'link' | 'video';
|
||||
export type PresentationMode = 'text' | 'image' | 'link' | 'video';
|
||||
export type VideoProvider = 'youtube' | 'tiktok';
|
||||
|
||||
export type PresentationMetadata = {
|
||||
|
||||
@@ -0,0 +1,276 @@
|
||||
import { execFileSync } from 'node:child_process';
|
||||
import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
|
||||
import { tmpdir } from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
||||
import type { AuthUser } from './auth.js';
|
||||
import { finalizeShow } from './completion.js';
|
||||
import { closeDatabase, getDatabase } from './database.js';
|
||||
import {
|
||||
authenticateShare,
|
||||
createShare,
|
||||
deleteShare,
|
||||
getSharedMedia,
|
||||
getSharedShow,
|
||||
revokeShare,
|
||||
replaceShareToken,
|
||||
updateShare
|
||||
} from './shares.js';
|
||||
import { addPieceUsage, addShowSection, createShow } from './shows.js';
|
||||
|
||||
let directory: string;
|
||||
const actor: AuthUser = {
|
||||
id: 'share-actor',
|
||||
email: 'share@example.test',
|
||||
displayName: 'Freigabe Test',
|
||||
role: 'barkeeper',
|
||||
lockedAtUtc: null
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
directory = mkdtempSync(path.join(tmpdir(), 'sendewerk-shares-test-'));
|
||||
process.env.SENDEWERK_DB_PATH = path.join(directory, 'test.sqlite');
|
||||
process.env.SENDEWERK_UPLOAD_DIR = path.join(directory, 'uploads');
|
||||
execFileSync(process.execPath, ['scripts/migrate.mjs'], { cwd: process.cwd(), env: process.env });
|
||||
execFileSync(process.execPath, ['scripts/seed.mjs'], { cwd: process.cwd(), env: process.env });
|
||||
const now = new Date().toISOString();
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`INSERT INTO users (id, email, email_normalized, display_name, password_hash, role,
|
||||
password_changed_at_utc, created_at_utc, updated_at_utc)
|
||||
VALUES (?, ?, ?, ?, 'unused', 'barkeeper', ?, ?, ?)`
|
||||
)
|
||||
.run(actor.id, actor.email, actor.email, actor.displayName, now, now, now);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
closeDatabase();
|
||||
delete process.env.SENDEWERK_DB_PATH;
|
||||
delete process.env.SENDEWERK_UPLOAD_DIR;
|
||||
rmSync(directory, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
function finalizedShow() {
|
||||
const created = createShow({
|
||||
title: 'Freigegebene Sendung',
|
||||
startsAtUtc: null,
|
||||
templateId: null
|
||||
});
|
||||
const section = addShowSection(created.id, created.revision, {
|
||||
name: 'Freigabeblock',
|
||||
categoryId: null,
|
||||
explicitDurationSeconds: null
|
||||
});
|
||||
const usage = addPieceUsage(created.id, section.revision, {
|
||||
pieceId: 'piece-console',
|
||||
sectionId: section.id
|
||||
});
|
||||
const reserveUsage = addPieceUsage(created.id, usage.revision, {
|
||||
pieceId: 'piece-console',
|
||||
sectionId: null
|
||||
});
|
||||
const database = getDatabase();
|
||||
database.prepare("UPDATE piece_usages SET status = 'done' WHERE id = ?").run(usage.id);
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO show_live_states
|
||||
(show_id, revision, started_at_utc, ended_at_utc, presentation_revision, updated_at_utc)
|
||||
VALUES (?, 0, ?, ?, 0, ?)`
|
||||
)
|
||||
.run(
|
||||
created.id,
|
||||
'2026-10-25T18:00:00.000Z',
|
||||
'2026-10-25T19:00:00.000Z',
|
||||
'2026-10-25T19:00:00.000Z'
|
||||
);
|
||||
finalizeShow({
|
||||
showId: created.id,
|
||||
commandId: `finalize-${created.id}`,
|
||||
expectedShowRevision: reserveUsage.revision,
|
||||
expectedLiveRevision: 0,
|
||||
archivePieceIds: [],
|
||||
actor
|
||||
});
|
||||
return { showId: created.id, usageId: usage.id, reserveUsageId: reserveUsage.id };
|
||||
}
|
||||
|
||||
describe('show shares', () => {
|
||||
it('shares an unfinished show and keeps its current plan visible', async () => {
|
||||
const created = createShow({
|
||||
title: 'Offene Freigabe',
|
||||
startsAtUtc: null,
|
||||
templateId: null
|
||||
});
|
||||
const shared = await createShare(actor, {
|
||||
showId: created.id,
|
||||
scope: 'rundown',
|
||||
password: '',
|
||||
expiresAtUtc: null
|
||||
});
|
||||
const initiallyEmpty = getSharedShow(shared.token);
|
||||
expect(initiallyEmpty.status).toBe('authorized');
|
||||
if (initiallyEmpty.status !== 'authorized') throw new Error('share unavailable');
|
||||
expect(initiallyEmpty.share.isCompleted).toBe(false);
|
||||
expect(initiallyEmpty.share.sections).toEqual([]);
|
||||
|
||||
const section = addShowSection(created.id, created.revision, {
|
||||
name: 'Nachträglich geplant',
|
||||
categoryId: null,
|
||||
explicitDurationSeconds: null
|
||||
});
|
||||
addPieceUsage(created.id, section.revision, {
|
||||
pieceId: 'piece-console',
|
||||
sectionId: section.id
|
||||
});
|
||||
const updatedPlan = getSharedShow(shared.token);
|
||||
expect(updatedPlan.status).toBe('authorized');
|
||||
if (updatedPlan.status !== 'authorized') throw new Error('share unavailable');
|
||||
expect(updatedPlan.share.sections[0]).toMatchObject({
|
||||
name: 'Nachträglich geplant',
|
||||
usages: [{ title: 'Die kleine Konsole mit dem großen Dreh' }]
|
||||
});
|
||||
|
||||
await updateShare(actor, shared.id, {
|
||||
scope: 'moderation',
|
||||
passwordMode: 'replace',
|
||||
password: 'neues-freigabe-passwort',
|
||||
expiresAtUtc: null
|
||||
});
|
||||
expect(getSharedShow(shared.token).status).toBe('password');
|
||||
const session = await authenticateShare(shared.token, 'neues-freigabe-passwort', '192.0.2.20');
|
||||
expect(getSharedShow(shared.token, session.token).status).toBe('authorized');
|
||||
const replacementToken = replaceShareToken(actor, shared.id, created.id);
|
||||
expect(getSharedShow(shared.token, session.token).status).toBe('unavailable');
|
||||
expect(getSharedShow(replacementToken).status).toBe('password');
|
||||
const replacementSession = await authenticateShare(
|
||||
replacementToken,
|
||||
'neues-freigabe-passwort',
|
||||
'192.0.2.20'
|
||||
);
|
||||
expect(getSharedShow(replacementToken, replacementSession.token).status).toBe('authorized');
|
||||
deleteShare(actor, shared.id, created.id);
|
||||
expect(getSharedShow(replacementToken, replacementSession.token).status).toBe('unavailable');
|
||||
});
|
||||
|
||||
it('projects exactly the selected information scope', async () => {
|
||||
const prepared = finalizedShow();
|
||||
const rundown = await createShare(actor, {
|
||||
showId: prepared.showId,
|
||||
scope: 'rundown',
|
||||
password: '',
|
||||
expiresAtUtc: null
|
||||
});
|
||||
const basic = getSharedShow(rundown.token);
|
||||
expect(basic.status).toBe('authorized');
|
||||
if (basic.status !== 'authorized') throw new Error('share unavailable');
|
||||
const basicUsage = basic.share.sections[0].usages[0];
|
||||
expect(basicUsage).not.toHaveProperty('moderationHtml');
|
||||
expect(basicUsage).not.toHaveProperty('researchHtml');
|
||||
expect(JSON.stringify(basic)).not.toContain('originalPieceId');
|
||||
expect(JSON.stringify(basic)).not.toContain(prepared.showId);
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`INSERT INTO usage_tool_snapshots
|
||||
(id, usage_id, original_tool_id, name, start_url, work_url, note, position)
|
||||
VALUES ('private-share-tool', ?, NULL, 'Schnittwerkzeug',
|
||||
'https://private.example/start', 'https://private.example/work?secret=1',
|
||||
'Freigegebene Werkzeugnotiz', 0)`
|
||||
)
|
||||
.run(prepared.usageId);
|
||||
|
||||
const research = await createShare(actor, {
|
||||
showId: prepared.showId,
|
||||
scope: 'research',
|
||||
password: '',
|
||||
expiresAtUtc: null
|
||||
});
|
||||
const full = getSharedShow(research.token);
|
||||
expect(full.status).toBe('authorized');
|
||||
if (full.status !== 'authorized') throw new Error('share unavailable');
|
||||
expect(full.share.sections[0].usages[0]).toHaveProperty('moderationHtml');
|
||||
expect(full.share.sections[0].usages[0]).toHaveProperty('researchHtml');
|
||||
expect(full.share.sections[0].usages[0]).not.toHaveProperty('ownNotesHtml');
|
||||
expect(JSON.stringify(full)).not.toContain('private.example');
|
||||
expect(JSON.stringify(full)).toContain('Freigegebene Werkzeugnotiz');
|
||||
});
|
||||
|
||||
it('enforces password, expiry and revocation for page and direct media access', async () => {
|
||||
const prepared = finalizedShow();
|
||||
const database = getDatabase();
|
||||
mkdirSync(process.env.SENDEWERK_UPLOAD_DIR!, { recursive: true });
|
||||
writeFileSync(path.join(process.env.SENDEWERK_UPLOAD_DIR!, 'shared.png'), Buffer.from('image'));
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO piece_media
|
||||
(id, piece_id, storage_name, original_name, mime_type, byte_size, alt_text, position, created_at_utc)
|
||||
VALUES ('share-media', 'piece-console', 'shared.png', 'shared.png', 'image/png', 5, 'Freigegeben', 99, ?)`
|
||||
)
|
||||
.run(new Date().toISOString());
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO usage_media_snapshots
|
||||
(id, usage_id, original_media_id, alt_text, position, is_presentation)
|
||||
VALUES ('share-snapshot', ?, 'share-media', 'Freigegeben', 99, 1)`
|
||||
)
|
||||
.run(prepared.usageId);
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO usage_media_snapshots
|
||||
(id, usage_id, original_media_id, alt_text, position, is_presentation)
|
||||
VALUES ('reserve-share-snapshot', ?, 'share-media', 'Private Reserve', 99, 1)`
|
||||
)
|
||||
.run(prepared.reserveUsageId);
|
||||
const created = await createShare(actor, {
|
||||
showId: prepared.showId,
|
||||
scope: 'research',
|
||||
password: 'ein-sicheres-passwort',
|
||||
expiresAtUtc: new Date(Date.now() + 60_000).toISOString()
|
||||
});
|
||||
expect(getSharedShow(created.token).status).toBe('password');
|
||||
expect(getSharedShow(created.token)).not.toHaveProperty('share');
|
||||
expect(await getSharedMedia(created.token, undefined, 'share-snapshot')).toBeNull();
|
||||
await expect(authenticateShare(created.token, 'falsch', '127.0.0.1')).rejects.toThrow(
|
||||
'INVALID_PASSWORD'
|
||||
);
|
||||
const session = await authenticateShare(created.token, 'ein-sicheres-passwort', '127.0.0.1');
|
||||
expect(getSharedShow(created.token, session.token).status).toBe('authorized');
|
||||
expect((await getSharedMedia(created.token, session.token, 'share-snapshot'))?.byteSize).toBe(
|
||||
5
|
||||
);
|
||||
expect(await getSharedMedia(created.token, session.token, 'foreign-media')).toBeNull();
|
||||
expect(await getSharedMedia(created.token, session.token, 'reserve-share-snapshot')).toBeNull();
|
||||
revokeShare(actor, created.id);
|
||||
expect(getSharedShow(created.token, session.token).status).toBe('unavailable');
|
||||
expect(await getSharedMedia(created.token, session.token, 'share-snapshot')).toBeNull();
|
||||
|
||||
const expired = await createShare(actor, {
|
||||
showId: prepared.showId,
|
||||
scope: 'rundown',
|
||||
password: '',
|
||||
expiresAtUtc: new Date(Date.now() + 60_000).toISOString()
|
||||
});
|
||||
database
|
||||
.prepare('UPDATE show_shares SET expires_at_utc = ? WHERE id = ?')
|
||||
.run('2000-01-01T00:00:00.000Z', expired.id);
|
||||
expect(getSharedShow(expired.token).status).toBe('unavailable');
|
||||
expect(await getSharedMedia(expired.token, undefined, 'share-snapshot')).toBeNull();
|
||||
});
|
||||
|
||||
it('limits repeated password attempts per share', async () => {
|
||||
const prepared = finalizedShow();
|
||||
const created = await createShare(actor, {
|
||||
showId: prepared.showId,
|
||||
scope: 'rundown',
|
||||
password: 'noch-ein-sicheres-passwort',
|
||||
expiresAtUtc: null
|
||||
});
|
||||
for (let attempt = 0; attempt < 5; attempt += 1) {
|
||||
await expect(authenticateShare(created.token, 'falsch', '192.0.2.10')).rejects.toThrow(
|
||||
'INVALID_PASSWORD'
|
||||
);
|
||||
}
|
||||
await expect(
|
||||
authenticateShare(created.token, 'noch-ein-sicheres-passwort', '192.0.2.10')
|
||||
).rejects.toThrow('RATE_LIMITED');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,451 @@
|
||||
import { readFile } from 'node:fs/promises';
|
||||
import path from 'node:path';
|
||||
import { randomUUID } from 'node:crypto';
|
||||
import {
|
||||
createToken,
|
||||
hashPassword,
|
||||
hashToken,
|
||||
validPassword,
|
||||
verifyPassword,
|
||||
type AuthUser
|
||||
} from './auth.js';
|
||||
import { getServerPaths } from './config.js';
|
||||
import { getDatabase } from './database.js';
|
||||
import { renderMarkdown } from './markdown.js';
|
||||
import type { ShowStatus } from './shows.js';
|
||||
|
||||
export const SHARE_SESSION_COOKIE = 'sendewerk_share_session';
|
||||
export const SHARE_SCOPES = ['rundown', 'moderation', 'research'] as const;
|
||||
export type ShareScope = (typeof SHARE_SCOPES)[number];
|
||||
const PASSWORD_ATTEMPT_WINDOW_MS = 15 * 60 * 1000;
|
||||
const SHARE_PASSWORD_ATTEMPT_LIMIT = 5;
|
||||
const ADDRESS_PASSWORD_ATTEMPT_LIMIT = 20;
|
||||
|
||||
type ShareRow = {
|
||||
id: string;
|
||||
show_id: string;
|
||||
token_hash: string;
|
||||
scope: ShareScope;
|
||||
password_hash: string | null;
|
||||
expires_at_utc: string | null;
|
||||
revoked_at_utc: string | null;
|
||||
created_at_utc: string;
|
||||
};
|
||||
|
||||
export type ShareListItem = {
|
||||
id: string;
|
||||
showId: string;
|
||||
showTitle: string;
|
||||
showStatus: ShowStatus;
|
||||
showStartsAtUtc: string | null;
|
||||
scope: ShareScope;
|
||||
isPasswordProtected: boolean;
|
||||
expiresAtUtc: string | null;
|
||||
revokedAtUtc: string | null;
|
||||
createdAtUtc: string;
|
||||
};
|
||||
|
||||
function requireBarkeeperActor(actor: AuthUser): void {
|
||||
if (actor.role !== 'barkeeper') throw new Error('FORBIDDEN');
|
||||
}
|
||||
|
||||
function validExpiry(value: string | null): string | null {
|
||||
if (!value) return null;
|
||||
const expiry = new Date(value);
|
||||
if (Number.isNaN(expiry.valueOf()) || expiry.valueOf() <= Date.now()) {
|
||||
throw new Error('INVALID_EXPIRY');
|
||||
}
|
||||
return expiry.toISOString();
|
||||
}
|
||||
|
||||
function activeShare(rawToken: string): ShareRow | null {
|
||||
if (!rawToken) return null;
|
||||
const now = new Date().toISOString();
|
||||
return (
|
||||
(getDatabase()
|
||||
.prepare(
|
||||
`SELECT id, show_id, token_hash, scope, password_hash, expires_at_utc,
|
||||
revoked_at_utc, created_at_utc FROM show_shares
|
||||
WHERE token_hash = ? AND revoked_at_utc IS NULL
|
||||
AND (expires_at_utc IS NULL OR expires_at_utc > ?)`
|
||||
)
|
||||
.get(hashToken(rawToken), now) as ShareRow | undefined) ?? null
|
||||
);
|
||||
}
|
||||
|
||||
export function listShares(actor: AuthUser, showId?: string): ShareListItem[] {
|
||||
requireBarkeeperActor(actor);
|
||||
const where = showId ? 'WHERE ss.show_id = ?' : '';
|
||||
return (
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`SELECT ss.id, ss.show_id, sh.title AS show_title, sh.status AS show_status,
|
||||
sh.starts_at_utc AS show_starts_at_utc, ss.scope, ss.password_hash,
|
||||
ss.expires_at_utc, ss.revoked_at_utc, ss.created_at_utc
|
||||
FROM show_shares ss JOIN shows sh ON sh.id = ss.show_id
|
||||
${where}
|
||||
ORDER BY ss.created_at_utc DESC`
|
||||
)
|
||||
.all(...(showId ? [showId] : [])) as {
|
||||
id: string;
|
||||
show_id: string;
|
||||
show_title: string;
|
||||
show_status: ShowStatus;
|
||||
show_starts_at_utc: string | null;
|
||||
scope: ShareScope;
|
||||
password_hash: string | null;
|
||||
expires_at_utc: string | null;
|
||||
revoked_at_utc: string | null;
|
||||
created_at_utc: string;
|
||||
}[]
|
||||
).map((share) => ({
|
||||
id: share.id,
|
||||
showId: share.show_id,
|
||||
showTitle: share.show_title,
|
||||
showStatus: share.show_status,
|
||||
showStartsAtUtc: share.show_starts_at_utc,
|
||||
scope: share.scope,
|
||||
isPasswordProtected: Boolean(share.password_hash),
|
||||
expiresAtUtc: share.expires_at_utc,
|
||||
revokedAtUtc: share.revoked_at_utc,
|
||||
createdAtUtc: share.created_at_utc
|
||||
}));
|
||||
}
|
||||
|
||||
export async function createShare(
|
||||
actor: AuthUser,
|
||||
input: { showId: string; scope: string; password: string; expiresAtUtc: string | null }
|
||||
) {
|
||||
requireBarkeeperActor(actor);
|
||||
if (!SHARE_SCOPES.includes(input.scope as ShareScope)) throw new Error('INVALID_SCOPE');
|
||||
if (input.password && !validPassword(input.password)) throw new Error('INVALID_PASSWORD');
|
||||
const expiresAtUtc = validExpiry(input.expiresAtUtc);
|
||||
const database = getDatabase();
|
||||
if (!database.prepare('SELECT 1 FROM shows WHERE id = ?').get(input.showId)) {
|
||||
throw new Error('NOT_FOUND');
|
||||
}
|
||||
const token = createToken();
|
||||
const id = randomUUID();
|
||||
const now = new Date().toISOString();
|
||||
const passwordHash = input.password ? await hashPassword(input.password) : null;
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO show_shares
|
||||
(id, show_id, token_hash, scope, password_hash, expires_at_utc,
|
||||
created_by_user_id, created_at_utc) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
|
||||
)
|
||||
.run(
|
||||
id,
|
||||
input.showId,
|
||||
hashToken(token),
|
||||
input.scope,
|
||||
passwordHash,
|
||||
expiresAtUtc,
|
||||
actor.id,
|
||||
now
|
||||
);
|
||||
return { id, token };
|
||||
}
|
||||
|
||||
export async function updateShare(
|
||||
actor: AuthUser,
|
||||
shareId: string,
|
||||
input: {
|
||||
scope: string;
|
||||
passwordMode: string;
|
||||
password: string;
|
||||
expiresAtUtc: string | null;
|
||||
},
|
||||
expectedShowId?: string
|
||||
): Promise<void> {
|
||||
requireBarkeeperActor(actor);
|
||||
if (!SHARE_SCOPES.includes(input.scope as ShareScope)) throw new Error('INVALID_SCOPE');
|
||||
if (!['keep', 'remove', 'replace'].includes(input.passwordMode)) {
|
||||
throw new Error('INVALID_PASSWORD_MODE');
|
||||
}
|
||||
if (input.passwordMode === 'replace' && !validPassword(input.password)) {
|
||||
throw new Error('INVALID_PASSWORD');
|
||||
}
|
||||
const expiresAtUtc = validExpiry(input.expiresAtUtc);
|
||||
const existing = getDatabase()
|
||||
.prepare(
|
||||
'SELECT show_id, password_hash FROM show_shares WHERE id = ? AND revoked_at_utc IS NULL'
|
||||
)
|
||||
.get(shareId) as { show_id: string; password_hash: string | null } | undefined;
|
||||
if (!existing || (expectedShowId && existing.show_id !== expectedShowId))
|
||||
throw new Error('NOT_FOUND');
|
||||
const passwordHash =
|
||||
input.passwordMode === 'keep'
|
||||
? existing.password_hash
|
||||
: input.passwordMode === 'replace'
|
||||
? await hashPassword(input.password)
|
||||
: null;
|
||||
const database = getDatabase();
|
||||
database.transaction(() => {
|
||||
const result = database
|
||||
.prepare(
|
||||
`UPDATE show_shares SET scope = ?, password_hash = ?, expires_at_utc = ?
|
||||
WHERE id = ? AND revoked_at_utc IS NULL`
|
||||
)
|
||||
.run(input.scope, passwordHash, expiresAtUtc, shareId);
|
||||
if (result.changes !== 1) throw new Error('NOT_FOUND');
|
||||
database.prepare('DELETE FROM show_share_sessions WHERE share_id = ?').run(shareId);
|
||||
})();
|
||||
}
|
||||
|
||||
export function replaceShareToken(
|
||||
actor: AuthUser,
|
||||
shareId: string,
|
||||
expectedShowId?: string
|
||||
): string {
|
||||
requireBarkeeperActor(actor);
|
||||
const token = createToken();
|
||||
const database = getDatabase();
|
||||
database.transaction(() => {
|
||||
const result = database
|
||||
.prepare(
|
||||
`UPDATE show_shares SET token_hash = ?
|
||||
WHERE id = ? AND revoked_at_utc IS NULL${expectedShowId ? ' AND show_id = ?' : ''}`
|
||||
)
|
||||
.run(hashToken(token), ...(expectedShowId ? [shareId, expectedShowId] : [shareId]));
|
||||
if (result.changes !== 1) throw new Error('NOT_FOUND');
|
||||
database.prepare('DELETE FROM show_share_sessions WHERE share_id = ?').run(shareId);
|
||||
})();
|
||||
return token;
|
||||
}
|
||||
|
||||
export function deleteShare(actor: AuthUser, shareId: string, expectedShowId?: string): void {
|
||||
requireBarkeeperActor(actor);
|
||||
const result = getDatabase()
|
||||
.prepare(`DELETE FROM show_shares WHERE id = ?${expectedShowId ? ' AND show_id = ?' : ''}`)
|
||||
.run(...(expectedShowId ? [shareId, expectedShowId] : [shareId]));
|
||||
if (result.changes !== 1) throw new Error('NOT_FOUND');
|
||||
}
|
||||
|
||||
export function revokeShare(actor: AuthUser, shareId: string): void {
|
||||
requireBarkeeperActor(actor);
|
||||
const database = getDatabase();
|
||||
database.transaction(() => {
|
||||
const result = database
|
||||
.prepare('UPDATE show_shares SET revoked_at_utc = ? WHERE id = ? AND revoked_at_utc IS NULL')
|
||||
.run(new Date().toISOString(), shareId);
|
||||
if (result.changes !== 1) throw new Error('NOT_FOUND');
|
||||
database.prepare('DELETE FROM show_share_sessions WHERE share_id = ?').run(shareId);
|
||||
})();
|
||||
}
|
||||
|
||||
export function shareAccessState(rawToken: string, sessionToken?: string) {
|
||||
const share = activeShare(rawToken);
|
||||
if (!share) return { status: 'unavailable' as const };
|
||||
if (!share.password_hash) return { status: 'authorized' as const, share };
|
||||
if (!sessionToken) return { status: 'password' as const };
|
||||
const session = getDatabase()
|
||||
.prepare(
|
||||
`SELECT 1 FROM show_share_sessions WHERE token_hash = ? AND share_id = ?
|
||||
AND expires_at_utc > ?`
|
||||
)
|
||||
.get(hashToken(sessionToken), share.id, new Date().toISOString());
|
||||
return session ? { status: 'authorized' as const, share } : { status: 'password' as const };
|
||||
}
|
||||
|
||||
export async function authenticateShare(rawToken: string, password: string, address: string) {
|
||||
const share = activeShare(rawToken);
|
||||
if (!share?.password_hash) throw new Error('SHARE_UNAVAILABLE');
|
||||
const database = getDatabase();
|
||||
const now = new Date();
|
||||
const since = new Date(now.getTime() - PASSWORD_ATTEMPT_WINDOW_MS).toISOString();
|
||||
const shareKey = hashToken(rawToken);
|
||||
const addressKey = hashToken(address || 'unknown');
|
||||
database.prepare('DELETE FROM share_password_attempts WHERE attempted_at_utc < ?').run(since);
|
||||
const shareAttempts = database
|
||||
.prepare(
|
||||
`SELECT count(*) AS count FROM share_password_attempts
|
||||
WHERE share_key = ? AND attempted_at_utc >= ?`
|
||||
)
|
||||
.get(shareKey, since) as { count: number };
|
||||
const addressAttempts = database
|
||||
.prepare(
|
||||
`SELECT count(*) AS count FROM share_password_attempts
|
||||
WHERE address_key = ? AND attempted_at_utc >= ?`
|
||||
)
|
||||
.get(addressKey, since) as { count: number };
|
||||
if (
|
||||
shareAttempts.count >= SHARE_PASSWORD_ATTEMPT_LIMIT ||
|
||||
addressAttempts.count >= ADDRESS_PASSWORD_ATTEMPT_LIMIT
|
||||
) {
|
||||
throw new Error('RATE_LIMITED');
|
||||
}
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO share_password_attempts
|
||||
(id, share_key, address_key, attempted_at_utc) VALUES (?, ?, ?, ?)`
|
||||
)
|
||||
.run(randomUUID(), shareKey, addressKey, now.toISOString());
|
||||
if (!(await verifyPassword(share.password_hash, password))) throw new Error('INVALID_PASSWORD');
|
||||
const token = createToken();
|
||||
const defaultExpiry = now.getTime() + 12 * 60 * 60 * 1000;
|
||||
const shareExpiry = share.expires_at_utc
|
||||
? new Date(share.expires_at_utc).getTime()
|
||||
: defaultExpiry;
|
||||
const expires = new Date(Math.min(defaultExpiry, shareExpiry));
|
||||
database.prepare('DELETE FROM share_password_attempts WHERE share_key = ?').run(shareKey);
|
||||
database
|
||||
.prepare('DELETE FROM show_share_sessions WHERE expires_at_utc <= ?')
|
||||
.run(now.toISOString());
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO show_share_sessions (token_hash, share_id, created_at_utc, expires_at_utc)
|
||||
VALUES (?, ?, ?, ?)`
|
||||
)
|
||||
.run(hashToken(token), share.id, now.toISOString(), expires.toISOString());
|
||||
return { token, expires };
|
||||
}
|
||||
|
||||
export function getSharedShow(rawToken: string, sessionToken?: string) {
|
||||
const access = shareAccessState(rawToken, sessionToken);
|
||||
if (access.status !== 'authorized' || !access.share) return access;
|
||||
const share = access.share;
|
||||
const database = getDatabase();
|
||||
const show = database
|
||||
.prepare('SELECT title, starts_at_utc, status, completed_at_utc FROM shows WHERE id = ?')
|
||||
.get(share.show_id) as {
|
||||
title: string;
|
||||
starts_at_utc: string | null;
|
||||
status: ShowStatus;
|
||||
completed_at_utc: string | null;
|
||||
};
|
||||
const sections = database
|
||||
.prepare(
|
||||
`SELECT s.id, s.name, s.category_name_snapshot, s.category_color_snapshot,
|
||||
c.name AS category_name, c.color AS category_color,
|
||||
s.explicit_duration_seconds, s.position FROM show_sections s
|
||||
LEFT JOIN section_categories c ON c.id = s.category_id
|
||||
WHERE s.show_id = ? AND s.is_reserve_bank = 0 ORDER BY s.position`
|
||||
)
|
||||
.all(share.show_id) as {
|
||||
id: string;
|
||||
name: string;
|
||||
category_name_snapshot: string | null;
|
||||
category_color_snapshot: string | null;
|
||||
category_name: string | null;
|
||||
category_color: string | null;
|
||||
explicit_duration_seconds: number | null;
|
||||
position: number;
|
||||
}[];
|
||||
const usageStatement = database.prepare(
|
||||
`SELECT u.id, u.title_snapshot, u.output_title_snapshot, u.status, u.duration_seconds,
|
||||
u.intro_snapshot, u.research_snapshot, u.moderation_snapshot, u.interaction_snapshot,
|
||||
u.transition_snapshot, u.own_notes,
|
||||
COALESCE((SELECT actual_duration_seconds FROM piece_usage_history WHERE usage_id = u.id), 0)
|
||||
AS actual_duration_seconds
|
||||
FROM piece_usages u WHERE u.show_section_id = ? ORDER BY u.position`
|
||||
);
|
||||
const sourceStatement = database.prepare(
|
||||
'SELECT label, url, timecode_seconds FROM usage_source_snapshots WHERE usage_id = ? ORDER BY position'
|
||||
);
|
||||
const toolStatement = database.prepare(
|
||||
`SELECT name, start_url, work_url, note FROM usage_tool_snapshots
|
||||
WHERE usage_id = ? ORDER BY position`
|
||||
);
|
||||
const mediaStatement = database.prepare(
|
||||
`SELECT id, alt_text FROM usage_media_snapshots
|
||||
WHERE usage_id = ? AND is_presentation = 1`
|
||||
);
|
||||
const includesModeration = share.scope === 'moderation' || share.scope === 'research';
|
||||
const includesResearch = share.scope === 'research';
|
||||
return {
|
||||
status: 'authorized' as const,
|
||||
share: {
|
||||
scope: share.scope,
|
||||
title: show.title,
|
||||
startsAtUtc: show.starts_at_utc,
|
||||
completedAtUtc: show.completed_at_utc,
|
||||
isCompleted: show.status === 'completed',
|
||||
sections: sections.map((section) => {
|
||||
const usages = usageStatement.all(section.id) as {
|
||||
id: string;
|
||||
title_snapshot: string;
|
||||
output_title_snapshot: string;
|
||||
status: string;
|
||||
duration_seconds: number;
|
||||
actual_duration_seconds: number;
|
||||
intro_snapshot: string;
|
||||
research_snapshot: string;
|
||||
moderation_snapshot: string;
|
||||
interaction_snapshot: string;
|
||||
transition_snapshot: string;
|
||||
own_notes: string;
|
||||
}[];
|
||||
return {
|
||||
name: section.name,
|
||||
category:
|
||||
show.status === 'completed' ? section.category_name_snapshot : section.category_name,
|
||||
categoryColor:
|
||||
show.status === 'completed' ? section.category_color_snapshot : section.category_color,
|
||||
explicitDurationSeconds: section.explicit_duration_seconds,
|
||||
usages: usages.map((usage) => ({
|
||||
title: usage.title_snapshot,
|
||||
outputTitle: usage.output_title_snapshot,
|
||||
status: usage.status,
|
||||
durationSeconds: usage.duration_seconds,
|
||||
actualDurationSeconds: usage.actual_duration_seconds,
|
||||
media: mediaStatement.get(usage.id) as { id: string; alt_text: string } | undefined,
|
||||
...(includesModeration
|
||||
? {
|
||||
introHtml: renderMarkdown(usage.intro_snapshot),
|
||||
moderationHtml: renderMarkdown(usage.moderation_snapshot),
|
||||
interactionHtml: renderMarkdown(usage.interaction_snapshot),
|
||||
transitionHtml: renderMarkdown(usage.transition_snapshot)
|
||||
}
|
||||
: {}),
|
||||
...(includesResearch
|
||||
? {
|
||||
researchHtml: renderMarkdown(usage.research_snapshot),
|
||||
sources: sourceStatement.all(usage.id) as {
|
||||
label: string;
|
||||
url: string;
|
||||
timecode_seconds: number | null;
|
||||
}[],
|
||||
tools: (
|
||||
toolStatement.all(usage.id) as {
|
||||
name: string;
|
||||
start_url: string;
|
||||
work_url: string;
|
||||
note: string;
|
||||
}[]
|
||||
).map((tool) => ({ name: tool.name, note: tool.note }))
|
||||
}
|
||||
: {})
|
||||
}))
|
||||
};
|
||||
})
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
export async function getSharedMedia(
|
||||
rawToken: string,
|
||||
sessionToken: string | undefined,
|
||||
snapshotMediaId: string
|
||||
) {
|
||||
const access = shareAccessState(rawToken, sessionToken);
|
||||
if (access.status !== 'authorized' || !access.share) return null;
|
||||
const row = getDatabase()
|
||||
.prepare(
|
||||
`SELECT pm.storage_name, pm.mime_type, pm.byte_size
|
||||
FROM usage_media_snapshots ums
|
||||
JOIN piece_usages u ON u.id = ums.usage_id
|
||||
JOIN show_sections s ON s.id = u.show_section_id
|
||||
JOIN piece_media pm ON pm.id = ums.original_media_id
|
||||
WHERE ums.id = ? AND ums.is_presentation = 1 AND s.show_id = ?
|
||||
AND s.is_reserve_bank = 0`
|
||||
)
|
||||
.get(snapshotMediaId, access.share.show_id) as
|
||||
{ storage_name: string; mime_type: string; byte_size: number } | undefined;
|
||||
if (!row) return null;
|
||||
return {
|
||||
data: await readFile(path.join(getServerPaths().uploads, row.storage_name)),
|
||||
mimeType: row.mime_type,
|
||||
byteSize: row.byte_size
|
||||
};
|
||||
}
|
||||
@@ -13,6 +13,7 @@ import {
|
||||
duplicatePieceUsage,
|
||||
getPieceUsageContexts,
|
||||
getShow,
|
||||
listPreparationUsages,
|
||||
listShowTemplates,
|
||||
movePieceUsage,
|
||||
moveShowSection,
|
||||
@@ -60,12 +61,57 @@ function editedUsage(usage: PieceUsage, overrides: Partial<PieceUsage> = {}) {
|
||||
presentationImageUrl: edited.presentationImageUrl,
|
||||
presentationSiteName: edited.presentationSiteName,
|
||||
presentationMediaId: edited.presentationMediaId,
|
||||
preparationStatus: edited.preparationStatus,
|
||||
preparationEffort: edited.preparationEffort,
|
||||
ownNotes: edited.ownNotes,
|
||||
durationSeconds: edited.durationSeconds
|
||||
};
|
||||
}
|
||||
|
||||
describe('show builder data layer', () => {
|
||||
it('tracks preparation on the concrete usage independently from its original', () => {
|
||||
const database = getDatabase();
|
||||
database
|
||||
.prepare(
|
||||
"UPDATE pieces SET status = 'preparing', preparation_effort = 'high' WHERE id = 'piece-console'"
|
||||
)
|
||||
.run();
|
||||
database.prepare("UPDATE pieces SET status = 'preparing' WHERE id = 'piece-sounds'").run();
|
||||
const show = getShow('show-october')!;
|
||||
const planned = addPieceUsage(show.id, show.revision, {
|
||||
pieceId: 'piece-console',
|
||||
sectionId: show.sections[0].id
|
||||
});
|
||||
|
||||
database
|
||||
.prepare(
|
||||
"UPDATE pieces SET status = 'ready', preparation_effort = 'low' WHERE id = 'piece-console'"
|
||||
)
|
||||
.run();
|
||||
const usages = listPreparationUsages();
|
||||
expect(usages.map((usage) => usage.usageId)).toEqual([planned.id]);
|
||||
expect(usages[0]).toMatchObject({
|
||||
showId: 'show-october',
|
||||
showTitle: 'Herbstsendung: Kleine Welten',
|
||||
sectionName: show.sections[0].name,
|
||||
title: 'Die kleine Konsole mit dem großen Dreh',
|
||||
preparationEffort: 'high',
|
||||
topics: [{ name: 'Gaming' }]
|
||||
});
|
||||
expect(usages.some((usage) => usage.title === 'Drei Sounds, ein Spiel')).toBe(false);
|
||||
|
||||
const plannedUsage = getShow(show.id)!.sections[0].usages.find(
|
||||
(usage) => usage.id === planned.id
|
||||
)!;
|
||||
updatePieceUsage(
|
||||
show.id,
|
||||
planned.id,
|
||||
planned.revision,
|
||||
editedUsage(plannedUsage, { preparationStatus: 'ready' })
|
||||
);
|
||||
expect(listPreparationUsages()).toEqual([]);
|
||||
});
|
||||
|
||||
it('creates a fundus original and usage atomically and idempotently', () => {
|
||||
const created = createShow({ title: 'Direkte Planung', startsAtUtc: null, templateId: null });
|
||||
const section = addShowSection(created.id, created.revision, {
|
||||
@@ -253,7 +299,29 @@ describe('show builder data layer', () => {
|
||||
getDatabase()
|
||||
.prepare("UPDATE piece_usages SET status = 'skipped' WHERE id = ?")
|
||||
.run(skipped.id);
|
||||
getDatabase().prepare("UPDATE shows SET status = 'completed' WHERE id = ?").run(completed.id);
|
||||
getDatabase()
|
||||
.prepare(
|
||||
"UPDATE shows SET status = 'completed', completed_at_utc = starts_at_utc WHERE id = ?"
|
||||
)
|
||||
.run(completed.id);
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`INSERT INTO show_finalizations
|
||||
(show_id, command_id, source_revision, finalized_at_utc)
|
||||
SELECT id, 'test-finalization', revision, starts_at_utc FROM shows WHERE id = ?`
|
||||
)
|
||||
.run(completed.id);
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`INSERT INTO piece_usage_history
|
||||
(usage_id, show_id, original_piece_id, show_title_snapshot, usage_title_snapshot,
|
||||
used_at_utc, actual_duration_seconds)
|
||||
SELECT u.id, sh.id, u.original_piece_id, sh.title, u.title_snapshot,
|
||||
sh.starts_at_utc, 0 FROM piece_usages u
|
||||
JOIN show_sections s ON s.id = u.show_section_id
|
||||
JOIN shows sh ON sh.id = s.show_id WHERE u.id = ?`
|
||||
)
|
||||
.run(done.id);
|
||||
|
||||
const active = createShow({ title: 'Aktuelle Planung', startsAtUtc: null, templateId: null });
|
||||
const activeSection = addShowSection(active.id, active.revision, {
|
||||
|
||||
+398
-65
@@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto';
|
||||
import type Database from 'better-sqlite3';
|
||||
import { createPiece } from './content.js';
|
||||
import { getDatabase } from './database.js';
|
||||
import { detectVideoProvider, type PresentationMode } from './presentation.js';
|
||||
import { detectVideoProvider, type PresentationMode, type VideoProvider } from './presentation.js';
|
||||
|
||||
export const SHOW_STATUSES = ['draft', 'ready', 'live', 'completed'] as const;
|
||||
export const USAGE_STATUSES = ['open', 'current', 'done', 'skipped'] as const;
|
||||
@@ -10,6 +10,8 @@ export const USAGE_STATUSES = ['open', 'current', 'done', 'skipped'] as const;
|
||||
export type ShowStatus = (typeof SHOW_STATUSES)[number];
|
||||
export type EditableShowStatus = Exclude<ShowStatus, 'completed'>;
|
||||
export type UsageStatus = (typeof USAGE_STATUSES)[number];
|
||||
export type UsagePreparationStatus = 'preparing' | 'ready';
|
||||
export type PreparationEffort = 'low' | 'medium' | 'high' | null;
|
||||
|
||||
export type ShowListItem = {
|
||||
id: string;
|
||||
@@ -21,12 +23,24 @@ export type ShowListItem = {
|
||||
sectionCount: number;
|
||||
};
|
||||
|
||||
export type PreparationUsage = {
|
||||
usageId: string;
|
||||
showId: string;
|
||||
showTitle: string;
|
||||
showStartsAtUtc: string | null;
|
||||
sectionName: string;
|
||||
title: string;
|
||||
preparationEffort: PreparationEffort;
|
||||
topics: UsageTopic[];
|
||||
};
|
||||
|
||||
export type ShowTemplateSection = {
|
||||
id: string;
|
||||
name: string;
|
||||
categoryId: string | null;
|
||||
position: number;
|
||||
explicitDurationSeconds: number | null;
|
||||
twitchTags: string[];
|
||||
};
|
||||
|
||||
export type ShowTemplate = {
|
||||
@@ -41,12 +55,15 @@ export type PieceUsage = {
|
||||
originalPieceId: string | null;
|
||||
position: number;
|
||||
status: UsageStatus;
|
||||
preparationStatus: UsagePreparationStatus;
|
||||
preparationEffort: PreparationEffort;
|
||||
durationSeconds: number;
|
||||
title: string;
|
||||
outputTitle: string;
|
||||
intro: string;
|
||||
research: string;
|
||||
moderation: string;
|
||||
interaction: string;
|
||||
transition: string;
|
||||
presentation: string;
|
||||
presentationMode: PresentationMode;
|
||||
@@ -57,7 +74,7 @@ export type PieceUsage = {
|
||||
presentationDescription: string;
|
||||
presentationImageUrl: string;
|
||||
presentationSiteName: string;
|
||||
presentationProvider: string;
|
||||
presentationProvider: VideoProvider | '';
|
||||
presentationProviderId: string;
|
||||
ownNotes: string;
|
||||
sources: { id: string; label: string; url: string; timecodeSeconds: number | null }[];
|
||||
@@ -105,6 +122,7 @@ export type ShowSection = {
|
||||
categoryColor: string | null;
|
||||
position: number;
|
||||
explicitDurationSeconds: number | null;
|
||||
twitchTags: string[];
|
||||
durationSeconds: number;
|
||||
usages: PieceUsage[];
|
||||
};
|
||||
@@ -119,6 +137,7 @@ export type Show = {
|
||||
revision: number;
|
||||
createdAtUtc: string;
|
||||
updatedAtUtc: string;
|
||||
completedAtUtc: string | null;
|
||||
sections: ShowSection[];
|
||||
reserve: PieceUsage[];
|
||||
totalDurationSeconds: number;
|
||||
@@ -142,6 +161,7 @@ export type ShowSectionInput = {
|
||||
name: string;
|
||||
categoryId: string | null;
|
||||
explicitDurationSeconds: number | null;
|
||||
twitchTags?: string[];
|
||||
position?: number;
|
||||
};
|
||||
|
||||
@@ -157,6 +177,7 @@ export type PieceUsageUpdate = {
|
||||
intro: string;
|
||||
research: string;
|
||||
moderation: string;
|
||||
interaction?: string;
|
||||
transition: string;
|
||||
presentation: string;
|
||||
presentationMode: PresentationMode;
|
||||
@@ -169,6 +190,8 @@ export type PieceUsageUpdate = {
|
||||
presentationSiteName: string;
|
||||
ownNotes: string;
|
||||
durationSeconds: number;
|
||||
preparationStatus?: UsagePreparationStatus;
|
||||
preparationEffort?: PreparationEffort;
|
||||
tools?: { id: string; workUrl: string; note: string }[];
|
||||
presentationMediaId?: string | null;
|
||||
};
|
||||
@@ -191,6 +214,7 @@ type ShowRow = {
|
||||
revision: number;
|
||||
created_at_utc: string;
|
||||
updated_at_utc: string;
|
||||
completed_at_utc: string | null;
|
||||
};
|
||||
|
||||
type SectionRow = {
|
||||
@@ -199,8 +223,11 @@ type SectionRow = {
|
||||
category_id: string | null;
|
||||
category: string | null;
|
||||
category_color: string | null;
|
||||
category_name_snapshot: string | null;
|
||||
category_color_snapshot: string | null;
|
||||
position: number;
|
||||
explicit_duration_seconds: number | null;
|
||||
twitch_tags: string;
|
||||
is_reserve_bank: number;
|
||||
};
|
||||
|
||||
@@ -210,15 +237,19 @@ type UsageRow = {
|
||||
original_piece_id: string | null;
|
||||
position: number;
|
||||
status: UsageStatus;
|
||||
preparation_status_snapshot: UsagePreparationStatus;
|
||||
preparation_effort_snapshot: PreparationEffort;
|
||||
duration_seconds: number;
|
||||
title_snapshot: string;
|
||||
output_title_snapshot: string;
|
||||
intro_snapshot: string;
|
||||
research_snapshot: string;
|
||||
moderation_snapshot: string;
|
||||
interaction_snapshot: string;
|
||||
transition_snapshot: string;
|
||||
presentation_snapshot: string;
|
||||
presentation_mode_snapshot: PresentationMode;
|
||||
presentation_image_only_snapshot: number;
|
||||
presentation_source_label_snapshot: string;
|
||||
presentation_source_url_snapshot: string;
|
||||
presentation_source_timecode_snapshot: number | null;
|
||||
@@ -226,7 +257,7 @@ type UsageRow = {
|
||||
presentation_description_snapshot: string;
|
||||
presentation_image_url_snapshot: string;
|
||||
presentation_site_name_snapshot: string;
|
||||
presentation_provider_snapshot: string;
|
||||
presentation_provider_snapshot: VideoProvider | '';
|
||||
presentation_provider_id_snapshot: string;
|
||||
own_notes: string;
|
||||
};
|
||||
@@ -247,6 +278,14 @@ function validDuration(value: number | null): number | null {
|
||||
return value;
|
||||
}
|
||||
|
||||
function validTwitchTags(values: string[]) {
|
||||
const tags = [...new Set(values.map((tag) => tag.trim()).filter(Boolean))];
|
||||
if (tags.length > 10 || tags.some((tag) => tag.length > 25 || tag.includes(','))) {
|
||||
throw new Error('INVALID_TWITCH_TAGS');
|
||||
}
|
||||
return tags;
|
||||
}
|
||||
|
||||
function validPosition(value: number, maximum: number): number {
|
||||
if (!Number.isInteger(value) || value < 0) throw new Error('INVALID_POSITION');
|
||||
return Math.min(value, maximum);
|
||||
@@ -270,7 +309,7 @@ function validPresentation(
|
||||
imageUrl: string,
|
||||
siteName: string
|
||||
) {
|
||||
if (!['text', 'link', 'video'].includes(mode)) throw new Error('INVALID_PRESENTATION');
|
||||
if (!['text', 'image', 'link', 'video'].includes(mode)) throw new Error('INVALID_PRESENTATION');
|
||||
const cleanUrl = cleanText(sourceUrl, 2_000, 'presentation_source');
|
||||
const cleanImageUrl = cleanText(imageUrl, 2_000, 'presentation_image');
|
||||
for (const value of [cleanUrl, cleanImageUrl]) {
|
||||
@@ -282,7 +321,7 @@ function validPresentation(
|
||||
throw new Error('INVALID_PRESENTATION');
|
||||
}
|
||||
}
|
||||
if (mode !== 'text' && !cleanUrl) throw new Error('INVALID_PRESENTATION');
|
||||
if ((mode === 'link' || mode === 'video') && !cleanUrl) throw new Error('INVALID_PRESENTATION');
|
||||
if (
|
||||
timecodeSeconds !== null &&
|
||||
(!Number.isInteger(timecodeSeconds) || timecodeSeconds < 0 || timecodeSeconds > 86_400)
|
||||
@@ -439,12 +478,15 @@ function usageFromRow(database: Database.Database, row: UsageRow): PieceUsage {
|
||||
originalPieceId: row.original_piece_id,
|
||||
position: row.position,
|
||||
status: row.status,
|
||||
preparationStatus: row.preparation_status_snapshot,
|
||||
preparationEffort: row.preparation_effort_snapshot,
|
||||
durationSeconds: row.duration_seconds,
|
||||
title: row.title_snapshot,
|
||||
outputTitle: row.output_title_snapshot,
|
||||
intro: row.intro_snapshot,
|
||||
research: row.research_snapshot,
|
||||
moderation: row.moderation_snapshot,
|
||||
interaction: row.interaction_snapshot,
|
||||
transition: row.transition_snapshot,
|
||||
presentation: row.presentation_snapshot,
|
||||
presentationMode: row.presentation_mode_snapshot,
|
||||
@@ -709,7 +751,11 @@ function copyUsageRelations(database: Database.Database, sourceUsageId: string,
|
||||
.run(usageId, sourceUsageId);
|
||||
}
|
||||
|
||||
export function listShows(): ShowListItem[] {
|
||||
export function listShows(statuses?: ShowStatus[]): ShowListItem[] {
|
||||
const requestedStatuses = statuses?.filter((status) => SHOW_STATUSES.includes(status));
|
||||
const where = requestedStatuses?.length
|
||||
? `WHERE sh.status IN (${requestedStatuses.map(() => '?').join(', ')})`
|
||||
: '';
|
||||
return (
|
||||
getDatabase()
|
||||
.prepare(
|
||||
@@ -720,10 +766,11 @@ export function listShows(): ShowListItem[] {
|
||||
(SELECT sum(u.duration_seconds) FROM piece_usages u WHERE u.show_section_id = s.id))
|
||||
ELSE 0 END), 0) AS total_duration_seconds
|
||||
FROM shows sh LEFT JOIN show_sections s ON s.show_id = sh.id
|
||||
${where}
|
||||
GROUP BY sh.id
|
||||
ORDER BY sh.starts_at_utc IS NULL, sh.starts_at_utc DESC, sh.created_at_utc DESC`
|
||||
)
|
||||
.all() as {
|
||||
.all(...(requestedStatuses ?? [])) as {
|
||||
id: string;
|
||||
title: string;
|
||||
starts_at_utc: string | null;
|
||||
@@ -743,13 +790,57 @@ export function listShows(): ShowListItem[] {
|
||||
}));
|
||||
}
|
||||
|
||||
export function listPreparationUsages(): PreparationUsage[] {
|
||||
const database = getDatabase();
|
||||
const rows = database
|
||||
.prepare(
|
||||
`SELECT u.id AS usage_id, sh.id AS show_id, sh.title AS show_title,
|
||||
sh.starts_at_utc AS show_starts_at_utc, s.name AS section_name,
|
||||
u.title_snapshot, u.preparation_effort_snapshot
|
||||
FROM piece_usages u
|
||||
JOIN show_sections s ON s.id = u.show_section_id
|
||||
JOIN shows sh ON sh.id = s.show_id
|
||||
WHERE sh.status IN ('draft', 'ready', 'live')
|
||||
AND s.is_reserve_bank = 0 AND u.preparation_status_snapshot = 'preparing'
|
||||
ORDER BY sh.starts_at_utc IS NULL, sh.starts_at_utc,
|
||||
CASE u.preparation_effort_snapshot
|
||||
WHEN 'high' THEN 0 WHEN 'medium' THEN 1 WHEN 'low' THEN 2 ELSE 3 END,
|
||||
s.position, u.position`
|
||||
)
|
||||
.all() as {
|
||||
usage_id: string;
|
||||
show_id: string;
|
||||
show_title: string;
|
||||
show_starts_at_utc: string | null;
|
||||
section_name: string;
|
||||
title_snapshot: string;
|
||||
preparation_effort_snapshot: PreparationUsage['preparationEffort'];
|
||||
}[];
|
||||
const topics = database.prepare(
|
||||
'SELECT name, icon_name FROM usage_topic_snapshots WHERE usage_id = ? ORDER BY position'
|
||||
);
|
||||
return rows.map((row) => ({
|
||||
usageId: row.usage_id,
|
||||
showId: row.show_id,
|
||||
showTitle: row.show_title,
|
||||
showStartsAtUtc: row.show_starts_at_utc,
|
||||
sectionName: row.section_name,
|
||||
title: row.title_snapshot,
|
||||
preparationEffort: row.preparation_effort_snapshot,
|
||||
topics: (topics.all(row.usage_id) as { name: string; icon_name: string }[]).map((topic) => ({
|
||||
name: topic.name,
|
||||
iconName: topic.icon_name
|
||||
}))
|
||||
}));
|
||||
}
|
||||
|
||||
export function listShowTemplates(): ShowTemplate[] {
|
||||
const database = getDatabase();
|
||||
const templates = database
|
||||
.prepare('SELECT id, name, description FROM show_templates ORDER BY name')
|
||||
.all() as Omit<ShowTemplate, 'sections'>[];
|
||||
const sectionStatement = database.prepare(
|
||||
`SELECT id, name, category_id, position, explicit_duration_seconds
|
||||
`SELECT id, name, category_id, position, explicit_duration_seconds, twitch_tags
|
||||
FROM show_template_sections WHERE template_id = ? ORDER BY position`
|
||||
);
|
||||
return templates.map((template) => ({
|
||||
@@ -761,13 +852,15 @@ export function listShowTemplates(): ShowTemplate[] {
|
||||
category_id: string | null;
|
||||
position: number;
|
||||
explicit_duration_seconds: number | null;
|
||||
twitch_tags: string;
|
||||
}[]
|
||||
).map((section) => ({
|
||||
id: section.id,
|
||||
name: section.name,
|
||||
categoryId: section.category_id,
|
||||
position: section.position,
|
||||
explicitDurationSeconds: section.explicit_duration_seconds
|
||||
explicitDurationSeconds: section.explicit_duration_seconds,
|
||||
twitchTags: section.twitch_tags ? section.twitch_tags.split(',') : []
|
||||
}))
|
||||
}));
|
||||
}
|
||||
@@ -777,14 +870,15 @@ export function getShow(id: string): Show | null {
|
||||
const show = database
|
||||
.prepare(
|
||||
`SELECT id, title, starts_at_utc, twitch_title, announcement_text, status, revision,
|
||||
created_at_utc, updated_at_utc FROM shows WHERE id = ?`
|
||||
created_at_utc, updated_at_utc, completed_at_utc FROM shows WHERE id = ?`
|
||||
)
|
||||
.get(id) as ShowRow | undefined;
|
||||
if (!show) return null;
|
||||
const sectionRows = database
|
||||
.prepare(
|
||||
`SELECT s.id, s.name, s.category_id, c.name AS category, c.color AS category_color,
|
||||
s.position, s.explicit_duration_seconds, s.is_reserve_bank
|
||||
s.category_name_snapshot, s.category_color_snapshot,
|
||||
s.position, s.explicit_duration_seconds, s.twitch_tags, s.is_reserve_bank
|
||||
FROM show_sections s LEFT JOIN section_categories c ON c.id = s.category_id
|
||||
WHERE s.show_id = ? ORDER BY s.position`
|
||||
)
|
||||
@@ -792,9 +886,12 @@ export function getShow(id: string): Show | null {
|
||||
const usageRows = database
|
||||
.prepare(
|
||||
`SELECT u.id, u.show_section_id, u.original_piece_id, u.position, u.status,
|
||||
u.preparation_status_snapshot, u.preparation_effort_snapshot,
|
||||
u.duration_seconds, u.title_snapshot, u.output_title_snapshot, u.intro_snapshot, u.research_snapshot,
|
||||
u.moderation_snapshot, u.transition_snapshot, u.presentation_snapshot,
|
||||
u.presentation_mode_snapshot, u.presentation_source_label_snapshot,
|
||||
u.moderation_snapshot, u.interaction_snapshot, u.transition_snapshot, u.presentation_snapshot,
|
||||
CASE WHEN u.presentation_image_only_snapshot = 1 THEN 'image' ELSE u.presentation_mode_snapshot END AS presentation_mode_snapshot,
|
||||
u.presentation_image_only_snapshot,
|
||||
u.presentation_source_label_snapshot,
|
||||
u.presentation_source_url_snapshot, u.presentation_source_timecode_snapshot,
|
||||
u.presentation_title_meta_snapshot, u.presentation_description_snapshot,
|
||||
u.presentation_image_url_snapshot, u.presentation_site_name_snapshot,
|
||||
@@ -817,10 +914,17 @@ export function getShow(id: string): Show | null {
|
||||
id: row.id,
|
||||
name: row.name,
|
||||
categoryId: row.category_id,
|
||||
category: row.category,
|
||||
categoryColor: row.category_color,
|
||||
category:
|
||||
show.status === 'completed'
|
||||
? row.category_name_snapshot
|
||||
: (row.category_name_snapshot ?? row.category),
|
||||
categoryColor:
|
||||
show.status === 'completed'
|
||||
? row.category_color_snapshot
|
||||
: (row.category_color_snapshot ?? row.category_color),
|
||||
position: row.position,
|
||||
explicitDurationSeconds: row.explicit_duration_seconds,
|
||||
twitchTags: row.twitch_tags ? row.twitch_tags.split(',') : [],
|
||||
durationSeconds:
|
||||
row.explicit_duration_seconds ??
|
||||
usages.reduce((total, usage) => total + usage.durationSeconds, 0),
|
||||
@@ -838,6 +942,7 @@ export function getShow(id: string): Show | null {
|
||||
revision: show.revision,
|
||||
createdAtUtc: show.created_at_utc,
|
||||
updatedAtUtc: show.updated_at_utc,
|
||||
completedAtUtc: show.completed_at_utc,
|
||||
sections,
|
||||
reserve: reserveRow ? (usagesBySection.get(reserveRow.id) ?? []) : [],
|
||||
totalDurationSeconds: sections.reduce((total, section) => total + section.durationSeconds, 0)
|
||||
@@ -864,14 +969,9 @@ export function getPieceUsageContexts(
|
||||
const database = getDatabase();
|
||||
const history = database
|
||||
.prepare(
|
||||
`SELECT u.id AS usage_id, u.original_piece_id, sh.id AS show_id,
|
||||
sh.title AS show_title, COALESCE(sh.starts_at_utc, sh.updated_at_utc) AS used_at_utc
|
||||
FROM piece_usages u
|
||||
JOIN show_sections s ON s.id = u.show_section_id
|
||||
JOIN shows sh ON sh.id = s.show_id
|
||||
WHERE u.original_piece_id IS NOT NULL AND u.status = 'done'
|
||||
AND sh.status = 'completed' AND s.is_reserve_bank = 0
|
||||
ORDER BY used_at_utc DESC, u.id DESC`
|
||||
`SELECT usage_id, original_piece_id, show_id,
|
||||
show_title_snapshot AS show_title, used_at_utc
|
||||
FROM piece_usage_history ORDER BY used_at_utc DESC, usage_id DESC`
|
||||
)
|
||||
.all() as {
|
||||
usage_id: string;
|
||||
@@ -941,7 +1041,7 @@ export function createShow(input: CreateShowInput): CreatedMutationResult {
|
||||
const templateSections = input.templateId
|
||||
? (database
|
||||
.prepare(
|
||||
`SELECT name, category_id, position, explicit_duration_seconds
|
||||
`SELECT name, category_id, position, explicit_duration_seconds, twitch_tags
|
||||
FROM show_template_sections WHERE template_id = ? ORDER BY position`
|
||||
)
|
||||
.all(input.templateId) as {
|
||||
@@ -949,11 +1049,12 @@ export function createShow(input: CreateShowInput): CreatedMutationResult {
|
||||
category_id: string | null;
|
||||
position: number;
|
||||
explicit_duration_seconds: number | null;
|
||||
twitch_tags: string;
|
||||
}[])
|
||||
: [];
|
||||
const insertSection = database.prepare(
|
||||
`INSERT INTO show_sections (id, show_id, name, category_id, position,
|
||||
explicit_duration_seconds, is_reserve_bank) VALUES (?, ?, ?, ?, ?, ?, ?)`
|
||||
explicit_duration_seconds, twitch_tags, is_reserve_bank) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
|
||||
);
|
||||
for (const section of templateSections) {
|
||||
insertSection.run(
|
||||
@@ -963,15 +1064,154 @@ export function createShow(input: CreateShowInput): CreatedMutationResult {
|
||||
section.category_id,
|
||||
section.position,
|
||||
section.explicit_duration_seconds,
|
||||
section.twitch_tags,
|
||||
0
|
||||
);
|
||||
}
|
||||
insertSection.run(randomUUID(), id, 'Reservebank', null, templateSections.length, null, 1);
|
||||
insertSection.run(randomUUID(), id, 'Reservebank', null, templateSections.length, null, '', 1);
|
||||
});
|
||||
create();
|
||||
return { id, revision: 1, updatedAtUtc: now };
|
||||
}
|
||||
|
||||
export function duplicateCompletedShow(
|
||||
sourceShowId: string,
|
||||
commandId: string
|
||||
): CreatedMutationResult {
|
||||
if (!commandId || commandId.length > 200) throw new Error('INVALID_COMMAND');
|
||||
const database = getDatabase();
|
||||
return database.transaction(() => {
|
||||
const duplicate = database
|
||||
.prepare(
|
||||
`SELECT created_show_id FROM show_duplication_commands
|
||||
WHERE source_show_id = ? AND command_id = ?`
|
||||
)
|
||||
.get(sourceShowId, commandId) as { created_show_id: string } | undefined;
|
||||
if (duplicate) {
|
||||
const show = database
|
||||
.prepare('SELECT revision, updated_at_utc FROM shows WHERE id = ?')
|
||||
.get(duplicate.created_show_id) as { revision: number; updated_at_utc: string };
|
||||
return {
|
||||
id: duplicate.created_show_id,
|
||||
revision: show.revision,
|
||||
updatedAtUtc: show.updated_at_utc
|
||||
};
|
||||
}
|
||||
const source = database
|
||||
.prepare(
|
||||
`SELECT sh.title, sh.twitch_title, sh.announcement_text
|
||||
FROM shows sh JOIN show_finalizations f ON f.show_id = sh.id WHERE sh.id = ?`
|
||||
)
|
||||
.get(sourceShowId) as
|
||||
{ title: string; twitch_title: string; announcement_text: string } | undefined;
|
||||
if (!source) throw new Error('NOT_FOUND');
|
||||
const id = randomUUID();
|
||||
const now = new Date().toISOString();
|
||||
const title = `${source.title} (Kopie)`.slice(0, 200);
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO shows (id, title, starts_at_utc, twitch_title, announcement_text,
|
||||
status, revision, created_at_utc, updated_at_utc)
|
||||
VALUES (?, ?, NULL, ?, ?, 'draft', 1, ?, ?)`
|
||||
)
|
||||
.run(id, title, source.twitch_title, source.announcement_text, now, now);
|
||||
|
||||
const sections = database
|
||||
.prepare(
|
||||
`SELECT id, name, category_id, category_name_snapshot, category_color_snapshot,
|
||||
position, explicit_duration_seconds, twitch_tags, is_reserve_bank
|
||||
FROM show_sections WHERE show_id = ? ORDER BY position`
|
||||
)
|
||||
.all(sourceShowId) as {
|
||||
id: string;
|
||||
name: string;
|
||||
category_id: string | null;
|
||||
category_name_snapshot: string | null;
|
||||
category_color_snapshot: string | null;
|
||||
position: number;
|
||||
explicit_duration_seconds: number | null;
|
||||
twitch_tags: string;
|
||||
is_reserve_bank: number;
|
||||
}[];
|
||||
const insertSection = database.prepare(
|
||||
`INSERT INTO show_sections (id, show_id, name, category_id, category_name_snapshot,
|
||||
category_color_snapshot, position, explicit_duration_seconds, twitch_tags, is_reserve_bank)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
|
||||
);
|
||||
const usages = database.prepare(
|
||||
'SELECT * FROM piece_usages WHERE show_section_id = ? ORDER BY position'
|
||||
);
|
||||
const insertUsage = database.prepare(
|
||||
`INSERT INTO piece_usages (id, show_section_id, original_piece_id, position, status,
|
||||
duration_seconds, title_snapshot, output_title_snapshot, intro_snapshot, research_snapshot,
|
||||
moderation_snapshot, interaction_snapshot, transition_snapshot, presentation_snapshot,
|
||||
presentation_mode_snapshot, presentation_source_label_snapshot,
|
||||
presentation_source_url_snapshot, presentation_source_timecode_snapshot,
|
||||
presentation_title_meta_snapshot, presentation_description_snapshot,
|
||||
presentation_image_url_snapshot, presentation_site_name_snapshot,
|
||||
presentation_provider_snapshot, presentation_provider_id_snapshot, presentation_image_only_snapshot,
|
||||
preparation_status_snapshot, preparation_effort_snapshot, own_notes, is_reserve)
|
||||
VALUES (?, ?, ?, ?, 'open', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
|
||||
);
|
||||
for (const section of sections) {
|
||||
const sectionId = randomUUID();
|
||||
insertSection.run(
|
||||
sectionId,
|
||||
id,
|
||||
section.name,
|
||||
section.category_id,
|
||||
section.category_name_snapshot,
|
||||
section.category_color_snapshot,
|
||||
section.position,
|
||||
section.explicit_duration_seconds,
|
||||
section.twitch_tags,
|
||||
section.is_reserve_bank
|
||||
);
|
||||
for (const usage of usages.all(section.id) as (UsageRow & { is_reserve: number })[]) {
|
||||
const usageId = randomUUID();
|
||||
insertUsage.run(
|
||||
usageId,
|
||||
sectionId,
|
||||
usage.original_piece_id,
|
||||
usage.position,
|
||||
usage.duration_seconds,
|
||||
usage.title_snapshot,
|
||||
usage.output_title_snapshot,
|
||||
usage.intro_snapshot,
|
||||
usage.research_snapshot,
|
||||
usage.moderation_snapshot,
|
||||
usage.interaction_snapshot,
|
||||
usage.transition_snapshot,
|
||||
usage.presentation_snapshot,
|
||||
usage.presentation_mode_snapshot,
|
||||
usage.presentation_source_label_snapshot,
|
||||
usage.presentation_source_url_snapshot,
|
||||
usage.presentation_source_timecode_snapshot,
|
||||
usage.presentation_title_meta_snapshot,
|
||||
usage.presentation_description_snapshot,
|
||||
usage.presentation_image_url_snapshot,
|
||||
usage.presentation_site_name_snapshot,
|
||||
usage.presentation_provider_snapshot,
|
||||
usage.presentation_provider_id_snapshot,
|
||||
usage.presentation_image_only_snapshot,
|
||||
usage.preparation_status_snapshot,
|
||||
usage.preparation_effort_snapshot,
|
||||
usage.own_notes,
|
||||
usage.is_reserve
|
||||
);
|
||||
copyUsageRelations(database, usage.id, usageId);
|
||||
}
|
||||
}
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO show_duplication_commands
|
||||
(source_show_id, command_id, created_show_id, created_at_utc) VALUES (?, ?, ?, ?)`
|
||||
)
|
||||
.run(sourceShowId, commandId, id, now);
|
||||
return { id, revision: 1, updatedAtUtc: now };
|
||||
})();
|
||||
}
|
||||
|
||||
export function saveShowMetadata(
|
||||
showId: string,
|
||||
expectedRevision: number,
|
||||
@@ -1002,6 +1242,7 @@ export function addShowSection(
|
||||
): CreatedMutationResult {
|
||||
const name = cleanText(input.name, 200, 'section_name', true);
|
||||
const duration = validDuration(input.explicitDurationSeconds);
|
||||
const twitchTags = validTwitchTags(input.twitchTags ?? []);
|
||||
const database = getDatabase();
|
||||
requireCategory(database, input.categoryId);
|
||||
return database.transaction(() => {
|
||||
@@ -1026,9 +1267,9 @@ export function addShowSection(
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO show_sections (id, show_id, name, category_id, position,
|
||||
explicit_duration_seconds, is_reserve_bank) VALUES (?, ?, ?, ?, ?, ?, 0)`
|
||||
explicit_duration_seconds, twitch_tags, is_reserve_bank) VALUES (?, ?, ?, ?, ?, ?, ?, 0)`
|
||||
)
|
||||
.run(id, showId, name, input.categoryId, temporaryPosition, duration);
|
||||
.run(id, showId, name, input.categoryId, temporaryPosition, duration, twitchTags.join(','));
|
||||
visibleIds.splice(position, 0, id);
|
||||
const reserveId = reserveSectionId(database, showId);
|
||||
normalizePositions(database, 'show_sections', [...visibleIds, reserveId]);
|
||||
@@ -1044,6 +1285,7 @@ export function updateShowSection(
|
||||
): MutationResult {
|
||||
const name = cleanText(input.name, 200, 'section_name', true);
|
||||
const duration = validDuration(input.explicitDurationSeconds);
|
||||
const twitchTags = validTwitchTags(input.twitchTags ?? []);
|
||||
const database = getDatabase();
|
||||
requireCategory(database, input.categoryId);
|
||||
return database.transaction(() => {
|
||||
@@ -1051,10 +1293,11 @@ export function updateShowSection(
|
||||
sectionBelongsToShow(database, showId, sectionId);
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE show_sections SET name = ?, category_id = ?, explicit_duration_seconds = ?
|
||||
`UPDATE show_sections SET name = ?, category_id = ?, explicit_duration_seconds = ?, twitch_tags = ?,
|
||||
category_name_snapshot = NULL, category_color_snapshot = NULL
|
||||
WHERE id = ?`
|
||||
)
|
||||
.run(name, input.categoryId, duration, sectionId);
|
||||
.run(name, input.categoryId, duration, twitchTags.join(','), sectionId);
|
||||
return result;
|
||||
})();
|
||||
}
|
||||
@@ -1126,12 +1369,14 @@ export function addPieceUsage(
|
||||
const piece = database
|
||||
.prepare(
|
||||
`SELECT p.title, p.output_title, p.duration_seconds, p.intro, p.research_text, p.moderation_notes,
|
||||
p.transition_text, p.presentation_text, p.status, p.presentation_mode,
|
||||
p.interaction_text, p.transition_text, p.presentation_text, p.status,
|
||||
CASE WHEN p.presentation_image_only = 1 THEN 'image' ELSE p.presentation_mode END AS presentation_mode,
|
||||
COALESCE(ps.label, '') AS presentation_source_label,
|
||||
COALESCE(ps.url, '') AS presentation_source_url,
|
||||
ps.timecode_seconds AS presentation_source_timecode,
|
||||
p.presentation_title, p.presentation_description, p.presentation_image_url,
|
||||
p.presentation_site_name, p.presentation_provider, p.presentation_provider_id
|
||||
p.presentation_site_name, p.presentation_provider, p.presentation_provider_id,
|
||||
p.preparation_effort
|
||||
FROM pieces p LEFT JOIN piece_sources ps ON ps.piece_id = p.id
|
||||
AND ps.position = p.presentation_source_position WHERE p.id = ?`
|
||||
)
|
||||
@@ -1143,6 +1388,7 @@ export function addPieceUsage(
|
||||
intro: string;
|
||||
research_text: string;
|
||||
moderation_notes: string;
|
||||
interaction_text: string;
|
||||
transition_text: string;
|
||||
presentation_text: string;
|
||||
presentation_mode: PresentationMode;
|
||||
@@ -1156,6 +1402,7 @@ export function addPieceUsage(
|
||||
presentation_provider: string;
|
||||
presentation_provider_id: string;
|
||||
status: string;
|
||||
preparation_effort: PreparationEffort;
|
||||
}
|
||||
| undefined;
|
||||
if (!piece) throw new Error('NOT_FOUND');
|
||||
@@ -1166,7 +1413,7 @@ export function addPieceUsage(
|
||||
) {
|
||||
throw new Error('NOT_FOUND');
|
||||
}
|
||||
if (piece.status !== 'ready') throw new Error('PIECE_NOT_READY');
|
||||
if (!['preparing', 'ready'].includes(piece.status)) throw new Error('PIECE_NOT_READY');
|
||||
const ids = (
|
||||
database
|
||||
.prepare('SELECT id FROM piece_usages WHERE show_section_id = ? ORDER BY position')
|
||||
@@ -1178,13 +1425,14 @@ export function addPieceUsage(
|
||||
.prepare(
|
||||
`INSERT INTO piece_usages (id, show_section_id, original_piece_id, position, status,
|
||||
duration_seconds, title_snapshot, output_title_snapshot, intro_snapshot, research_snapshot,
|
||||
moderation_snapshot, transition_snapshot, presentation_snapshot,
|
||||
presentation_mode_snapshot, presentation_source_label_snapshot,
|
||||
moderation_snapshot, interaction_snapshot, transition_snapshot, presentation_snapshot,
|
||||
presentation_mode_snapshot, presentation_image_only_snapshot, presentation_source_label_snapshot,
|
||||
presentation_source_url_snapshot, presentation_source_timecode_snapshot,
|
||||
presentation_title_meta_snapshot, presentation_description_snapshot,
|
||||
presentation_image_url_snapshot, presentation_site_name_snapshot,
|
||||
presentation_provider_snapshot, presentation_provider_id_snapshot, own_notes, is_reserve)
|
||||
VALUES (?, ?, ?, ?, 'open', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '', ?)`
|
||||
presentation_provider_snapshot, presentation_provider_id_snapshot,
|
||||
preparation_status_snapshot, preparation_effort_snapshot, own_notes, is_reserve)
|
||||
VALUES (?, ?, ?, ?, 'open', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '', ?)`
|
||||
)
|
||||
.run(
|
||||
id,
|
||||
@@ -1197,9 +1445,11 @@ export function addPieceUsage(
|
||||
piece.intro,
|
||||
piece.research_text,
|
||||
piece.moderation_notes,
|
||||
piece.interaction_text,
|
||||
piece.transition_text,
|
||||
piece.presentation_text,
|
||||
piece.presentation_mode,
|
||||
piece.presentation_mode === 'image' ? 'text' : piece.presentation_mode,
|
||||
piece.presentation_mode === 'image' ? 1 : 0,
|
||||
piece.presentation_source_label,
|
||||
piece.presentation_source_url,
|
||||
piece.presentation_source_timecode,
|
||||
@@ -1209,6 +1459,8 @@ export function addPieceUsage(
|
||||
piece.presentation_site_name,
|
||||
piece.presentation_provider,
|
||||
piece.presentation_provider_id,
|
||||
piece.status,
|
||||
piece.preparation_effort,
|
||||
input.sectionId === null ? 1 : 0
|
||||
);
|
||||
snapshotPieceRelations(database, id, input.pieceId);
|
||||
@@ -1284,12 +1536,13 @@ export function duplicatePieceUsage(
|
||||
const source = database
|
||||
.prepare(
|
||||
`SELECT original_piece_id, status, duration_seconds, title_snapshot, output_title_snapshot, intro_snapshot,
|
||||
research_snapshot, moderation_snapshot, transition_snapshot, presentation_snapshot,
|
||||
presentation_mode_snapshot, presentation_source_label_snapshot,
|
||||
research_snapshot, moderation_snapshot, interaction_snapshot, transition_snapshot, presentation_snapshot,
|
||||
presentation_mode_snapshot, presentation_image_only_snapshot, presentation_source_label_snapshot,
|
||||
presentation_source_url_snapshot, presentation_source_timecode_snapshot,
|
||||
presentation_title_meta_snapshot, presentation_description_snapshot,
|
||||
presentation_image_url_snapshot, presentation_site_name_snapshot,
|
||||
presentation_provider_snapshot, presentation_provider_id_snapshot,
|
||||
preparation_status_snapshot, preparation_effort_snapshot,
|
||||
own_notes, is_reserve FROM piece_usages WHERE id = ?`
|
||||
)
|
||||
.get(usageId) as Omit<UsageRow, 'id' | 'show_section_id' | 'position'> & {
|
||||
@@ -1307,13 +1560,14 @@ export function duplicatePieceUsage(
|
||||
.prepare(
|
||||
`INSERT INTO piece_usages (id, show_section_id, original_piece_id, position, status,
|
||||
duration_seconds, title_snapshot, output_title_snapshot, intro_snapshot, research_snapshot,
|
||||
moderation_snapshot, transition_snapshot, presentation_snapshot,
|
||||
presentation_mode_snapshot, presentation_source_label_snapshot,
|
||||
moderation_snapshot, interaction_snapshot, transition_snapshot, presentation_snapshot,
|
||||
presentation_mode_snapshot, presentation_image_only_snapshot, presentation_source_label_snapshot,
|
||||
presentation_source_url_snapshot, presentation_source_timecode_snapshot,
|
||||
presentation_title_meta_snapshot, presentation_description_snapshot,
|
||||
presentation_image_url_snapshot, presentation_site_name_snapshot,
|
||||
presentation_provider_snapshot, presentation_provider_id_snapshot, own_notes, is_reserve)
|
||||
VALUES (?, ?, ?, ?, 'open', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
|
||||
presentation_provider_snapshot, presentation_provider_id_snapshot,
|
||||
preparation_status_snapshot, preparation_effort_snapshot, own_notes, is_reserve)
|
||||
VALUES (?, ?, ?, ?, 'open', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
|
||||
)
|
||||
.run(
|
||||
id,
|
||||
@@ -1326,9 +1580,11 @@ export function duplicatePieceUsage(
|
||||
source.intro_snapshot,
|
||||
source.research_snapshot,
|
||||
source.moderation_snapshot,
|
||||
source.interaction_snapshot,
|
||||
source.transition_snapshot,
|
||||
source.presentation_snapshot,
|
||||
source.presentation_mode_snapshot,
|
||||
source.presentation_image_only_snapshot,
|
||||
source.presentation_source_label_snapshot,
|
||||
source.presentation_source_url_snapshot,
|
||||
source.presentation_source_timecode_snapshot,
|
||||
@@ -1338,6 +1594,8 @@ export function duplicatePieceUsage(
|
||||
source.presentation_site_name_snapshot,
|
||||
source.presentation_provider_snapshot,
|
||||
source.presentation_provider_id_snapshot,
|
||||
source.preparation_status_snapshot,
|
||||
source.preparation_effort_snapshot,
|
||||
source.own_notes,
|
||||
source.is_reserve
|
||||
);
|
||||
@@ -1360,12 +1618,14 @@ export function refreshPieceUsageFromOriginal(
|
||||
const source = database
|
||||
.prepare(
|
||||
`SELECT p.title, p.output_title, p.duration_seconds, p.intro, p.research_text,
|
||||
p.moderation_notes, p.transition_text, p.presentation_text, p.presentation_mode,
|
||||
p.moderation_notes, p.interaction_text, p.transition_text, p.presentation_text,
|
||||
CASE WHEN p.presentation_image_only = 1 THEN 'image' ELSE p.presentation_mode END AS presentation_mode,
|
||||
COALESCE(ps.label, '') AS presentation_source_label,
|
||||
COALESCE(ps.url, '') AS presentation_source_url,
|
||||
ps.timecode_seconds AS presentation_source_timecode,
|
||||
p.presentation_title, p.presentation_description, p.presentation_image_url,
|
||||
p.presentation_site_name, p.presentation_provider, p.presentation_provider_id
|
||||
p.presentation_site_name, p.presentation_provider, p.presentation_provider_id,
|
||||
p.status, p.preparation_effort
|
||||
FROM piece_usages u JOIN pieces p ON p.id = u.original_piece_id
|
||||
LEFT JOIN piece_sources ps ON ps.piece_id = p.id
|
||||
AND ps.position = p.presentation_source_position
|
||||
@@ -1379,6 +1639,7 @@ export function refreshPieceUsageFromOriginal(
|
||||
intro: string;
|
||||
research_text: string;
|
||||
moderation_notes: string;
|
||||
interaction_text: string;
|
||||
transition_text: string;
|
||||
presentation_text: string;
|
||||
presentation_mode: PresentationMode;
|
||||
@@ -1391,19 +1652,23 @@ export function refreshPieceUsageFromOriginal(
|
||||
presentation_site_name: string;
|
||||
presentation_provider: string;
|
||||
presentation_provider_id: string;
|
||||
status: string;
|
||||
preparation_effort: PreparationEffort;
|
||||
}
|
||||
| undefined;
|
||||
if (!source) throw new Error('ORIGINAL_NOT_FOUND');
|
||||
if (!['preparing', 'ready'].includes(source.status)) throw new Error('PIECE_NOT_READY');
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE piece_usages SET title_snapshot = ?, output_title_snapshot = ?, duration_seconds = ?, intro_snapshot = ?,
|
||||
research_snapshot = ?, moderation_snapshot = ?, transition_snapshot = ?,
|
||||
presentation_snapshot = ?, presentation_mode_snapshot = ?,
|
||||
research_snapshot = ?, moderation_snapshot = ?, interaction_snapshot = ?, transition_snapshot = ?,
|
||||
presentation_snapshot = ?, presentation_mode_snapshot = ?, presentation_image_only_snapshot = ?,
|
||||
presentation_source_label_snapshot = ?, presentation_source_url_snapshot = ?,
|
||||
presentation_source_timecode_snapshot = ?, presentation_title_meta_snapshot = ?,
|
||||
presentation_description_snapshot = ?, presentation_image_url_snapshot = ?,
|
||||
presentation_site_name_snapshot = ?, presentation_provider_snapshot = ?,
|
||||
presentation_provider_id_snapshot = ? WHERE id = ?`
|
||||
presentation_provider_id_snapshot = ?, preparation_status_snapshot = ?,
|
||||
preparation_effort_snapshot = ? WHERE id = ?`
|
||||
)
|
||||
.run(
|
||||
source.title,
|
||||
@@ -1412,9 +1677,11 @@ export function refreshPieceUsageFromOriginal(
|
||||
source.intro,
|
||||
source.research_text,
|
||||
source.moderation_notes,
|
||||
source.interaction_text,
|
||||
source.transition_text,
|
||||
source.presentation_text,
|
||||
source.presentation_mode,
|
||||
source.presentation_mode === 'image' ? 'text' : source.presentation_mode,
|
||||
source.presentation_mode === 'image' ? 1 : 0,
|
||||
source.presentation_source_label,
|
||||
source.presentation_source_url,
|
||||
source.presentation_source_timecode,
|
||||
@@ -1424,6 +1691,8 @@ export function refreshPieceUsageFromOriginal(
|
||||
source.presentation_site_name,
|
||||
source.presentation_provider,
|
||||
source.presentation_provider_id,
|
||||
source.status,
|
||||
source.preparation_effort,
|
||||
usageId
|
||||
);
|
||||
snapshotPieceRelations(
|
||||
@@ -1448,15 +1717,29 @@ export function updatePieceUsage(
|
||||
const title = cleanText(input.title, 200, 'title', true);
|
||||
const outputTitle = cleanText(input.outputTitle, 300, 'output_title');
|
||||
const duration = validDuration(input.durationSeconds)!;
|
||||
if (
|
||||
input.preparationStatus !== undefined &&
|
||||
!['preparing', 'ready'].includes(input.preparationStatus)
|
||||
) {
|
||||
throw new Error('INVALID_PREPARATION_STATUS');
|
||||
}
|
||||
if (
|
||||
input.preparationEffort !== undefined &&
|
||||
![null, 'low', 'medium', 'high'].includes(input.preparationEffort)
|
||||
) {
|
||||
throw new Error('INVALID_PREPARATION_EFFORT');
|
||||
}
|
||||
const values = {
|
||||
intro: cleanText(input.intro, 50_000, 'intro'),
|
||||
research: cleanText(input.research, 50_000, 'research'),
|
||||
moderation: cleanText(input.moderation, 50_000, 'moderation'),
|
||||
interaction:
|
||||
input.interaction === undefined ? null : cleanText(input.interaction, 50_000, 'interaction'),
|
||||
transition: cleanText(input.transition, 50_000, 'transition'),
|
||||
presentation: cleanText(input.presentation, 50_000, 'presentation'),
|
||||
ownNotes: cleanText(input.ownNotes, 50_000, 'notes')
|
||||
};
|
||||
const presentation = validPresentation(
|
||||
const submittedPresentation = validPresentation(
|
||||
input.presentationMode,
|
||||
input.presentationSourceLabel,
|
||||
input.presentationSourceUrl,
|
||||
@@ -1470,16 +1753,68 @@ export function updatePieceUsage(
|
||||
return database.transaction(() => {
|
||||
const result = bumpShow(database, showId, expectedRevision);
|
||||
usageSection(database, showId, usageId);
|
||||
const currentPreparation = database
|
||||
.prepare(
|
||||
`SELECT preparation_status_snapshot, preparation_effort_snapshot
|
||||
FROM piece_usages WHERE id = ?`
|
||||
)
|
||||
.get(usageId) as {
|
||||
preparation_status_snapshot: UsagePreparationStatus;
|
||||
preparation_effort_snapshot: PreparationEffort;
|
||||
};
|
||||
let presentation = submittedPresentation;
|
||||
if (presentation.mode === 'link' || presentation.mode === 'video') {
|
||||
const source = database
|
||||
.prepare(
|
||||
`SELECT label, url, timecode_seconds FROM usage_source_snapshots
|
||||
WHERE usage_id = ? AND url = ?`
|
||||
)
|
||||
.get(usageId, presentation.sourceUrl) as
|
||||
{ label: string; url: string; timecode_seconds: number | null } | undefined;
|
||||
if (!source) throw new Error('INVALID_PRESENTATION');
|
||||
presentation = validPresentation(
|
||||
presentation.mode,
|
||||
source.label,
|
||||
source.url,
|
||||
source.timecode_seconds,
|
||||
presentation.title,
|
||||
presentation.description,
|
||||
presentation.imageUrl,
|
||||
presentation.siteName
|
||||
);
|
||||
}
|
||||
const selectedMediaId =
|
||||
input.presentationMediaId === undefined
|
||||
? ((
|
||||
database
|
||||
.prepare(
|
||||
'SELECT id FROM usage_media_snapshots WHERE usage_id = ? AND is_presentation = 1'
|
||||
)
|
||||
.get(usageId) as { id: string } | undefined
|
||||
)?.id ?? null)
|
||||
: input.presentationMediaId;
|
||||
if (
|
||||
selectedMediaId !== null &&
|
||||
!database
|
||||
.prepare('SELECT 1 FROM usage_media_snapshots WHERE id = ? AND usage_id = ?')
|
||||
.get(selectedMediaId, usageId)
|
||||
) {
|
||||
throw new Error('INVALID_PRESENTATION_MEDIA');
|
||||
}
|
||||
if (presentation.mode === 'image' && !selectedMediaId) {
|
||||
throw new Error('INVALID_PRESENTATION_MEDIA');
|
||||
}
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE piece_usages SET title_snapshot = ?, output_title_snapshot = ?, intro_snapshot = ?, research_snapshot = ?,
|
||||
moderation_snapshot = ?, transition_snapshot = ?, presentation_snapshot = ?,
|
||||
presentation_mode_snapshot = ?, presentation_source_label_snapshot = ?,
|
||||
moderation_snapshot = ?, interaction_snapshot = COALESCE(?, interaction_snapshot), transition_snapshot = ?, presentation_snapshot = ?,
|
||||
presentation_mode_snapshot = ?, presentation_image_only_snapshot = ?, presentation_source_label_snapshot = ?,
|
||||
presentation_source_url_snapshot = ?, presentation_source_timecode_snapshot = ?,
|
||||
presentation_title_meta_snapshot = ?, presentation_description_snapshot = ?,
|
||||
presentation_image_url_snapshot = ?, presentation_site_name_snapshot = ?,
|
||||
presentation_provider_snapshot = ?, presentation_provider_id_snapshot = ?,
|
||||
own_notes = ?, duration_seconds = ? WHERE id = ?`
|
||||
own_notes = ?, duration_seconds = ?, preparation_status_snapshot = ?,
|
||||
preparation_effort_snapshot = ? WHERE id = ?`
|
||||
)
|
||||
.run(
|
||||
title,
|
||||
@@ -1487,9 +1822,11 @@ export function updatePieceUsage(
|
||||
values.intro,
|
||||
values.research,
|
||||
values.moderation,
|
||||
values.interaction,
|
||||
values.transition,
|
||||
values.presentation,
|
||||
presentation.mode,
|
||||
presentation.mode === 'image' ? 'text' : presentation.mode,
|
||||
presentation.mode === 'image' ? 1 : 0,
|
||||
presentation.sourceLabel,
|
||||
presentation.sourceUrl,
|
||||
presentation.timecodeSeconds,
|
||||
@@ -1501,6 +1838,10 @@ export function updatePieceUsage(
|
||||
presentation.providerId,
|
||||
values.ownNotes,
|
||||
duration,
|
||||
input.preparationStatus ?? currentPreparation.preparation_status_snapshot,
|
||||
input.preparationEffort === undefined
|
||||
? currentPreparation.preparation_effort_snapshot
|
||||
: input.preparationEffort,
|
||||
usageId
|
||||
);
|
||||
if (input.tools) {
|
||||
@@ -1533,23 +1874,15 @@ export function updatePieceUsage(
|
||||
}
|
||||
}
|
||||
if (input.presentationMediaId !== undefined) {
|
||||
if (
|
||||
input.presentationMediaId !== null &&
|
||||
!database
|
||||
.prepare('SELECT 1 FROM usage_media_snapshots WHERE id = ? AND usage_id = ?')
|
||||
.get(input.presentationMediaId, usageId)
|
||||
) {
|
||||
throw new Error('INVALID_PRESENTATION_MEDIA');
|
||||
}
|
||||
database
|
||||
.prepare('UPDATE usage_media_snapshots SET is_presentation = 0 WHERE usage_id = ?')
|
||||
.run(usageId);
|
||||
if (input.presentationMediaId !== null) {
|
||||
if (selectedMediaId !== null) {
|
||||
database
|
||||
.prepare(
|
||||
'UPDATE usage_media_snapshots SET is_presentation = 1 WHERE id = ? AND usage_id = ?'
|
||||
)
|
||||
.run(input.presentationMediaId, usageId);
|
||||
.run(selectedMediaId, usageId);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
||||
@@ -0,0 +1,103 @@
|
||||
import { execFileSync } from 'node:child_process';
|
||||
import { mkdtempSync, rmSync } from 'node:fs';
|
||||
import { tmpdir } from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
||||
import type { AuthUser } from './auth.js';
|
||||
import { closeDatabase, getDatabase } from './database.js';
|
||||
import {
|
||||
authenticateTechnical,
|
||||
createTechnicalAccess,
|
||||
idempotentResponse,
|
||||
revokeTechnicalAccess,
|
||||
updateTechnicalAccess
|
||||
} from './technical-access.js';
|
||||
|
||||
let directory: string;
|
||||
let actor: AuthUser;
|
||||
|
||||
beforeEach(() => {
|
||||
directory = mkdtempSync(path.join(tmpdir(), 'sendewerk-api-test-'));
|
||||
process.env.SENDEWERK_DB_PATH = path.join(directory, 'test.sqlite');
|
||||
process.env.SENDEWERK_UPLOAD_DIR = path.join(directory, 'uploads');
|
||||
execFileSync(process.execPath, ['scripts/migrate.mjs'], { cwd: process.cwd(), env: process.env });
|
||||
execFileSync(process.execPath, ['scripts/seed.mjs'], { cwd: process.cwd(), env: process.env });
|
||||
const now = new Date().toISOString();
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`INSERT INTO users (id, email, email_normalized, display_name, password_hash, role,
|
||||
password_changed_at_utc, created_at_utc, updated_at_utc) VALUES ('test-user', 'test@example.org',
|
||||
'test@example.org', 'Test', 'not-used', 'barkeeper', ?, ?, ?)`
|
||||
)
|
||||
.run(now, now, now);
|
||||
actor = {
|
||||
id: 'test-user',
|
||||
email: 'test@example.org',
|
||||
displayName: 'Test',
|
||||
role: 'barkeeper',
|
||||
lockedAtUtc: null
|
||||
};
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
closeDatabase();
|
||||
delete process.env.SENDEWERK_DB_PATH;
|
||||
delete process.env.SENDEWERK_UPLOAD_DIR;
|
||||
rmSync(directory, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
function request(token: string, key?: string) {
|
||||
return new Request('https://sendewerk.test/api/v1/pieces', {
|
||||
headers: { Authorization: `Bearer ${token}`, ...(key ? { 'Idempotency-Key': key } : {}) }
|
||||
});
|
||||
}
|
||||
|
||||
describe('technical API access', () => {
|
||||
it('enforces permissions and revocation without storing the raw token', () => {
|
||||
const created = createTechnicalAccess(actor, 'Leser', 'read');
|
||||
expect(authenticateTechnical(request(created.token))).toMatchObject({
|
||||
name: 'Leser',
|
||||
permissions: 'read'
|
||||
});
|
||||
expect(() => authenticateTechnical(request(created.token), true)).toThrow('API_FORBIDDEN');
|
||||
expect(
|
||||
getDatabase()
|
||||
.prepare('SELECT token_hash FROM technical_accesses WHERE id = ?')
|
||||
.get(created.id)
|
||||
).not.toMatchObject({ token_hash: created.token });
|
||||
updateTechnicalAccess(actor, created.id, 'Leser bearbeitet', 'read_write');
|
||||
expect(authenticateTechnical(request(created.token), true)).toMatchObject({
|
||||
name: 'Leser bearbeitet',
|
||||
permissions: 'read_write'
|
||||
});
|
||||
revokeTechnicalAccess(actor, created.id);
|
||||
expect(() => authenticateTechnical(request(created.token))).toThrow('API_UNAUTHORIZED');
|
||||
});
|
||||
|
||||
it('replays an identical idempotent write and rejects a changed payload', () => {
|
||||
const created = createTechnicalAccess(actor, 'Schreiber', 'read_write');
|
||||
const technical = authenticateTechnical(request(created.token), true);
|
||||
let calls = 0;
|
||||
const first = idempotentResponse(
|
||||
technical,
|
||||
request(created.token, 'command-1'),
|
||||
{ title: 'A' },
|
||||
() => ({ status: 201, body: { calls: ++calls } })
|
||||
);
|
||||
const replay = idempotentResponse(
|
||||
technical,
|
||||
request(created.token, 'command-1'),
|
||||
{ title: 'A' },
|
||||
() => ({ status: 201, body: { calls: ++calls } })
|
||||
);
|
||||
expect(first.duplicate).toBe(false);
|
||||
expect(replay).toMatchObject({ duplicate: true, body: { calls: 1 } });
|
||||
expect(calls).toBe(1);
|
||||
expect(() =>
|
||||
idempotentResponse(technical, request(created.token, 'command-1'), { title: 'B' }, () => ({
|
||||
status: 201,
|
||||
body: {}
|
||||
}))
|
||||
).toThrow('API_IDEMPOTENCY_CONFLICT');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,176 @@
|
||||
import { createHash, randomBytes, randomUUID } from 'node:crypto';
|
||||
import type { AuthUser } from './auth.js';
|
||||
import { getDatabase } from './database.js';
|
||||
|
||||
export type TechnicalPermission = 'read' | 'read_write';
|
||||
export type TechnicalActor = { id: string; name: string; permissions: TechnicalPermission };
|
||||
|
||||
function tokenHash(token: string) {
|
||||
return createHash('sha256').update(token).digest('hex');
|
||||
}
|
||||
|
||||
export function listTechnicalAccesses() {
|
||||
return getDatabase()
|
||||
.prepare(
|
||||
`SELECT id, name, permissions, created_at_utc AS createdAtUtc,
|
||||
last_used_at_utc AS lastUsedAtUtc, revoked_at_utc AS revokedAtUtc FROM technical_accesses ORDER BY name`
|
||||
)
|
||||
.all() as {
|
||||
id: string;
|
||||
name: string;
|
||||
permissions: TechnicalPermission;
|
||||
createdAtUtc: string;
|
||||
lastUsedAtUtc: string | null;
|
||||
revokedAtUtc: string | null;
|
||||
}[];
|
||||
}
|
||||
|
||||
export function createTechnicalAccess(actor: AuthUser, nameValue: string, permissions: string) {
|
||||
const name = nameValue.trim();
|
||||
if (!name || name.length > 120 || !['read', 'read_write'].includes(permissions))
|
||||
throw new Error('INVALID_ACCESS');
|
||||
const token = randomBytes(32).toString('base64url');
|
||||
const id = randomUUID();
|
||||
const now = new Date().toISOString();
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`INSERT INTO technical_accesses
|
||||
(id, name, token_hash, permissions, created_by_user_id, created_at_utc) VALUES (?, ?, ?, ?, ?, ?)`
|
||||
)
|
||||
.run(id, name, tokenHash(token), permissions, actor.id, now);
|
||||
auditTechnical(
|
||||
{ id: actor.id, name: actor.displayName, permissions: 'read_write' },
|
||||
'technical_access.create',
|
||||
'technical_access',
|
||||
id,
|
||||
'user'
|
||||
);
|
||||
return { id, token };
|
||||
}
|
||||
|
||||
export function updateTechnicalAccess(
|
||||
actor: AuthUser,
|
||||
id: string,
|
||||
nameValue: string,
|
||||
permissions: string
|
||||
) {
|
||||
const name = nameValue.trim();
|
||||
if (!name || name.length > 120 || !['read', 'read_write'].includes(permissions))
|
||||
throw new Error('INVALID_ACCESS');
|
||||
const result = getDatabase()
|
||||
.prepare(
|
||||
`UPDATE technical_accesses SET name = ?, permissions = ?
|
||||
WHERE id = ? AND revoked_at_utc IS NULL`
|
||||
)
|
||||
.run(name, permissions, id);
|
||||
if (!result.changes) throw new Error('NOT_FOUND');
|
||||
auditTechnical(
|
||||
{ id: actor.id, name: actor.displayName, permissions: 'read_write' },
|
||||
'technical_access.update',
|
||||
'technical_access',
|
||||
id,
|
||||
'user'
|
||||
);
|
||||
}
|
||||
|
||||
export function revokeTechnicalAccess(actor: AuthUser, id: string) {
|
||||
const result = getDatabase()
|
||||
.prepare(
|
||||
'UPDATE technical_accesses SET revoked_at_utc = ? WHERE id = ? AND revoked_at_utc IS NULL'
|
||||
)
|
||||
.run(new Date().toISOString(), id);
|
||||
if (!result.changes) throw new Error('NOT_FOUND');
|
||||
auditTechnical(
|
||||
{ id: actor.id, name: actor.displayName, permissions: 'read_write' },
|
||||
'technical_access.revoke',
|
||||
'technical_access',
|
||||
id,
|
||||
'user'
|
||||
);
|
||||
}
|
||||
|
||||
export function authenticateTechnical(request: Request, write = false): TechnicalActor {
|
||||
const authorization = request.headers.get('authorization') ?? '';
|
||||
const token = authorization.startsWith('Bearer ') ? authorization.slice(7).trim() : '';
|
||||
if (!token) throw new Error('API_UNAUTHORIZED');
|
||||
const row = getDatabase()
|
||||
.prepare(
|
||||
`SELECT id, name, permissions FROM technical_accesses
|
||||
WHERE token_hash = ? AND revoked_at_utc IS NULL`
|
||||
)
|
||||
.get(tokenHash(token)) as TechnicalActor | undefined;
|
||||
if (!row) throw new Error('API_UNAUTHORIZED');
|
||||
if (write && row.permissions !== 'read_write') throw new Error('API_FORBIDDEN');
|
||||
getDatabase()
|
||||
.prepare('UPDATE technical_accesses SET last_used_at_utc = ? WHERE id = ?')
|
||||
.run(new Date().toISOString(), row.id);
|
||||
return row;
|
||||
}
|
||||
|
||||
export function auditTechnical(
|
||||
actor: TechnicalActor,
|
||||
action: string,
|
||||
targetType: string,
|
||||
targetId: string,
|
||||
actorType: 'technical' | 'user' = 'technical'
|
||||
) {
|
||||
getDatabase()
|
||||
.prepare(
|
||||
`INSERT INTO audit_events (id, actor_type, actor_id, action, target_type, target_id, created_at_utc)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?)`
|
||||
)
|
||||
.run(
|
||||
randomUUID(),
|
||||
actorType,
|
||||
actor.id,
|
||||
action.slice(0, 120),
|
||||
targetType.slice(0, 80),
|
||||
targetId.slice(0, 200),
|
||||
new Date().toISOString()
|
||||
);
|
||||
}
|
||||
|
||||
export function idempotentResponse(
|
||||
actor: TechnicalActor,
|
||||
request: Request,
|
||||
body: unknown,
|
||||
operation: () => { status: number; body: unknown }
|
||||
) {
|
||||
const key = request.headers.get('idempotency-key')?.trim() ?? '';
|
||||
if (!key || key.length > 200) throw new Error('API_IDEMPOTENCY_REQUIRED');
|
||||
const hash = createHash('sha256')
|
||||
.update(`${request.method} ${new URL(request.url).pathname}\n${JSON.stringify(body)}`)
|
||||
.digest('hex');
|
||||
const database = getDatabase();
|
||||
return database.transaction(() => {
|
||||
const existing = database
|
||||
.prepare(
|
||||
'SELECT request_hash, status_code, response_json FROM api_idempotency WHERE access_id = ? AND request_key = ?'
|
||||
)
|
||||
.get(actor.id, key) as
|
||||
{ request_hash: string; status_code: number; response_json: string } | undefined;
|
||||
if (existing) {
|
||||
if (existing.request_hash !== hash) throw new Error('API_IDEMPOTENCY_CONFLICT');
|
||||
return {
|
||||
status: existing.status_code,
|
||||
body: JSON.parse(existing.response_json),
|
||||
duplicate: true
|
||||
};
|
||||
}
|
||||
const result = operation();
|
||||
database
|
||||
.prepare(
|
||||
`INSERT INTO api_idempotency
|
||||
(access_id, request_key, request_hash, status_code, response_json, created_at_utc) VALUES (?, ?, ?, ?, ?, ?)`
|
||||
)
|
||||
.run(
|
||||
actor.id,
|
||||
key,
|
||||
hash,
|
||||
result.status,
|
||||
JSON.stringify(result.body),
|
||||
new Date().toISOString()
|
||||
);
|
||||
return { ...result, duplicate: false };
|
||||
})();
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import { berlinLocalToUtc } from './time.js';
|
||||
|
||||
describe('Berlin local time conversion', () => {
|
||||
it('converts valid civil time and rejects normalized or nonexistent values', () => {
|
||||
expect(berlinLocalToUtc('2026-10-25T20:00')).toBe('2026-10-25T19:00:00.000Z');
|
||||
expect(berlinLocalToUtc('')).toBeNull();
|
||||
expect(() => berlinLocalToUtc('2026-02-31T12:00')).toThrow('INVALID_TIMESTAMP');
|
||||
expect(() => berlinLocalToUtc('2026-03-29T02:30', 'INVALID_EXPIRY')).toThrow('INVALID_EXPIRY');
|
||||
expect(() => berlinLocalToUtc('2026-10-25T02:30', 'INVALID_EXPIRY')).toThrow('INVALID_EXPIRY');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,44 @@
|
||||
export function berlinLocalToUtc(value: string, errorCode = 'INVALID_TIMESTAMP'): string | null {
|
||||
if (!value) return null;
|
||||
const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})$/.exec(value);
|
||||
if (!match) throw new Error(errorCode);
|
||||
const parts = match.slice(1).map(Number);
|
||||
const localMilliseconds = Date.UTC(parts[0], parts[1] - 1, parts[2], parts[3], parts[4]);
|
||||
let candidate = localMilliseconds;
|
||||
const formatter = new Intl.DateTimeFormat('en-CA', {
|
||||
timeZone: 'Europe/Berlin',
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hourCycle: 'h23'
|
||||
});
|
||||
const localParts = (date: Date) => {
|
||||
const formatted = formatter.formatToParts(date);
|
||||
const read = (type: Intl.DateTimeFormatPartTypes) =>
|
||||
formatted.find((part) => part.type === type)?.value ?? '';
|
||||
return {
|
||||
key: `${read('year')}-${read('month')}-${read('day')}T${read('hour')}:${read('minute')}`,
|
||||
milliseconds: Date.UTC(
|
||||
Number(read('year')),
|
||||
Number(read('month')) - 1,
|
||||
Number(read('day')),
|
||||
Number(read('hour')),
|
||||
Number(read('minute'))
|
||||
)
|
||||
};
|
||||
};
|
||||
for (let attempt = 0; attempt < 2; attempt += 1) {
|
||||
candidate += localMilliseconds - localParts(new Date(candidate)).milliseconds;
|
||||
}
|
||||
const result = new Date(candidate);
|
||||
if (localParts(result).key !== value) throw new Error(errorCode);
|
||||
if (
|
||||
localParts(new Date(candidate - 60 * 60 * 1000)).key === value ||
|
||||
localParts(new Date(candidate + 60 * 60 * 1000)).key === value
|
||||
) {
|
||||
throw new Error(errorCode);
|
||||
}
|
||||
return result.toISOString();
|
||||
}
|
||||
@@ -1,7 +1,12 @@
|
||||
import type { LayoutServerLoad } from './$types';
|
||||
|
||||
export const load: LayoutServerLoad = ({ locals, url }) => ({
|
||||
user: url.pathname.startsWith('/heinzlive/') ? null : locals.user,
|
||||
user:
|
||||
url.pathname.startsWith('/heinzlive/') || url.pathname.startsWith('/freigabe/')
|
||||
? null
|
||||
: locals.user,
|
||||
presentationMode: url.pathname.startsWith('/heinzlive/'),
|
||||
guestMode: url.pathname.startsWith('/freigabe/'),
|
||||
oauthMode: url.pathname === '/oauth/authorize',
|
||||
liveControllerMode: url.pathname === '/live'
|
||||
});
|
||||
@@ -34,6 +34,17 @@
|
||||
|
||||
{#if data.presentationMode}
|
||||
{@render children()}
|
||||
{:else if data.guestMode || data.oauthMode}
|
||||
<div class="guest-shell">
|
||||
<header class="auth-header">
|
||||
<span class="brand"
|
||||
><span class="brand-mark" aria-hidden="true"><i></i><i></i><i></i></span><span
|
||||
>Sendewerk</span
|
||||
></span
|
||||
><ThemeToggle />
|
||||
</header>
|
||||
{@render children()}
|
||||
</div>
|
||||
{:else if data.user && data.liveControllerMode}
|
||||
<main id="main-content" class="live-controller-shell">{@render children()}</main>
|
||||
{:else if data.user}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { MCP_SCOPE, oauthIssuer } from '#lib/server/oauth.js';
|
||||
|
||||
export const GET: RequestHandler = () => {
|
||||
const issuer = oauthIssuer();
|
||||
return json(
|
||||
{
|
||||
issuer,
|
||||
authorization_endpoint: `${issuer}/oauth/authorize`,
|
||||
token_endpoint: `${issuer}/oauth/token`,
|
||||
registration_endpoint: `${issuer}/oauth/register`,
|
||||
revocation_endpoint: `${issuer}/oauth/revoke`,
|
||||
response_types_supported: ['code'],
|
||||
grant_types_supported: ['authorization_code'],
|
||||
token_endpoint_auth_methods_supported: ['none'],
|
||||
revocation_endpoint_auth_methods_supported: ['none'],
|
||||
code_challenge_methods_supported: ['S256'],
|
||||
scopes_supported: [MCP_SCOPE],
|
||||
authorization_response_iss_parameter_supported: true
|
||||
},
|
||||
{ headers: { 'Cache-Control': 'public, max-age=3600' } }
|
||||
);
|
||||
};
|
||||
@@ -0,0 +1 @@
|
||||
export { GET } from './mcp/+server.js';
|
||||
@@ -0,0 +1,14 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { MCP_SCOPE, mcpResource, oauthIssuer } from '#lib/server/oauth.js';
|
||||
|
||||
export const GET: RequestHandler = () =>
|
||||
json(
|
||||
{
|
||||
resource: mcpResource(),
|
||||
authorization_servers: [oauthIssuer()],
|
||||
scopes_supported: [MCP_SCOPE],
|
||||
bearer_methods_supported: ['header']
|
||||
},
|
||||
{ headers: { 'Cache-Control': 'public, max-age=3600' } }
|
||||
);
|
||||
@@ -0,0 +1,105 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
|
||||
const id = { name: 'id', in: 'path', required: true, schema: { type: 'string' } };
|
||||
const usageId = { name: 'usageId', in: 'path', required: true, schema: { type: 'string' } };
|
||||
const idempotency = {
|
||||
name: 'Idempotency-Key',
|
||||
in: 'header',
|
||||
required: true,
|
||||
schema: { type: 'string' }
|
||||
};
|
||||
const ok = { '200': { description: 'Erfolgreich' } };
|
||||
const jsonBody = (schema: Record<string, unknown>) => ({
|
||||
required: true,
|
||||
content: { 'application/json': { schema } }
|
||||
});
|
||||
|
||||
export const GET: RequestHandler = () =>
|
||||
json({
|
||||
openapi: '3.1.0',
|
||||
info: {
|
||||
title: 'Sendewerk API',
|
||||
version: '1.0.0',
|
||||
description:
|
||||
'Versionierte API für technische Redaktionszugänge. Schreibzugriffe benötigen einen Idempotency-Key.'
|
||||
},
|
||||
servers: [{ url: '/api/v1' }],
|
||||
security: [{ bearerAuth: [] }],
|
||||
components: {
|
||||
securitySchemes: {
|
||||
bearerAuth: { type: 'http', scheme: 'bearer', bearerFormat: 'Sendewerk technical token' }
|
||||
},
|
||||
schemas: {
|
||||
PieceWrite: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
title: { type: 'string' },
|
||||
summary: { type: 'string' },
|
||||
status: { enum: ['inbox', 'preparing', 'ready'] },
|
||||
durationSeconds: { type: 'integer', minimum: 0 }
|
||||
}
|
||||
},
|
||||
ShowWrite: {
|
||||
type: 'object',
|
||||
required: ['title'],
|
||||
properties: {
|
||||
title: { type: 'string' },
|
||||
startsAtUtc: { type: ['string', 'null'], format: 'date-time' },
|
||||
templateId: { type: ['string', 'null'] }
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
paths: {
|
||||
'/pieces': {
|
||||
get: { summary: 'Pieces lesen', responses: ok },
|
||||
post: {
|
||||
summary: 'Piece anlegen',
|
||||
parameters: [idempotency],
|
||||
requestBody: jsonBody({ $ref: '#/components/schemas/PieceWrite' }),
|
||||
responses: { '201': { description: 'Angelegt' } }
|
||||
}
|
||||
},
|
||||
'/pieces/{id}': {
|
||||
get: { summary: 'Piece lesen', parameters: [id], responses: ok },
|
||||
patch: {
|
||||
summary: 'Piece ändern',
|
||||
parameters: [id],
|
||||
requestBody: jsonBody({
|
||||
allOf: [
|
||||
{ $ref: '#/components/schemas/PieceWrite' },
|
||||
{ type: 'object', required: ['revision'] }
|
||||
]
|
||||
}),
|
||||
responses: ok
|
||||
}
|
||||
},
|
||||
'/shows': {
|
||||
get: { summary: 'Sendungen lesen', responses: ok },
|
||||
post: {
|
||||
summary: 'Sendung anlegen',
|
||||
parameters: [idempotency],
|
||||
requestBody: jsonBody({ $ref: '#/components/schemas/ShowWrite' }),
|
||||
responses: { '201': { description: 'Angelegt' } }
|
||||
}
|
||||
},
|
||||
'/shows/{id}': { get: { summary: 'Sendung lesen', parameters: [id], responses: ok } },
|
||||
'/shows/{id}/usages': {
|
||||
post: {
|
||||
summary: 'Piece einplanen',
|
||||
parameters: [id, idempotency],
|
||||
requestBody: jsonBody({ type: 'object', required: ['revision', 'pieceId'] }),
|
||||
responses: { '201': { description: 'Eingeplant' } }
|
||||
}
|
||||
},
|
||||
'/shows/{id}/usages/{usageId}': {
|
||||
patch: {
|
||||
summary: 'Einplanung sortieren',
|
||||
parameters: [id, usageId, idempotency],
|
||||
requestBody: jsonBody({ type: 'object', required: ['revision', 'position'] }),
|
||||
responses: ok
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,69 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { apiBody, apiFailure, pageInput } from '#lib/server/api-http.js';
|
||||
import {
|
||||
createPiece,
|
||||
getPiece,
|
||||
listPieces,
|
||||
savePiece,
|
||||
type PieceStatus
|
||||
} from '#lib/server/content.js';
|
||||
import {
|
||||
auditTechnical,
|
||||
authenticateTechnical,
|
||||
idempotentResponse
|
||||
} from '#lib/server/technical-access.js';
|
||||
|
||||
export const GET: RequestHandler = ({ request, url }) => {
|
||||
try {
|
||||
authenticateTechnical(request);
|
||||
const { limit, offset } = pageInput(url);
|
||||
const status = url.searchParams.get('status') as PieceStatus | null;
|
||||
const statuses = status ? [status] : (['inbox', 'preparing', 'ready'] as PieceStatus[]);
|
||||
const all = listPieces({ statuses, query: url.searchParams.get('q') ?? '' });
|
||||
return json({
|
||||
data: all.slice(offset, offset + limit),
|
||||
pagination: { limit, offset, total: all.length }
|
||||
});
|
||||
} catch (cause) {
|
||||
return apiFailure(cause);
|
||||
}
|
||||
};
|
||||
|
||||
export const POST: RequestHandler = async ({ request }) => {
|
||||
try {
|
||||
const actor = authenticateTechnical(request, true);
|
||||
const body = await apiBody(request);
|
||||
const result = idempotentResponse(actor, request, body, () => {
|
||||
const id = createPiece('blank');
|
||||
const piece = getPiece(id)!;
|
||||
savePiece(id, piece.revision, {
|
||||
...piece,
|
||||
title: String(body.title ?? ''),
|
||||
summary: String(body.summary ?? ''),
|
||||
status: ['inbox', 'preparing', 'ready'].includes(String(body.status))
|
||||
? (body.status as 'inbox' | 'preparing' | 'ready')
|
||||
: 'preparing',
|
||||
durationSeconds: Number(body.durationSeconds ?? 0),
|
||||
sources: Array.isArray(body.sources)
|
||||
? body.sources.map((source) => ({
|
||||
label: String((source as Record<string, unknown>).label ?? ''),
|
||||
url: String((source as Record<string, unknown>).url ?? ''),
|
||||
timecodeSeconds:
|
||||
(source as Record<string, unknown>).timecodeSeconds == null
|
||||
? null
|
||||
: Number((source as Record<string, unknown>).timecodeSeconds)
|
||||
}))
|
||||
: []
|
||||
});
|
||||
auditTechnical(actor, 'piece.create', 'piece', id);
|
||||
return { status: 201, body: { data: getPiece(id) } };
|
||||
});
|
||||
return json(result.body, {
|
||||
status: result.status,
|
||||
headers: { 'Idempotency-Replayed': result.duplicate ? 'true' : 'false' }
|
||||
});
|
||||
} catch (cause) {
|
||||
return apiFailure(cause);
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,44 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { apiBody, apiFailure } from '#lib/server/api-http.js';
|
||||
import { getPiece, savePiece } from '#lib/server/content.js';
|
||||
import { auditTechnical, authenticateTechnical } from '#lib/server/technical-access.js';
|
||||
|
||||
export const GET: RequestHandler = ({ request, params }) => {
|
||||
try {
|
||||
authenticateTechnical(request);
|
||||
const piece = getPiece(params.id);
|
||||
if (!piece) throw new Error('NOT_FOUND');
|
||||
return json({ data: piece });
|
||||
} catch (cause) {
|
||||
return apiFailure(cause);
|
||||
}
|
||||
};
|
||||
|
||||
export const PATCH: RequestHandler = async ({ request, params }) => {
|
||||
try {
|
||||
const actor = authenticateTechnical(request, true);
|
||||
const body = await apiBody(request);
|
||||
const piece = getPiece(params.id);
|
||||
if (!piece) throw new Error('NOT_FOUND');
|
||||
if (piece.status === 'archived') throw new Error('INVALID_STATUS');
|
||||
if (Number(body.revision) !== piece.revision) throw new Error('CONFLICT');
|
||||
const status =
|
||||
body.status !== undefined
|
||||
? (String(body.status) as 'inbox' | 'preparing' | 'ready')
|
||||
: piece.status;
|
||||
savePiece(params.id, piece.revision, {
|
||||
...piece,
|
||||
status,
|
||||
...(body.title !== undefined ? { title: String(body.title) } : {}),
|
||||
...(body.summary !== undefined ? { summary: String(body.summary) } : {}),
|
||||
...(body.durationSeconds !== undefined
|
||||
? { durationSeconds: Number(body.durationSeconds) }
|
||||
: {})
|
||||
});
|
||||
auditTechnical(actor, 'piece.update', 'piece', params.id);
|
||||
return json({ data: getPiece(params.id) });
|
||||
} catch (cause) {
|
||||
return apiFailure(cause);
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,45 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { apiBody, apiFailure, pageInput } from '#lib/server/api-http.js';
|
||||
import { createShow, getShow, listShows } from '#lib/server/shows.js';
|
||||
import {
|
||||
auditTechnical,
|
||||
authenticateTechnical,
|
||||
idempotentResponse
|
||||
} from '#lib/server/technical-access.js';
|
||||
|
||||
export const GET: RequestHandler = ({ request, url }) => {
|
||||
try {
|
||||
authenticateTechnical(request);
|
||||
const { limit, offset } = pageInput(url);
|
||||
const all = listShows();
|
||||
return json({
|
||||
data: all.slice(offset, offset + limit),
|
||||
pagination: { limit, offset, total: all.length }
|
||||
});
|
||||
} catch (cause) {
|
||||
return apiFailure(cause);
|
||||
}
|
||||
};
|
||||
|
||||
export const POST: RequestHandler = async ({ request }) => {
|
||||
try {
|
||||
const actor = authenticateTechnical(request, true);
|
||||
const body = await apiBody(request);
|
||||
const result = idempotentResponse(actor, request, body, () => {
|
||||
const created = createShow({
|
||||
title: String(body.title ?? ''),
|
||||
startsAtUtc: body.startsAtUtc ? String(body.startsAtUtc) : null,
|
||||
templateId: body.templateId ? String(body.templateId) : null
|
||||
});
|
||||
auditTechnical(actor, 'show.create', 'show', created.id);
|
||||
return { status: 201, body: { data: getShow(created.id) } };
|
||||
});
|
||||
return json(result.body, {
|
||||
status: result.status,
|
||||
headers: { 'Idempotency-Replayed': result.duplicate ? 'true' : 'false' }
|
||||
});
|
||||
} catch (cause) {
|
||||
return apiFailure(cause);
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,16 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { apiFailure } from '#lib/server/api-http.js';
|
||||
import { getShow } from '#lib/server/shows.js';
|
||||
import { authenticateTechnical } from '#lib/server/technical-access.js';
|
||||
|
||||
export const GET: RequestHandler = ({ request, params }) => {
|
||||
try {
|
||||
authenticateTechnical(request);
|
||||
const show = getShow(params.id);
|
||||
if (!show) throw new Error('NOT_FOUND');
|
||||
return json({ data: show });
|
||||
} catch (cause) {
|
||||
return apiFailure(cause);
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,31 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { apiBody, apiFailure } from '#lib/server/api-http.js';
|
||||
import { addPieceUsage, getShow } from '#lib/server/shows.js';
|
||||
import {
|
||||
auditTechnical,
|
||||
authenticateTechnical,
|
||||
idempotentResponse
|
||||
} from '#lib/server/technical-access.js';
|
||||
|
||||
export const POST: RequestHandler = async ({ request, params }) => {
|
||||
try {
|
||||
const actor = authenticateTechnical(request, true);
|
||||
const body = await apiBody(request);
|
||||
const result = idempotentResponse(actor, request, body, () => {
|
||||
const created = addPieceUsage(params.id, Number(body.revision), {
|
||||
pieceId: String(body.pieceId ?? ''),
|
||||
sectionId: body.sectionId ? String(body.sectionId) : null,
|
||||
position: body.position == null ? undefined : Number(body.position)
|
||||
});
|
||||
auditTechnical(actor, 'usage.create', 'usage', created.id);
|
||||
return { status: 201, body: { data: getShow(params.id), usageId: created.id } };
|
||||
});
|
||||
return json(result.body, {
|
||||
status: result.status,
|
||||
headers: { 'Idempotency-Replayed': result.duplicate ? 'true' : 'false' }
|
||||
});
|
||||
} catch (cause) {
|
||||
return apiFailure(cause);
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,30 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { apiBody, apiFailure } from '#lib/server/api-http.js';
|
||||
import { getShow, movePieceUsage } from '#lib/server/shows.js';
|
||||
import {
|
||||
auditTechnical,
|
||||
authenticateTechnical,
|
||||
idempotentResponse
|
||||
} from '#lib/server/technical-access.js';
|
||||
|
||||
export const PATCH: RequestHandler = async ({ request, params }) => {
|
||||
try {
|
||||
const actor = authenticateTechnical(request, true);
|
||||
const body = await apiBody(request);
|
||||
const result = idempotentResponse(actor, request, body, () => {
|
||||
movePieceUsage(params.id, params.usageId, Number(body.revision), {
|
||||
sectionId: body.sectionId ? String(body.sectionId) : null,
|
||||
position: Number(body.position)
|
||||
});
|
||||
auditTechnical(actor, 'usage.move', 'usage', params.usageId);
|
||||
return { status: 200, body: { data: getShow(params.id) } };
|
||||
});
|
||||
return json(result.body, {
|
||||
status: result.status,
|
||||
headers: { 'Idempotency-Replayed': result.duplicate ? 'true' : 'false' }
|
||||
});
|
||||
} catch (cause) {
|
||||
return apiFailure(cause);
|
||||
}
|
||||
};
|
||||
@@ -1,11 +1,15 @@
|
||||
import { fail } from '@sveltejs/kit';
|
||||
import { fail, redirect } from '@sveltejs/kit';
|
||||
import { randomUUID } from 'node:crypto';
|
||||
import type { Actions, PageServerLoad } from './$types';
|
||||
import { requireUser } from '#lib/server/auth.js';
|
||||
import { listPieces, setPieceArchived, setPieceDeleted } from '#lib/server/content.js';
|
||||
import { duplicateCompletedShow, listShows } from '#lib/server/shows.js';
|
||||
|
||||
export const load: PageServerLoad = ({ locals }) => {
|
||||
requireUser(locals.user);
|
||||
return {
|
||||
completedShows: listShows(['completed']),
|
||||
duplicateCommandId: randomUUID(),
|
||||
pieces: listPieces({ statuses: ['archived'] }),
|
||||
deletedPieces: listPieces({
|
||||
statuses: ['inbox', 'preparing', 'ready', 'archived'],
|
||||
@@ -34,5 +38,19 @@ export const actions = {
|
||||
} catch {
|
||||
return fail(409, { error: 'Das Piece wurde inzwischen geändert. Bitte Seite neu laden.' });
|
||||
}
|
||||
},
|
||||
duplicateShow: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
const duplicate = duplicateCompletedShow(
|
||||
String(data.get('showId') || ''),
|
||||
String(data.get('commandId') || '')
|
||||
);
|
||||
redirect(303, `/sendungen/${duplicate.id}`);
|
||||
} catch (cause) {
|
||||
if (cause && typeof cause === 'object' && 'status' in cause) throw cause;
|
||||
return fail(400, { error: 'Die Sendung konnte nicht dupliziert werden.' });
|
||||
}
|
||||
}
|
||||
} satisfies Actions;
|
||||
@@ -1,5 +1,7 @@
|
||||
<script lang="ts">
|
||||
import AppIcon from '#lib/components/AppIcon.svelte';
|
||||
import { resolve } from '$app/paths';
|
||||
import { formatDuration } from '#lib/format.js';
|
||||
import type { PageProps } from './$types';
|
||||
let { data, form }: PageProps = $props();
|
||||
</script>
|
||||
@@ -9,10 +11,29 @@
|
||||
<div class="page-wrap narrow-page">
|
||||
<header class="page-heading">
|
||||
<h1>Archiv</h1>
|
||||
<p class="page-intro">Abgelegte Pieces; abgeschlossene Sendungen folgen in Etappe 6.</p>
|
||||
<p class="page-intro">Stabile Sendungshistorie und bewusst abgelegte Fundus-Pieces.</p>
|
||||
</header>
|
||||
{#if form?.error}<div class="form-message error" role="alert">{form.error}</div>{/if}
|
||||
{#if form?.success}<div class="form-message success" role="status">{form.success}</div>{/if}
|
||||
<section aria-labelledby="completed-shows-title">
|
||||
<h2 id="completed-shows-title" class="section-heading">Abgeschlossene Sendungen</h2>
|
||||
{#if data.completedShows.length}<div class="archive-list">
|
||||
{#each data.completedShows as show (show.id)}<article>
|
||||
<div>
|
||||
<h2><a href={resolve('/sendungen/[id]', { id: show.id })}>{show.title}</a></h2>
|
||||
<p>
|
||||
{show.sectionCount} Abschnitte · {formatDuration(show.totalDurationSeconds)} Planzeit
|
||||
</p>
|
||||
</div>
|
||||
<form method="POST" action="?/duplicateShow">
|
||||
<input type="hidden" name="showId" value={show.id} />
|
||||
<input type="hidden" name="commandId" value={data.duplicateCommandId} />
|
||||
<button class="secondary-button" type="submit">Als neue Sendung duplizieren</button>
|
||||
</form>
|
||||
</article>{/each}
|
||||
</div>{:else}<p class="context-empty">Noch keine Sendung historisch abgeschlossen.</p>{/if}
|
||||
</section>
|
||||
<h2 class="section-heading">Archivierte Pieces</h2>
|
||||
{#if data.pieces.length}<div class="archive-list">
|
||||
{#each data.pieces as piece (piece.id)}<article>
|
||||
<div>
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
import { fail } from '@sveltejs/kit';
|
||||
import type { Actions, PageServerLoad } from './$types';
|
||||
import { requireUser } from '#lib/server/auth.js';
|
||||
import { captureInbox, listPieces, setPieceDeleted } from '#lib/server/content.js';
|
||||
import { captureInbox, getTaxonomy, listPieces, setPieceDeleted } from '#lib/server/content.js';
|
||||
import { discardFeedEntries, importFeedEntries, listFeedEntries } from '#lib/server/feeds.js';
|
||||
|
||||
export const load: PageServerLoad = ({ locals }) => {
|
||||
requireUser(locals.user);
|
||||
return { pieces: listPieces({ statuses: ['inbox'] }) };
|
||||
return {
|
||||
pieces: listPieces({ statuses: ['inbox'] }),
|
||||
feedEntries: listFeedEntries(),
|
||||
taxonomy: getTaxonomy()
|
||||
};
|
||||
};
|
||||
|
||||
export const actions = {
|
||||
@@ -36,5 +41,39 @@ export const actions = {
|
||||
} catch {
|
||||
return fail(409, { error: 'Das Piece wurde inzwischen geändert. Bitte neu laden.' });
|
||||
}
|
||||
},
|
||||
importFeeds: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
const entryIds = data.getAll('entryIds').map(String);
|
||||
if (!entryIds.length)
|
||||
return fail(400, {
|
||||
intent: 'feedImport',
|
||||
feedError: 'Mindestens einen Beitrag auswählen.'
|
||||
});
|
||||
try {
|
||||
const pieceIds = importFeedEntries(entryIds, data.getAll('categoryIds').map(String));
|
||||
return {
|
||||
intent: 'feedImport',
|
||||
feedSuccess: `${pieceIds.length} ${pieceIds.length === 1 ? 'Beitrag' : 'Beiträge'} in den Eingang übernommen.`
|
||||
};
|
||||
} catch {
|
||||
return fail(400, {
|
||||
intent: 'feedImport',
|
||||
feedError: 'Die Auswahl konnte nicht übernommen werden.'
|
||||
});
|
||||
}
|
||||
},
|
||||
discardFeeds: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
const entryIds = data.getAll('entryIds').map(String);
|
||||
if (!entryIds.length)
|
||||
return fail(400, { intent: 'feedDiscard', feedError: 'Mindestens einen Beitrag auswählen.' });
|
||||
const count = discardFeedEntries(entryIds);
|
||||
return {
|
||||
intent: 'feedDiscard',
|
||||
feedSuccess: `${count} ${count === 1 ? 'Beitrag' : 'Beiträge'} verworfen.`
|
||||
};
|
||||
}
|
||||
} satisfies Actions;
|
||||
@@ -1,8 +1,10 @@
|
||||
<script lang="ts">
|
||||
import { resolve } from '$app/paths';
|
||||
import AppIcon from '#lib/components/AppIcon.svelte';
|
||||
import RssSelectionDialog from '#lib/components/RssSelectionDialog.svelte';
|
||||
import type { PageProps } from './$types';
|
||||
let { data, form }: PageProps = $props();
|
||||
let rssDialog: { showModal: () => void };
|
||||
</script>
|
||||
|
||||
<svelte:head><title>Eingang | Sendewerk</title></svelte:head>
|
||||
@@ -43,6 +45,39 @@
|
||||
<button class="primary-button" type="submit">Im Eingang ablegen</button>
|
||||
</form>
|
||||
</section>
|
||||
<section class="quiet-panel rss-inbox-panel">
|
||||
<div class="panel-heading">
|
||||
<div>
|
||||
<p class="eyebrow">RSS-Importeingang</p>
|
||||
<h2>RSS-Beiträge</h2>
|
||||
</div>
|
||||
<span class="catalog-entry-icon"><AppIcon name="rss" /></span>
|
||||
</div>
|
||||
<p class="catalog-note">
|
||||
{data.feedEntries.length}
|
||||
{data.feedEntries.length === 1 ? 'Beitrag ist' : 'Beiträge sind'}
|
||||
verfügbar. Erst deine ausdrückliche Auswahl übernimmt sie in den redaktionellen Eingang.
|
||||
</p>
|
||||
{#if form?.feedError}<div class="form-message error" role="alert">{form.feedError}</div>{/if}
|
||||
{#if form?.feedSuccess}<div class="form-message success" role="status">
|
||||
{form.feedSuccess}
|
||||
</div>{/if}
|
||||
<button
|
||||
class="compact-add-button"
|
||||
type="button"
|
||||
disabled={!data.feedEntries.length}
|
||||
onclick={() => rssDialog.showModal()}
|
||||
>
|
||||
<AppIcon name="list" />
|
||||
{data.feedEntries.length ? 'RSS-Beiträge auswählen' : 'Keine neuen RSS-Beiträge'}
|
||||
</button>
|
||||
</section>
|
||||
<RssSelectionDialog
|
||||
bind:this={rssDialog}
|
||||
entries={data.feedEntries}
|
||||
categories={data.taxonomy.categories}
|
||||
{form}
|
||||
/>
|
||||
{#if data.pieces.length}
|
||||
<section class="inbox-list">
|
||||
<h2>{data.pieces.length} {data.pieces.length === 1 ? 'offener Inhalt' : 'offene Inhalte'}</h2>
|
||||
@@ -81,3 +116,18 @@
|
||||
<p>Neue Gedanken und Links können oben direkt aufgenommen werden.</p>
|
||||
</section>{/if}
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.rss-inbox-panel {
|
||||
display: grid;
|
||||
gap: 0.75rem;
|
||||
margin-block: 1.5rem;
|
||||
padding: clamp(0.85rem, 2vw, 1.2rem);
|
||||
}
|
||||
.rss-inbox-panel .panel-heading {
|
||||
margin: 0;
|
||||
}
|
||||
.rss-inbox-panel .catalog-note {
|
||||
margin: 0;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,31 @@
|
||||
import { fail } from '@sveltejs/kit';
|
||||
import type { Actions, PageServerLoad } from './$types';
|
||||
import { getAuthConfig } from '#lib/server/config.js';
|
||||
import { authenticateShare, getSharedShow, SHARE_SESSION_COOKIE } from '#lib/server/shares.js';
|
||||
|
||||
export const load: PageServerLoad = ({ params, cookies }) => {
|
||||
return getSharedShow(params.token, cookies.get(SHARE_SESSION_COOKIE));
|
||||
};
|
||||
|
||||
export const actions = {
|
||||
password: async ({ params, request, cookies, getClientAddress }) => {
|
||||
const data = await request.formData();
|
||||
try {
|
||||
const session = await authenticateShare(
|
||||
params.token,
|
||||
String(data.get('password') || ''),
|
||||
getClientAddress()
|
||||
);
|
||||
cookies.set(SHARE_SESSION_COOKIE, session.token, {
|
||||
path: `/freigabe/${params.token}`,
|
||||
httpOnly: true,
|
||||
sameSite: 'strict',
|
||||
secure: getAuthConfig().secureCookies,
|
||||
expires: session.expires
|
||||
});
|
||||
return { success: true };
|
||||
} catch {
|
||||
return fail(401, { error: 'Passwort falsch oder Freigabe nicht mehr verfügbar.' });
|
||||
}
|
||||
}
|
||||
} satisfies Actions;
|
||||
@@ -0,0 +1,141 @@
|
||||
<script lang="ts">
|
||||
import { page } from '$app/state';
|
||||
import { formatDuration } from '#lib/format.js';
|
||||
import type { PageProps } from './$types';
|
||||
|
||||
let { data, form }: PageProps = $props();
|
||||
|
||||
function berlinDate(value: string | null) {
|
||||
if (!value) return 'Termin nicht angegeben';
|
||||
return new Intl.DateTimeFormat('de-DE', {
|
||||
timeZone: 'Europe/Berlin',
|
||||
dateStyle: 'full',
|
||||
timeStyle: 'short'
|
||||
}).format(new Date(value));
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:head><title>Sendungsfreigabe | Sendewerk</title></svelte:head>
|
||||
|
||||
<main class="share-page">
|
||||
{#if data.status === 'unavailable'}
|
||||
<section class="quiet-panel share-gate">
|
||||
<p class="eyebrow">Lesefreigabe</p>
|
||||
<h1>Nicht verfügbar</h1>
|
||||
<p>Dieser Link ist ungültig, abgelaufen oder wurde widerrufen.</p>
|
||||
</section>
|
||||
{:else if data.status === 'password'}
|
||||
<section class="quiet-panel share-gate">
|
||||
<p class="eyebrow">Geschützte Lesefreigabe</p>
|
||||
<h1>Passwort erforderlich</h1>
|
||||
{#if form?.error}<div class="form-message error" role="alert">{form.error}</div>{/if}
|
||||
<form method="POST" action="?/password" class="compact-form">
|
||||
<label
|
||||
>Passwort<input
|
||||
name="password"
|
||||
type="password"
|
||||
required
|
||||
autocomplete="current-password"
|
||||
/></label
|
||||
>
|
||||
<button class="primary-button" type="submit">Sendung öffnen</button>
|
||||
</form>
|
||||
</section>
|
||||
{:else}
|
||||
<header class="share-heading">
|
||||
<p class="eyebrow">
|
||||
{data.share.isCompleted ? 'Abgeschlossene Sendung' : 'Aktuelle Sendungsplanung'} · Nur lesen
|
||||
</p>
|
||||
<h1>{data.share.title}</h1>
|
||||
<p>{berlinDate(data.share.startsAtUtc)} Uhr</p>
|
||||
</header>
|
||||
<div class="shared-rundown">
|
||||
{#each data.share.sections as section (section)}
|
||||
<section class="quiet-panel shared-section">
|
||||
<header>
|
||||
<div>
|
||||
{#if section.category}<small
|
||||
style={`--tax-color: ${section.categoryColor ?? '#67dde8'}`}
|
||||
>{section.category}</small
|
||||
>{/if}
|
||||
<h2>{section.name}</h2>
|
||||
</div>
|
||||
{#if section.explicitDurationSeconds !== null}<span
|
||||
>{formatDuration(section.explicitDurationSeconds)}</span
|
||||
>{/if}
|
||||
</header>
|
||||
{#each section.usages as usage (usage)}
|
||||
<article class="shared-usage">
|
||||
<div class="shared-usage-heading">
|
||||
<div>
|
||||
<small
|
||||
>{usage.status === 'done'
|
||||
? 'Gesendet'
|
||||
: usage.status === 'skipped'
|
||||
? 'Übersprungen'
|
||||
: 'Offen'}</small
|
||||
>
|
||||
<h3>{usage.title}</h3>
|
||||
</div>
|
||||
<span>{formatDuration(usage.actualDurationSeconds || usage.durationSeconds)}</span>
|
||||
</div>
|
||||
{#if usage.media}<img
|
||||
src={`${page.url.pathname}/media/${usage.media.id}`}
|
||||
alt={usage.media.alt_text}
|
||||
/>{/if}
|
||||
{#if 'introHtml' in usage && usage.introHtml}<div class="shared-copy">
|
||||
<strong>Einleitung</strong>
|
||||
<!-- HTML is produced exclusively by the server-side allowlist sanitizer. -->
|
||||
<!-- eslint-disable-next-line svelte/no-at-html-tags -->
|
||||
<div>{@html usage.introHtml}</div>
|
||||
</div>{/if}
|
||||
{#if 'moderationHtml' in usage && usage.moderationHtml}<div class="shared-copy">
|
||||
<strong>Moderation</strong>
|
||||
<!-- HTML is produced exclusively by the server-side allowlist sanitizer. -->
|
||||
<!-- eslint-disable-next-line svelte/no-at-html-tags -->
|
||||
<div>{@html usage.moderationHtml}</div>
|
||||
</div>{/if}
|
||||
{#if 'interactionHtml' in usage && usage.interactionHtml}<div class="shared-copy">
|
||||
<strong>Interaktion</strong>
|
||||
<!-- HTML is produced exclusively by the server-side allowlist sanitizer. -->
|
||||
<!-- eslint-disable-next-line svelte/no-at-html-tags -->
|
||||
<div>{@html usage.interactionHtml}</div>
|
||||
</div>{/if}
|
||||
{#if 'transitionHtml' in usage && usage.transitionHtml}<div class="shared-copy">
|
||||
<strong>Überleitung</strong>
|
||||
<!-- HTML is produced exclusively by the server-side allowlist sanitizer. -->
|
||||
<!-- eslint-disable-next-line svelte/no-at-html-tags -->
|
||||
<div>{@html usage.transitionHtml}</div>
|
||||
</div>{/if}
|
||||
{#if 'researchHtml' in usage && usage.researchHtml}<details>
|
||||
<summary>Recherche</summary>
|
||||
<!-- HTML is produced exclusively by the server-side allowlist sanitizer. -->
|
||||
<!-- eslint-disable-next-line svelte/no-at-html-tags -->
|
||||
<div class="shared-copy">{@html usage.researchHtml}</div>
|
||||
</details>{/if}
|
||||
{#if 'sources' in usage && usage.sources?.length}<details>
|
||||
<summary>Quellen</summary>
|
||||
<ul>
|
||||
{#each usage.sources ?? [] as source (source)}<li>
|
||||
<!-- External source URLs are validated and stored server-side. -->
|
||||
<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
|
||||
<a href={source.url} rel="noreferrer">{source.label || source.url}</a>
|
||||
</li>{/each}
|
||||
</ul>
|
||||
</details>{/if}
|
||||
{#if 'tools' in usage && usage.tools?.length}<details>
|
||||
<summary>Werkzeuge</summary>
|
||||
<ul>
|
||||
{#each usage.tools ?? [] as tool (tool)}<li>
|
||||
<strong>{tool.name}</strong>{#if tool.note}
|
||||
· {tool.note}{/if}
|
||||
</li>{/each}
|
||||
</ul>
|
||||
</details>{/if}
|
||||
</article>
|
||||
{/each}
|
||||
</section>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
</main>
|
||||
@@ -0,0 +1,18 @@
|
||||
import { error } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { getSharedMedia, SHARE_SESSION_COOKIE } from '#lib/server/shares.js';
|
||||
|
||||
export const GET: RequestHandler = async ({ params, cookies }) => {
|
||||
const media = await getSharedMedia(params.token, cookies.get(SHARE_SESSION_COOKIE), params.id);
|
||||
if (!media) error(404, 'Bild nicht gefunden');
|
||||
return new Response(media.data, {
|
||||
headers: {
|
||||
'Content-Type': media.mimeType,
|
||||
'Content-Length': String(media.byteSize),
|
||||
'Cache-Control': 'private, no-store',
|
||||
'Content-Security-Policy': "default-src 'none'; sandbox",
|
||||
'Cross-Origin-Resource-Policy': 'same-origin',
|
||||
'X-Content-Type-Options': 'nosniff'
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -24,13 +24,19 @@ import { listTools } from '#lib/server/tools.js';
|
||||
function renderedFields(
|
||||
piece: Pick<
|
||||
PieceInput,
|
||||
'intro' | 'researchText' | 'moderationNotes' | 'transitionText' | 'presentationText'
|
||||
| 'intro'
|
||||
| 'researchText'
|
||||
| 'moderationNotes'
|
||||
| 'interactionText'
|
||||
| 'transitionText'
|
||||
| 'presentationText'
|
||||
>
|
||||
) {
|
||||
return {
|
||||
intro: renderMarkdown(piece.intro),
|
||||
research: renderMarkdown(piece.researchText),
|
||||
moderation: renderMarkdown(piece.moderationNotes),
|
||||
interaction: renderMarkdown(piece.interactionText ?? ''),
|
||||
transition: renderMarkdown(piece.transitionText),
|
||||
presentation: renderMarkdown(piece.presentationText)
|
||||
};
|
||||
@@ -69,10 +75,12 @@ function pieceInput(data: FormData): PieceInput {
|
||||
summary: text(data, 'summary'),
|
||||
formatId: text(data, 'formatId') || null,
|
||||
status: text(data, 'status') as EditablePieceStatus,
|
||||
preparationEffort: (text(data, 'preparationEffort') || null) as PieceInput['preparationEffort'],
|
||||
durationSeconds: durationInSeconds(data),
|
||||
intro: text(data, 'intro'),
|
||||
researchText: text(data, 'researchText'),
|
||||
moderationNotes: text(data, 'moderationNotes'),
|
||||
interactionText: text(data, 'interactionText'),
|
||||
transitionText: text(data, 'transitionText'),
|
||||
presentationText: text(data, 'presentationText'),
|
||||
presentationMode: text(data, 'presentationMode') as PieceInput['presentationMode'],
|
||||
|
||||
@@ -77,14 +77,19 @@
|
||||
: draft.presentationProvider === 'tiktok' && draft.presentationProviderId
|
||||
? `https://www.tiktok.com/player/v1/${draft.presentationProviderId}`
|
||||
: '',
|
||||
images: selectedMedia ? [{ id: selectedMedia.id, altText: selectedMedia.altText }] : []
|
||||
images:
|
||||
selectedMedia && ['text', 'image'].includes(draft.presentationMode)
|
||||
? [{ id: selectedMedia.id, altText: selectedMedia.altText }]
|
||||
: []
|
||||
});
|
||||
let presentationPreviewImage = $derived(
|
||||
selectedMedia
|
||||
selectedMedia && ['text', 'image'].includes(draft.presentationMode)
|
||||
? draft.presentationMode === 'text'
|
||||
? '/media'
|
||||
: `/media/${selectedMedia.id}`
|
||||
: sourcePreviewImage
|
||||
: draft.presentationMode === 'link'
|
||||
? sourcePreviewImage
|
||||
: ''
|
||||
);
|
||||
let pendingHref: string | null = null;
|
||||
let allowNavigation = false;
|
||||
@@ -116,8 +121,8 @@
|
||||
if (
|
||||
control instanceof HTMLInputElement &&
|
||||
control.name === 'presentationMode' &&
|
||||
control.value !== 'text' &&
|
||||
draft.presentationSourcePosition === null
|
||||
((['link', 'video'].includes(control.value) && draft.presentationSourcePosition === null) ||
|
||||
(control.value === 'image' && !draft.presentationMediaId))
|
||||
) {
|
||||
return;
|
||||
}
|
||||
@@ -308,6 +313,13 @@
|
||||
rows={10}
|
||||
bind:value={draft.moderationNotes}
|
||||
/>
|
||||
<MarkdownEditorField
|
||||
name="interactionText"
|
||||
label="Interaktion"
|
||||
placeholder="Welche Frage möchtest du dem Chat stellen?"
|
||||
privateField
|
||||
bind:value={draft.interactionText}
|
||||
/>
|
||||
<MarkdownEditorField
|
||||
name="transitionText"
|
||||
label="Überleitung"
|
||||
@@ -340,6 +352,14 @@
|
||||
bind:value={durationMinutes}
|
||||
/></label
|
||||
>
|
||||
<label
|
||||
>Vorbereitungsaufwand<select
|
||||
name="preparationEffort"
|
||||
bind:value={draft.preparationEffort}
|
||||
><option value={null}>Nicht angegeben</option><option value="low">Gering</option
|
||||
><option value="medium">Mittel</option><option value="high">Hoch</option></select
|
||||
></label
|
||||
>
|
||||
<label
|
||||
>Format<select name="formatId" bind:value={draft.formatId}
|
||||
><option value={null}>Ohne Format</option
|
||||
@@ -519,23 +539,9 @@
|
||||
</div>
|
||||
<div class="piece-presentation-layout">
|
||||
<div class="piece-presentation-controls">
|
||||
<label
|
||||
>Präsentationstitel<input
|
||||
name="outputTitle"
|
||||
maxlength="300"
|
||||
placeholder="Optional, sonst interner Titel"
|
||||
bind:value={draft.outputTitle}
|
||||
/></label
|
||||
>
|
||||
<MarkdownEditorField
|
||||
name="presentationText"
|
||||
label="Öffentlicher Text"
|
||||
placeholder="Text für die Publikumsausgabe"
|
||||
rows={8}
|
||||
bind:value={draft.presentationText}
|
||||
/>
|
||||
<p class="field-label">Präsentationsart</p>
|
||||
<div class="presentation-mode-picker" role="group" aria-label="Darstellung">
|
||||
{#each [['text', 'Text'], ['link', 'Linkvorschau'], ['video', 'Video']] as mode (mode[0])}<label
|
||||
{#each [['text', 'Text'], ['image', 'Nur Bild'], ['link', 'Linkvorschau'], ['video', 'Video']] as mode (mode[0])}<label
|
||||
><input
|
||||
type="radio"
|
||||
name="presentationMode"
|
||||
@@ -544,9 +550,30 @@
|
||||
/>{mode[1]}</label
|
||||
>{/each}
|
||||
</div>
|
||||
{#if draft.presentationMode === 'text'}
|
||||
<label
|
||||
>Öffentliche Überschrift<input
|
||||
name="outputTitle"
|
||||
maxlength="300"
|
||||
placeholder="Optional, sonst interner Titel"
|
||||
bind:value={draft.outputTitle}
|
||||
/></label
|
||||
>
|
||||
<MarkdownEditorField
|
||||
name="presentationText"
|
||||
label="Öffentlicher Vorspann"
|
||||
placeholder="Text für die Publikumsausgabe"
|
||||
rows={8}
|
||||
bind:value={draft.presentationText}
|
||||
/>
|
||||
{:else}
|
||||
<input type="hidden" name="outputTitle" value={draft.outputTitle} />
|
||||
<input type="hidden" name="presentationText" value={draft.presentationText} />
|
||||
{/if}
|
||||
{#if draft.presentationMode === 'link' || draft.presentationMode === 'video'}
|
||||
<div class="presentation-settings">
|
||||
<label
|
||||
>Quelle<select
|
||||
>{draft.presentationMode === 'video' ? 'Video-URL' : 'Quelle/URL'}<select
|
||||
name="presentationSourcePosition"
|
||||
bind:value={draft.presentationSourcePosition}
|
||||
onchange={presentationSourceChanged}
|
||||
@@ -557,7 +584,7 @@
|
||||
></label
|
||||
>
|
||||
<label
|
||||
>Kartentitel<input
|
||||
>{draft.presentationMode === 'video' ? 'Videotitel' : 'Kartentitel'}<input
|
||||
name="presentationTitle"
|
||||
maxlength="300"
|
||||
placeholder="Optionaler Anzeigetitel"
|
||||
@@ -565,16 +592,24 @@
|
||||
oninput={() => (draft.presentationTitleManual = true)}
|
||||
/></label
|
||||
>
|
||||
{#if draft.presentationMode === 'link'}
|
||||
<label
|
||||
>Bild-URL<input
|
||||
>Vorschaubild-URL<input
|
||||
name="presentationImageUrl"
|
||||
type="url"
|
||||
maxlength="2000"
|
||||
placeholder="https://…"
|
||||
placeholder="Wird aus der Linkvorschau geladen"
|
||||
bind:value={draft.presentationImageUrl}
|
||||
oninput={() => (draft.presentationImageManual = true)}
|
||||
/></label
|
||||
>
|
||||
{:else}
|
||||
<input
|
||||
type="hidden"
|
||||
name="presentationImageUrl"
|
||||
value={draft.presentationImageUrl}
|
||||
/>
|
||||
{/if}
|
||||
<label class="wide-field"
|
||||
>Anreißer<textarea
|
||||
name="presentationDescription"
|
||||
@@ -598,6 +633,20 @@
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
{:else}
|
||||
<input
|
||||
type="hidden"
|
||||
name="presentationSourcePosition"
|
||||
value={draft.presentationSourcePosition ?? ''}
|
||||
/>
|
||||
<input type="hidden" name="presentationTitle" value={draft.presentationTitle} />
|
||||
<input
|
||||
type="hidden"
|
||||
name="presentationDescription"
|
||||
value={draft.presentationDescription}
|
||||
/>
|
||||
<input type="hidden" name="presentationImageUrl" value={draft.presentationImageUrl} />
|
||||
{/if}
|
||||
</div>
|
||||
<aside class="piece-presentation-preview" aria-label="Präsentationsvorschau">
|
||||
<PresentationDisplay
|
||||
@@ -624,6 +673,7 @@
|
||||
<input type="hidden" name="presentationSiteName" value={draft.presentationSiteName} />
|
||||
<input type="hidden" name="presentationProvider" value={draft.presentationProvider} />
|
||||
<input type="hidden" name="presentationProviderId" value={draft.presentationProviderId} />
|
||||
<input type="hidden" name="presentationMediaId" value={draft.presentationMediaId ?? ''} />
|
||||
<input
|
||||
type="hidden"
|
||||
name="presentationMetadataFetchedAtUtc"
|
||||
@@ -632,7 +682,11 @@
|
||||
</section>
|
||||
</form>
|
||||
|
||||
<section class="piece-editor-panel piece-media-panel" hidden={activeSection !== 'presentation'}>
|
||||
<section
|
||||
class="piece-editor-panel piece-media-panel"
|
||||
hidden={activeSection !== 'presentation' ||
|
||||
!['text', 'image'].includes(draft.presentationMode)}
|
||||
>
|
||||
<div class="piece-subsection-heading">
|
||||
<div>
|
||||
<p class="eyebrow">Hochgeladene Bilder</p>
|
||||
@@ -640,12 +694,10 @@
|
||||
</div>
|
||||
<small>JPEG, PNG, WebP oder GIF bis 5 MB</small>
|
||||
</div>
|
||||
{#if data.piece.media.length}<label class="media-none"
|
||||
{#if draft.media.length && draft.presentationMode === 'text'}<label class="media-none"
|
||||
><input
|
||||
form="piece-editor-form"
|
||||
type="radio"
|
||||
name="presentationMediaId"
|
||||
value=""
|
||||
name="presentationMediaChoice"
|
||||
checked={!draft.presentationMediaId}
|
||||
onchange={() => {
|
||||
draft.presentationMediaId = null;
|
||||
@@ -654,13 +706,11 @@
|
||||
/> Kein hochgeladenes Bild</label
|
||||
>
|
||||
<div class="media-grid">
|
||||
{#each data.piece.media as media (media.id)}<figure>
|
||||
{#each draft.media as media (media.id)}<figure>
|
||||
<label class="media-presentation-choice"
|
||||
><input
|
||||
form="piece-editor-form"
|
||||
type="radio"
|
||||
name="presentationMediaId"
|
||||
value={media.id}
|
||||
name="presentationMediaChoice"
|
||||
checked={draft.presentationMediaId === media.id}
|
||||
onchange={() => {
|
||||
draft.presentationMediaId = media.id;
|
||||
|
||||
@@ -14,10 +14,12 @@
|
||||
<div class="presentation-test-status" role="status">Isolierte Testansicht</div>
|
||||
<PresentationDisplay
|
||||
content={data.content}
|
||||
imageSrc={data.content.images.length
|
||||
? data.content.mode === 'text'
|
||||
imageSrc={data.content.mode === 'text' && data.content.images.length
|
||||
? '/media'
|
||||
: `/media/${data.content.images[0].id}`
|
||||
: `/fundus/${data.pieceId}/praesentation/preview-image`}
|
||||
: data.content.mode === 'image' && data.content.images.length
|
||||
? `/media/${data.content.images[0].id}`
|
||||
: data.content.mode === 'link' && data.content.imageUrl
|
||||
? `/fundus/${data.pieceId}/praesentation/preview-image`
|
||||
: ''}
|
||||
/>
|
||||
</main>
|
||||
@@ -7,7 +7,9 @@ import { fetchPresentationImage } from '#lib/server/presentation.js';
|
||||
export const GET: RequestHandler = async ({ locals, params }) => {
|
||||
requireUser(locals.user);
|
||||
const piece = getPiece(params.id);
|
||||
if (!piece?.presentationImageUrl) error(404, 'Vorschaubild nicht verfügbar');
|
||||
if (piece?.presentationMode !== 'link' || !piece.presentationImageUrl) {
|
||||
error(404, 'Vorschaubild nicht verfügbar');
|
||||
}
|
||||
try {
|
||||
const image = await fetchPresentationImage(piece.presentationImageUrl);
|
||||
return new Response(new Uint8Array(image.data), {
|
||||
|
||||
@@ -1,21 +1,40 @@
|
||||
import { randomUUID } from 'node:crypto';
|
||||
import { error, fail } from '@sveltejs/kit';
|
||||
import type { Actions, PageServerLoad } from './$types';
|
||||
import { requireUser } from '#lib/server/auth.js';
|
||||
import { requireBarkeeper, requireUser } from '#lib/server/auth.js';
|
||||
import { finalizeShow, getCompletionSummary } from '#lib/server/completion.js';
|
||||
import {
|
||||
completeCurrent,
|
||||
clearPresentationChannel,
|
||||
endLive,
|
||||
getLiveView,
|
||||
getPresentationChannelStatus,
|
||||
goBack,
|
||||
issuePresentationAccess,
|
||||
moveOpenUsage,
|
||||
pauseLive,
|
||||
presentUsage,
|
||||
rotatePresentationChannelKey,
|
||||
resetSectionTimer,
|
||||
resetTotalTimer,
|
||||
resumeUsage,
|
||||
resumeEndedLive,
|
||||
resumeLive,
|
||||
selectUsage,
|
||||
setShowStatus,
|
||||
skipCurrent,
|
||||
startNewLiveRun,
|
||||
startOrResumeLive
|
||||
} from '#lib/server/live.js';
|
||||
import { listShows } from '#lib/server/shows.js';
|
||||
import {
|
||||
createShare,
|
||||
deleteShare,
|
||||
listShares,
|
||||
replaceShareToken,
|
||||
updateShare
|
||||
} from '#lib/server/shares.js';
|
||||
import { berlinLocalToUtc } from '#lib/server/time.js';
|
||||
|
||||
function text(data: FormData, name: string) {
|
||||
return String(data.get(name) || '');
|
||||
@@ -41,6 +60,13 @@ function actionError(cause: unknown) {
|
||||
return { status: 409, error: 'Abgeschlossene Sendungen können nicht live gesteuert werden.' };
|
||||
if (code === 'NOT_FOUND')
|
||||
return { status: 404, error: 'Sendung oder Piece wurde nicht gefunden.' };
|
||||
if (code === 'TIMER_PAUSED') return { status: 409, error: 'Die Sendung ist pausiert.' };
|
||||
if (code === 'ALREADY_PAUSED' || code === 'ALREADY_RUNNING')
|
||||
return { status: 409, error: 'Der Timerzustand wurde bereits geändert.' };
|
||||
if (code === 'NO_SECTION_TIMER')
|
||||
return { status: 409, error: 'Es ist kein Abschnittstimer aktiv.' };
|
||||
if (code === 'NOT_LIVE' || code === 'NOT_ENDED' || code === 'ALREADY_STARTED')
|
||||
return { status: 409, error: 'Die Sendung befindet sich nicht im passenden Zustand.' };
|
||||
if (code.startsWith('INVALID_')) return { status: 400, error: 'Die Live-Aktion ist ungültig.' };
|
||||
return { status: 500, error: 'Die Live-Aktion konnte nicht gespeichert werden.' };
|
||||
}
|
||||
@@ -55,11 +81,20 @@ function attempt(intent: string, operation: () => unknown) {
|
||||
}
|
||||
|
||||
export const load: PageServerLoad = ({ locals, url }) => {
|
||||
requireUser(locals.user);
|
||||
const actor = requireUser(locals.user);
|
||||
const showId = url.searchParams.get('show') || listShows()[0]?.id;
|
||||
if (!showId) error(404, 'Keine Sendung vorhanden');
|
||||
try {
|
||||
return { live: getLiveView(showId), commandId: randomUUID() };
|
||||
const live = getLiveView(showId);
|
||||
return {
|
||||
live,
|
||||
outputStatus: getPresentationChannelStatus(showId),
|
||||
canManageShares: actor.role === 'barkeeper',
|
||||
shares: actor.role === 'barkeeper' ? listShares(actor, showId) : [],
|
||||
commandId: randomUUID(),
|
||||
completion:
|
||||
live.endedAtUtc && live.show.status !== 'completed' ? getCompletionSummary(showId) : null
|
||||
};
|
||||
} catch (cause) {
|
||||
if (cause instanceof Error && cause.message === 'NOT_FOUND')
|
||||
error(404, 'Sendung nicht gefunden');
|
||||
@@ -68,6 +103,73 @@ export const load: PageServerLoad = ({ locals, url }) => {
|
||||
};
|
||||
|
||||
export const actions = {
|
||||
createShare: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
const share = await createShare(actor, {
|
||||
showId: text(data, 'showId'),
|
||||
scope: text(data, 'scope'),
|
||||
password: text(data, 'password'),
|
||||
expiresAtUtc: berlinLocalToUtc(text(data, 'expiresAt'), 'INVALID_EXPIRY')
|
||||
});
|
||||
return {
|
||||
intent: 'createShare',
|
||||
success: 'Leselink angelegt.',
|
||||
shareUrl: `/freigabe/${share.token}`
|
||||
};
|
||||
} catch (cause) {
|
||||
const problem = actionError(cause);
|
||||
return fail(problem.status, { intent: 'createShare', ...problem });
|
||||
}
|
||||
},
|
||||
updateShare: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
await updateShare(
|
||||
actor,
|
||||
text(data, 'shareId'),
|
||||
{
|
||||
scope: text(data, 'scope'),
|
||||
passwordMode: text(data, 'passwordMode'),
|
||||
password: text(data, 'password'),
|
||||
expiresAtUtc: berlinLocalToUtc(text(data, 'expiresAt'), 'INVALID_EXPIRY')
|
||||
},
|
||||
text(data, 'showId')
|
||||
);
|
||||
return { intent: 'updateShare', success: 'Freigabe aktualisiert.' };
|
||||
} catch (cause) {
|
||||
const problem = actionError(cause);
|
||||
return fail(problem.status, { intent: 'updateShare', ...problem });
|
||||
}
|
||||
},
|
||||
replaceShare: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
const token = replaceShareToken(actor, text(data, 'shareId'), text(data, 'showId'));
|
||||
return {
|
||||
intent: 'replaceShare',
|
||||
success: 'Ersatzlink angelegt. Der bisherige Link ist ungültig.',
|
||||
shareUrl: `/freigabe/${token}`
|
||||
};
|
||||
} catch (cause) {
|
||||
const problem = actionError(cause);
|
||||
return fail(problem.status, { intent: 'replaceShare', ...problem });
|
||||
}
|
||||
},
|
||||
deleteShare: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
deleteShare(actor, text(data, 'shareId'), text(data, 'showId'));
|
||||
return { intent: 'deleteShare', success: 'Freigabe gelöscht.' };
|
||||
} catch (cause) {
|
||||
const problem = actionError(cause);
|
||||
return fail(problem.status, { intent: 'deleteShare', ...problem });
|
||||
}
|
||||
},
|
||||
start: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
@@ -75,6 +177,86 @@ export const actions = {
|
||||
startOrResumeLive(text(data, 'showId'), text(data, 'commandId'), Number(data.get('revision')))
|
||||
);
|
||||
},
|
||||
pause: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
return attempt('pause', () =>
|
||||
pauseLive(text(data, 'showId'), text(data, 'commandId'), Number(data.get('revision')))
|
||||
);
|
||||
},
|
||||
resume: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
return attempt('resume', () =>
|
||||
resumeLive(text(data, 'showId'), text(data, 'commandId'), Number(data.get('revision')))
|
||||
);
|
||||
},
|
||||
resetSectionTimer: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
return attempt('resetSectionTimer', () =>
|
||||
resetSectionTimer(text(data, 'showId'), text(data, 'commandId'), Number(data.get('revision')))
|
||||
);
|
||||
},
|
||||
resetTotalTimer: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
return attempt('resetTotalTimer', () =>
|
||||
resetTotalTimer(text(data, 'showId'), text(data, 'commandId'), Number(data.get('revision')))
|
||||
);
|
||||
},
|
||||
setStatus: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
const status = text(data, 'status');
|
||||
if (status !== 'draft' && status !== 'ready') {
|
||||
return fail(400, { intent: 'setStatus', error: 'Der Sendungsstatus ist ungültig.' });
|
||||
}
|
||||
return attempt('setStatus', () =>
|
||||
setShowStatus(
|
||||
text(data, 'showId'),
|
||||
text(data, 'commandId'),
|
||||
Number(data.get('revision')),
|
||||
Number(data.get('showRevision')),
|
||||
status
|
||||
)
|
||||
);
|
||||
},
|
||||
end: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
return attempt('end', () =>
|
||||
endLive(text(data, 'showId'), text(data, 'commandId'), Number(data.get('revision')))
|
||||
);
|
||||
},
|
||||
finalize: async ({ locals, request }) => {
|
||||
const actor = requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
return attempt('finalize', () =>
|
||||
finalizeShow({
|
||||
showId: text(data, 'showId'),
|
||||
commandId: text(data, 'commandId'),
|
||||
expectedShowRevision: Number(data.get('showRevision')),
|
||||
expectedLiveRevision: Number(data.get('revision')),
|
||||
archivePieceIds: data.getAll('archivePieceIds').map(String),
|
||||
actor
|
||||
})
|
||||
);
|
||||
},
|
||||
resumeEnded: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
return attempt('resumeEnded', () =>
|
||||
resumeEndedLive(text(data, 'showId'), text(data, 'commandId'), Number(data.get('revision')))
|
||||
);
|
||||
},
|
||||
startNewRun: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
return attempt('startNewRun', () =>
|
||||
startNewLiveRun(text(data, 'showId'), text(data, 'commandId'), Number(data.get('revision')))
|
||||
);
|
||||
},
|
||||
complete: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
@@ -108,6 +290,18 @@ export const actions = {
|
||||
)
|
||||
);
|
||||
},
|
||||
resumeUsage: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
return attempt('resumeUsage', () =>
|
||||
resumeUsage(
|
||||
text(data, 'showId'),
|
||||
text(data, 'usageId'),
|
||||
text(data, 'commandId'),
|
||||
Number(data.get('revision'))
|
||||
)
|
||||
);
|
||||
},
|
||||
present: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
|
||||
+642
-125
File diff suppressed because it is too large.
Load diff
@@ -8,13 +8,26 @@ import {
|
||||
validEmail
|
||||
} from '#lib/server/auth.js';
|
||||
|
||||
export const load: PageServerLoad = ({ locals }) => {
|
||||
function safeReturnTo(value: string | null): string {
|
||||
if (!value || value.length > 4000) return '/fundus';
|
||||
try {
|
||||
const target = new URL(value, 'http://sendewerk.local');
|
||||
if (target.origin === 'http://sendewerk.local' && target.pathname === '/oauth/authorize') {
|
||||
return `${target.pathname}${target.search}`;
|
||||
}
|
||||
} catch {
|
||||
// Fall back to the normal authenticated landing page.
|
||||
}
|
||||
return '/fundus';
|
||||
}
|
||||
|
||||
export const load: PageServerLoad = ({ locals, url }) => {
|
||||
if (!hasUsers()) redirect(303, '/setup');
|
||||
if (locals.user) redirect(303, '/fundus');
|
||||
if (locals.user) redirect(303, safeReturnTo(url.searchParams.get('returnTo')));
|
||||
};
|
||||
|
||||
export const actions = {
|
||||
default: async ({ request, cookies, getClientAddress }) => {
|
||||
default: async ({ request, cookies, getClientAddress, url }) => {
|
||||
const data = await request.formData();
|
||||
const email = String(data.get('email') || '').trim();
|
||||
const password = String(data.get('password') || '');
|
||||
@@ -31,6 +44,6 @@ export const actions = {
|
||||
const user = await authenticate(email, password);
|
||||
if (!user) return fail(400, { email, error: 'E-Mail oder Passwort ist nicht korrekt.' });
|
||||
createSession(user.id, cookies);
|
||||
redirect(303, '/fundus');
|
||||
redirect(303, safeReturnTo(url.searchParams.get('returnTo')));
|
||||
}
|
||||
} satisfies Actions;
|
||||
@@ -0,0 +1,154 @@
|
||||
import { json, text } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { handleMcpRequest, validJsonRpcRequest } from '#lib/server/mcp.js';
|
||||
import { getAuthConfig } from '#lib/server/config.js';
|
||||
import {
|
||||
authenticateOAuth,
|
||||
MCP_SCOPE,
|
||||
OAuthError,
|
||||
protectedResourceMetadataUrl
|
||||
} from '#lib/server/oauth.js';
|
||||
|
||||
const MODERN_VERSION = '2026-07-28';
|
||||
const supportedProtocolVersions = [MODERN_VERSION, '2025-11-25', '2025-06-18', '2025-03-26'];
|
||||
|
||||
function challenge(errorCode?: string) {
|
||||
const fields = [`resource_metadata="${protectedResourceMetadataUrl()}"`, `scope="${MCP_SCOPE}"`];
|
||||
if (errorCode) fields.push(`error="${errorCode}"`);
|
||||
return `Bearer ${fields.join(', ')}`;
|
||||
}
|
||||
|
||||
function authenticate(request: Request) {
|
||||
try {
|
||||
return authenticateOAuth(request);
|
||||
} catch (cause) {
|
||||
if (cause instanceof OAuthError) {
|
||||
const headers: Record<string, string> = { 'Cache-Control': 'no-store' };
|
||||
if (cause.status === 401) headers['WWW-Authenticate'] = challenge(cause.code);
|
||||
return json(
|
||||
{ error: cause.code, error_description: cause.message },
|
||||
{ status: cause.status, headers }
|
||||
);
|
||||
}
|
||||
throw cause;
|
||||
}
|
||||
}
|
||||
|
||||
function originAllowed(request: Request): boolean {
|
||||
const origin = request.headers.get('origin');
|
||||
return !origin || origin === getAuthConfig().origin.origin;
|
||||
}
|
||||
|
||||
function protocolError(id: string | number | null, code: number, message: string, data?: unknown) {
|
||||
return {
|
||||
jsonrpc: '2.0',
|
||||
id,
|
||||
error: { code, message, ...(data === undefined ? {} : { data }) }
|
||||
};
|
||||
}
|
||||
|
||||
function modernValidation(
|
||||
request: Request,
|
||||
body: {
|
||||
id?: string | number | null;
|
||||
method: string;
|
||||
params?: Record<string, unknown>;
|
||||
}
|
||||
): Response | null {
|
||||
const id = typeof body.id === 'string' || typeof body.id === 'number' ? body.id : null;
|
||||
const metadata = body.params?._meta;
|
||||
if (!metadata || typeof metadata !== 'object' || Array.isArray(metadata)) {
|
||||
return json(protocolError(id, -32602, 'Required MCP request metadata is missing.'), {
|
||||
status: 400
|
||||
});
|
||||
}
|
||||
const meta = metadata as Record<string, unknown>;
|
||||
const bodyVersion = meta['io.modelcontextprotocol/protocolVersion'];
|
||||
if (typeof bodyVersion !== 'string' || !supportedProtocolVersions.includes(bodyVersion)) {
|
||||
return json(
|
||||
protocolError(id, -32022, 'Unsupported protocol version', {
|
||||
supported: supportedProtocolVersions,
|
||||
requested: bodyVersion ?? null
|
||||
}),
|
||||
{ status: 400 }
|
||||
);
|
||||
}
|
||||
if (
|
||||
request.headers.get('mcp-protocol-version') !== bodyVersion ||
|
||||
request.headers.get('mcp-method') !== body.method ||
|
||||
(body.method === 'tools/call' && request.headers.get('mcp-name') !== body.params?.name)
|
||||
) {
|
||||
return json(protocolError(id, -32020, 'MCP request headers do not match the body.'), {
|
||||
status: 400
|
||||
});
|
||||
}
|
||||
const capabilities = meta['io.modelcontextprotocol/clientCapabilities'];
|
||||
if (
|
||||
body.id === null ||
|
||||
!capabilities ||
|
||||
typeof capabilities !== 'object' ||
|
||||
Array.isArray(capabilities)
|
||||
) {
|
||||
return json(protocolError(id, -32602, 'Required MCP request metadata is invalid.'), {
|
||||
status: 400
|
||||
});
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export const POST: RequestHandler = async ({ request }) => {
|
||||
if (!originAllowed(request)) return text('Forbidden', { status: 403 });
|
||||
const authenticated = authenticate(request);
|
||||
if (authenticated instanceof Response) return authenticated;
|
||||
if (!request.headers.get('content-type')?.toLowerCase().startsWith('application/json')) {
|
||||
return text('JSON wird erwartet.', { status: 415 });
|
||||
}
|
||||
let body: unknown;
|
||||
try {
|
||||
body = await request.json();
|
||||
} catch {
|
||||
return json({ jsonrpc: '2.0', id: null, error: { code: -32700, message: 'Parse error' } });
|
||||
}
|
||||
if (!validJsonRpcRequest(body)) {
|
||||
return json({ jsonrpc: '2.0', id: null, error: { code: -32600, message: 'Invalid Request' } });
|
||||
}
|
||||
const metadata = body.params?._meta;
|
||||
const bodyVersion =
|
||||
metadata && typeof metadata === 'object' && !Array.isArray(metadata)
|
||||
? (metadata as Record<string, unknown>)['io.modelcontextprotocol/protocolVersion']
|
||||
: undefined;
|
||||
const headerVersion = request.headers.get('mcp-protocol-version');
|
||||
const modern = headerVersion === MODERN_VERSION || bodyVersion === MODERN_VERSION;
|
||||
if (modern) {
|
||||
const validationFailure = modernValidation(request, body);
|
||||
if (validationFailure) return validationFailure;
|
||||
} else if (headerVersion && !supportedProtocolVersions.includes(headerVersion)) {
|
||||
return json(
|
||||
protocolError(body.id ?? null, -32022, 'Unsupported protocol version', {
|
||||
supported: supportedProtocolVersions,
|
||||
requested: headerVersion
|
||||
}),
|
||||
{ status: 400 }
|
||||
);
|
||||
}
|
||||
if (body.id === undefined) return new Response(null, { status: 202 });
|
||||
const response = handleMcpRequest(body, authenticated);
|
||||
const status = modern && 'error' in response && response.error?.code === -32601 ? 404 : 200;
|
||||
return json(response, {
|
||||
status,
|
||||
headers: { 'Cache-Control': 'no-store' }
|
||||
});
|
||||
};
|
||||
|
||||
export const GET: RequestHandler = ({ request }) => {
|
||||
if (!originAllowed(request)) return text('Forbidden', { status: 403 });
|
||||
const authenticated = authenticate(request);
|
||||
if (authenticated instanceof Response) return authenticated;
|
||||
return text('Dieser MCP-Endpunkt bietet keinen serverseitigen Ereignisstrom.', {
|
||||
status: 405,
|
||||
headers: { Allow: 'POST' }
|
||||
});
|
||||
};
|
||||
|
||||
export const DELETE: RequestHandler = () =>
|
||||
text('Method Not Allowed', { status: 405, headers: { Allow: 'POST' } });
|
||||
@@ -0,0 +1,53 @@
|
||||
import { error, redirect } from '@sveltejs/kit';
|
||||
import type { Actions, PageServerLoad } from './$types';
|
||||
import {
|
||||
authorizationErrorRedirect,
|
||||
authorizationRedirect,
|
||||
createAuthorizationCode,
|
||||
OAuthError,
|
||||
parseAuthorizationRequest
|
||||
} from '#lib/server/oauth.js';
|
||||
|
||||
function authorization(url: URL) {
|
||||
try {
|
||||
return parseAuthorizationRequest(url);
|
||||
} catch (cause) {
|
||||
if (cause instanceof OAuthError) {
|
||||
const target = authorizationErrorRedirect(url, cause);
|
||||
if (target) redirect(303, target, { external: true });
|
||||
error(cause.status, cause.message);
|
||||
}
|
||||
throw cause;
|
||||
}
|
||||
}
|
||||
|
||||
export const load: PageServerLoad = ({ locals, url }) => {
|
||||
const request = authorization(url);
|
||||
if (!locals.user) {
|
||||
const returnTo = `${url.pathname}${url.search}`;
|
||||
redirect(303, `/login?returnTo=${encodeURIComponent(returnTo)}`);
|
||||
}
|
||||
return {
|
||||
clientName: request.client.name,
|
||||
redirectHost: new URL(request.redirectUri).host,
|
||||
scope: request.scope,
|
||||
user: locals.user
|
||||
};
|
||||
};
|
||||
|
||||
export const actions = {
|
||||
default: ({ request: browserRequest, locals, url }) => {
|
||||
if (!locals.user)
|
||||
redirect(303, `/login?returnTo=${encodeURIComponent(`${url.pathname}${url.search}`)}`);
|
||||
const oauthRequest = authorization(url);
|
||||
return browserRequest.formData().then((data) => {
|
||||
if (data.get('decision') !== 'approve') {
|
||||
redirect(303, authorizationRedirect(oauthRequest, { error: 'access_denied' }), {
|
||||
external: true
|
||||
});
|
||||
}
|
||||
const code = createAuthorizationCode(oauthRequest, locals.user!);
|
||||
redirect(303, authorizationRedirect(oauthRequest, { code }), { external: true });
|
||||
});
|
||||
}
|
||||
} satisfies Actions;
|
||||
@@ -0,0 +1,30 @@
|
||||
<script lang="ts">
|
||||
import type { PageProps } from './$types';
|
||||
let { data }: PageProps = $props();
|
||||
</script>
|
||||
|
||||
<svelte:head><title>Zugriff erlauben | Sendewerk</title></svelte:head>
|
||||
|
||||
<section class="auth-card oauth-consent">
|
||||
<p class="eyebrow">Externe Verbindung</p>
|
||||
<h1>{data.clientName} verbinden?</h1>
|
||||
<p>
|
||||
Die Anwendung erhält im Namen von <strong>{data.user.displayName}</strong> lesenden Zugriff auf redaktionelle
|
||||
Pieces, Sendungen und Abläufe. Dazu gehören auch private Recherche, Moderationsnotizen, Quellen und
|
||||
die Reservebank.
|
||||
</p>
|
||||
<div class="oauth-permission">
|
||||
<strong>Nur lesen</strong>
|
||||
<span>Keine Inhalte anlegen, ändern, einplanen oder archivieren.</span>
|
||||
</div>
|
||||
<p class="oauth-redirect">
|
||||
<strong>Nicht verifizierter OAuth-Client.</strong> Nach Zustimmung erfolgt der Rücksprung zu
|
||||
<code>{data.redirectHost}</code>.
|
||||
</p>
|
||||
<form class="oauth-actions" method="POST">
|
||||
<button class="secondary-button" type="submit" name="decision" value="deny">Ablehnen</button>
|
||||
<button class="primary-button" type="submit" name="decision" value="approve">
|
||||
Zugriff erlauben
|
||||
</button>
|
||||
</form>
|
||||
</section>
|
||||
@@ -0,0 +1,36 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { OAuthError, registerOAuthClient, reserveOAuthAttempt } from '#lib/server/oauth.js';
|
||||
|
||||
export const POST: RequestHandler = async ({ request, getClientAddress }) => {
|
||||
try {
|
||||
if (!reserveOAuthAttempt('registration', getClientAddress())) {
|
||||
throw new OAuthError('temporarily_unavailable', 'Zu viele Registrierungsversuche.', 429);
|
||||
}
|
||||
if (!request.headers.get('content-type')?.toLowerCase().startsWith('application/json')) {
|
||||
throw new OAuthError('invalid_client_metadata', 'JSON wird erwartet.');
|
||||
}
|
||||
const client = registerOAuthClient(await request.json());
|
||||
return json(
|
||||
{
|
||||
client_id: client.id,
|
||||
client_id_issued_at: Math.floor(Date.now() / 1000),
|
||||
client_name: client.name,
|
||||
redirect_uris: client.redirectUris,
|
||||
grant_types: ['authorization_code'],
|
||||
response_types: ['code'],
|
||||
token_endpoint_auth_method: 'none'
|
||||
},
|
||||
{ status: 201, headers: { 'Cache-Control': 'no-store' } }
|
||||
);
|
||||
} catch (cause) {
|
||||
const problem =
|
||||
cause instanceof OAuthError
|
||||
? cause
|
||||
: new OAuthError('invalid_client_metadata', 'Ungültige Client-Metadaten.');
|
||||
return json(
|
||||
{ error: problem.code, error_description: problem.message },
|
||||
{ status: problem.status, headers: { 'Cache-Control': 'no-store' } }
|
||||
);
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,16 @@
|
||||
import { text } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import { revokeOAuthToken } from '#lib/server/oauth.js';
|
||||
|
||||
export const POST: RequestHandler = async ({ request }) => {
|
||||
if (
|
||||
request.headers
|
||||
.get('content-type')
|
||||
?.toLowerCase()
|
||||
.startsWith('application/x-www-form-urlencoded')
|
||||
) {
|
||||
const data = await request.formData();
|
||||
revokeOAuthToken(String(data.get('token') ?? ''), String(data.get('client_id') ?? ''));
|
||||
}
|
||||
return text('', { headers: { 'Cache-Control': 'no-store' } });
|
||||
};
|
||||
@@ -0,0 +1,57 @@
|
||||
import { json } from '@sveltejs/kit';
|
||||
import type { RequestHandler } from './$types';
|
||||
import {
|
||||
exchangeAuthorizationCode,
|
||||
oauthTokenDurationSeconds,
|
||||
OAuthError,
|
||||
reserveOAuthAttempt
|
||||
} from '#lib/server/oauth.js';
|
||||
|
||||
function failure(cause: unknown) {
|
||||
const problem =
|
||||
cause instanceof OAuthError
|
||||
? cause
|
||||
: new OAuthError('invalid_request', 'Ungültige Token-Anfrage.');
|
||||
return json(
|
||||
{ error: problem.code, error_description: problem.message },
|
||||
{ status: problem.status, headers: { 'Cache-Control': 'no-store', Pragma: 'no-cache' } }
|
||||
);
|
||||
}
|
||||
|
||||
export const POST: RequestHandler = async ({ request, getClientAddress }) => {
|
||||
try {
|
||||
if (!reserveOAuthAttempt('token', getClientAddress())) {
|
||||
throw new OAuthError('temporarily_unavailable', 'Zu viele Token-Anfragen.', 429);
|
||||
}
|
||||
if (
|
||||
!request.headers
|
||||
.get('content-type')
|
||||
?.toLowerCase()
|
||||
.startsWith('application/x-www-form-urlencoded')
|
||||
) {
|
||||
throw new OAuthError('invalid_request', 'Formulardaten werden erwartet.');
|
||||
}
|
||||
const data = await request.formData();
|
||||
if (data.get('grant_type') !== 'authorization_code') {
|
||||
throw new OAuthError('unsupported_grant_type', 'Nur Authorization Code wird unterstützt.');
|
||||
}
|
||||
const result = exchangeAuthorizationCode({
|
||||
code: String(data.get('code') ?? ''),
|
||||
clientId: String(data.get('client_id') ?? ''),
|
||||
redirectUri: String(data.get('redirect_uri') ?? ''),
|
||||
codeVerifier: String(data.get('code_verifier') ?? ''),
|
||||
resource: String(data.get('resource') ?? '')
|
||||
});
|
||||
return json(
|
||||
{
|
||||
access_token: result.accessToken,
|
||||
token_type: 'Bearer',
|
||||
expires_in: oauthTokenDurationSeconds(),
|
||||
scope: result.scope
|
||||
},
|
||||
{ headers: { 'Cache-Control': 'no-store', Pragma: 'no-cache' } }
|
||||
);
|
||||
} catch (cause) {
|
||||
return failure(cause);
|
||||
}
|
||||
};
|
||||
@@ -1,45 +1,47 @@
|
||||
import { fail, redirect } from '@sveltejs/kit';
|
||||
import type { Actions, PageServerLoad } from './$types';
|
||||
import { requireUser } from '#lib/server/auth.js';
|
||||
import { createShow, listShows, listShowTemplates } from '#lib/server/shows.js';
|
||||
import { berlinDateKey, berlinMonthKey, normalizeMonthKey, shiftMonth } from '#lib/calendar.js';
|
||||
import { getShowOverviewView, requireUser, setShowOverviewView } from '#lib/server/auth.js';
|
||||
import {
|
||||
createShow,
|
||||
listPreparationUsages,
|
||||
listShows,
|
||||
listShowTemplates
|
||||
} from '#lib/server/shows.js';
|
||||
import { berlinLocalToUtc } from '#lib/server/time.js';
|
||||
|
||||
function berlinLocalToUtc(value: string): string | null {
|
||||
if (!value) return null;
|
||||
const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})$/.exec(value);
|
||||
if (!match) throw new Error('INVALID_TIMESTAMP');
|
||||
const parts = match.slice(1).map(Number);
|
||||
const localMilliseconds = Date.UTC(parts[0], parts[1] - 1, parts[2], parts[3], parts[4]);
|
||||
let candidate = localMilliseconds;
|
||||
for (let attempt = 0; attempt < 2; attempt += 1) {
|
||||
const formatted = new Intl.DateTimeFormat('en-CA', {
|
||||
timeZone: 'Europe/Berlin',
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hourCycle: 'h23'
|
||||
}).formatToParts(new Date(candidate));
|
||||
const read = (type: Intl.DateTimeFormatPartTypes) =>
|
||||
Number(formatted.find((part) => part.type === type)?.value);
|
||||
const represented = Date.UTC(
|
||||
read('year'),
|
||||
read('month') - 1,
|
||||
read('day'),
|
||||
read('hour'),
|
||||
read('minute')
|
||||
);
|
||||
candidate += localMilliseconds - represented;
|
||||
}
|
||||
return new Date(candidate).toISOString();
|
||||
}
|
||||
|
||||
export const load: PageServerLoad = ({ locals }) => {
|
||||
requireUser(locals.user);
|
||||
return { shows: listShows(), templates: listShowTemplates() };
|
||||
export const load: PageServerLoad = ({ locals, url }) => {
|
||||
const user = requireUser(locals.user);
|
||||
const today = new Date();
|
||||
const todayMonth = berlinMonthKey(today);
|
||||
const selectedMonth = normalizeMonthKey(url.searchParams.get('month'), todayMonth);
|
||||
return {
|
||||
shows: listShows(['draft', 'ready', 'live']),
|
||||
preparationUsages: listPreparationUsages(),
|
||||
templates: listShowTemplates(),
|
||||
view: getShowOverviewView(user.id),
|
||||
selectedMonth,
|
||||
previousMonth: shiftMonth(selectedMonth, -1),
|
||||
nextMonth: shiftMonth(selectedMonth, 1),
|
||||
todayMonth,
|
||||
todayDate: berlinDateKey(today)
|
||||
};
|
||||
};
|
||||
|
||||
export const actions = {
|
||||
setView: async ({ locals, request }) => {
|
||||
const user = requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
const view = String(data.get('view') || '');
|
||||
const todayMonth = berlinMonthKey(new Date());
|
||||
const month = normalizeMonthKey(String(data.get('month') || ''), todayMonth);
|
||||
try {
|
||||
setShowOverviewView(user.id, view);
|
||||
} catch {
|
||||
return fail(400, { error: 'Die Ansicht konnte nicht gespeichert werden.' });
|
||||
}
|
||||
redirect(303, `/sendungen?month=${encodeURIComponent(month)}`);
|
||||
},
|
||||
create: async ({ locals, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
|
||||
@@ -1,10 +1,35 @@
|
||||
<script lang="ts">
|
||||
import { resolve } from '$app/paths';
|
||||
import { berlinDateKey, buildCalendarDays, formatMonthLabel } from '#lib/calendar.js';
|
||||
import { formatDuration } from '#lib/format.js';
|
||||
import AppIcon from '#lib/components/AppIcon.svelte';
|
||||
import type { PageProps } from './$types';
|
||||
|
||||
let { data, form }: PageProps = $props();
|
||||
let scheduledShows = $derived(data.shows.filter((show) => show.startsAtUtc !== null));
|
||||
let undatedShows = $derived(data.shows.filter((show) => show.startsAtUtc === null));
|
||||
let calendarDays = $derived(buildCalendarDays(data.selectedMonth, data.todayDate));
|
||||
let showsByDate = $derived.by(() => {
|
||||
const grouped: Record<string, (typeof data.shows)[number][]> = {};
|
||||
for (const show of scheduledShows) {
|
||||
const key = berlinDateKey(show.startsAtUtc!);
|
||||
const shows = grouped[key] ?? [];
|
||||
shows.push(show);
|
||||
grouped[key] = shows;
|
||||
}
|
||||
for (const shows of Object.values(grouped)) {
|
||||
shows.sort((left, right) => left.startsAtUtc!.localeCompare(right.startsAtUtc!));
|
||||
}
|
||||
return grouped;
|
||||
});
|
||||
let agendaDays = $derived(
|
||||
calendarDays.filter((day) => day.inSelectedMonth && (showsByDate[day.date]?.length ?? 0) > 0)
|
||||
);
|
||||
const timeFormatter = new Intl.DateTimeFormat('de-DE', {
|
||||
timeZone: 'Europe/Berlin',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
});
|
||||
|
||||
function berlinDate(value: string | null) {
|
||||
if (!value) return 'Termin offen';
|
||||
@@ -14,16 +39,49 @@
|
||||
timeStyle: 'short'
|
||||
}).format(new Date(value));
|
||||
}
|
||||
|
||||
function berlinTime(value: string) {
|
||||
return timeFormatter.format(new Date(value));
|
||||
}
|
||||
|
||||
function agendaDate(value: string) {
|
||||
return new Intl.DateTimeFormat('de-DE', {
|
||||
timeZone: 'UTC',
|
||||
weekday: 'long',
|
||||
day: '2-digit',
|
||||
month: 'long'
|
||||
}).format(new Date(`${value}T12:00:00Z`));
|
||||
}
|
||||
|
||||
function preparationHref(showId: string, usageId: string) {
|
||||
return `${resolve('/sendungen/[id]', { id: showId })}?usage=${encodeURIComponent(usageId)}#usage-${encodeURIComponent(usageId)}`;
|
||||
}
|
||||
|
||||
function statusLabel(status: string) {
|
||||
if (status === 'ready') return 'Bereit';
|
||||
if (status === 'draft') return 'Entwurf';
|
||||
if (status === 'live') return 'Live';
|
||||
return 'Abgeschlossen';
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:head><title>Sendungen | Sendewerk</title></svelte:head>
|
||||
|
||||
<div class="page-wrap shows-page">
|
||||
<header class="page-heading">
|
||||
<header class="page-heading shows-heading">
|
||||
<div>
|
||||
<h1>Sendungen</h1>
|
||||
<p class="page-intro">Streams aus Fundus-Pieces und freien Abschnitten zusammenstellen.</p>
|
||||
</div>
|
||||
<form method="POST" action="?/setView" class="show-view-toggle" aria-label="Darstellung">
|
||||
<input type="hidden" name="month" value={data.selectedMonth} />
|
||||
<button type="submit" name="view" value="list" aria-pressed={data.view === 'list'}>
|
||||
<AppIcon name="list" /> Liste
|
||||
</button>
|
||||
<button type="submit" name="view" value="calendar" aria-pressed={data.view === 'calendar'}>
|
||||
<AppIcon name="calendar" /> Kalender
|
||||
</button>
|
||||
</form>
|
||||
</header>
|
||||
|
||||
{#if form?.error}<div class="form-message error" role="alert">{form.error}</div>{/if}
|
||||
@@ -71,25 +129,58 @@
|
||||
</form>
|
||||
</details>
|
||||
|
||||
{#if data.preparationUsages.length}<section
|
||||
class="show-library preparation-overview"
|
||||
aria-labelledby="preparation-title"
|
||||
>
|
||||
<header>
|
||||
<h2 id="preparation-title">Noch vorzubereiten</h2>
|
||||
<span>{data.preparationUsages.length}</span>
|
||||
</header>
|
||||
<div class="preparation-list">
|
||||
{#each data.preparationUsages as usage (usage.usageId)}
|
||||
<!-- The helper starts from a route resolved against the configured base path. -->
|
||||
<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
|
||||
<a href={preparationHref(usage.showId, usage.usageId)}>
|
||||
<div class="preparation-copy">
|
||||
<span
|
||||
class="preparation-topics"
|
||||
aria-label={usage.topics.map((topic) => topic.name).join(', ')}
|
||||
>{#each usage.topics as topic (topic.name)}<AppIcon
|
||||
name={topic.iconName}
|
||||
/>{/each}</span
|
||||
>
|
||||
<span
|
||||
><strong>{usage.title}</strong><small>{usage.showTitle} · {usage.sectionName}</small
|
||||
></span
|
||||
>
|
||||
</div>
|
||||
{#if usage.preparationEffort}<b class={`effort ${usage.preparationEffort}`}
|
||||
>{usage.preparationEffort === 'low'
|
||||
? 'Gering'
|
||||
: usage.preparationEffort === 'medium'
|
||||
? 'Mittel'
|
||||
: 'Hoch'}</b
|
||||
>{/if}
|
||||
</a>
|
||||
{/each}
|
||||
</div>
|
||||
</section>{/if}
|
||||
|
||||
<section class="show-library" aria-labelledby="show-library-title">
|
||||
<header>
|
||||
<h2 id="show-library-title">Geplante Sendungen</h2>
|
||||
<h2 id="show-library-title">{data.view === 'list' ? 'Geplante Sendungen' : 'Kalender'}</h2>
|
||||
<span>{data.shows.length}</span>
|
||||
</header>
|
||||
{#if data.shows.length}
|
||||
<div class="show-card-list">
|
||||
{#each data.shows as show (show.id)}
|
||||
<a class="show-card" href={resolve('/sendungen/[id]', { id: show.id })}>
|
||||
<div>
|
||||
<span class={`show-state ${show.status}`}
|
||||
>{show.status === 'ready'
|
||||
? 'Bereit'
|
||||
: show.status === 'draft'
|
||||
? 'Entwurf'
|
||||
: show.status === 'live'
|
||||
? 'Live'
|
||||
: 'Abgeschlossen'}</span
|
||||
|
||||
{#if data.view === 'list'}
|
||||
{#if scheduledShows.length}<div class="show-card-list">
|
||||
{#each scheduledShows as show (show.id)}<a
|
||||
class="show-card"
|
||||
href={resolve('/sendungen/[id]', { id: show.id })}
|
||||
>
|
||||
<div>
|
||||
<span class={`show-state ${show.status}`}>{statusLabel(show.status)}</span>
|
||||
<h3>{show.title}</h3>
|
||||
<p>{berlinDate(show.startsAtUtc)} Uhr</p>
|
||||
</div>
|
||||
@@ -99,15 +190,108 @@
|
||||
><strong>{formatDuration(show.totalDurationSeconds)}</strong> Planzeit</span
|
||||
>{/if}<b aria-hidden="true"><AppIcon name="arrow-right" /></b>
|
||||
</div>
|
||||
</a>
|
||||
{/each}
|
||||
</div>
|
||||
</a>{/each}
|
||||
</div>{:else}<div class="empty-state compact">
|
||||
<h2>Keine terminierten Sendungen</h2>
|
||||
<p>Sendungen ohne Termin bleiben unten erreichbar.</p>
|
||||
</div>{/if}
|
||||
{:else}
|
||||
<div class="empty-state">
|
||||
<span aria-hidden="true"><AppIcon name="plus" /></span>
|
||||
<h2>Noch keine Sendung</h2>
|
||||
<p>Oben kann der erste Stream geplant werden.</p>
|
||||
<div class="show-month-toolbar">
|
||||
<div>
|
||||
<p class="eyebrow">Monatsansicht</p>
|
||||
<h3>{formatMonthLabel(data.selectedMonth)}</h3>
|
||||
</div>
|
||||
<!-- Query-only navigation stays on the resolved Sendungen route. -->
|
||||
<!-- eslint-disable svelte/no-navigation-without-resolve -->
|
||||
<nav aria-label="Kalendermonat" class="show-month-navigation">
|
||||
<a
|
||||
href={`${resolve('/sendungen')}?month=${encodeURIComponent(data.previousMonth)}`}
|
||||
aria-label="Vorheriger Monat"><AppIcon name="chevron-left" /></a
|
||||
>
|
||||
<a href={`${resolve('/sendungen')}?month=${encodeURIComponent(data.todayMonth)}`}>Heute</a
|
||||
>
|
||||
<a
|
||||
href={`${resolve('/sendungen')}?month=${encodeURIComponent(data.nextMonth)}`}
|
||||
aria-label="Nächster Monat"><AppIcon name="chevron-right" /></a
|
||||
>
|
||||
</nav>
|
||||
<!-- eslint-enable svelte/no-navigation-without-resolve -->
|
||||
</div>
|
||||
|
||||
<div class="show-calendar" aria-label={formatMonthLabel(data.selectedMonth)}>
|
||||
<div class="show-calendar-weekdays" aria-hidden="true">
|
||||
{#each ['Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So'] as weekday (weekday)}<span
|
||||
>{weekday}</span
|
||||
>{/each}
|
||||
</div>
|
||||
<div class="show-calendar-grid">
|
||||
{#each calendarDays as day (day.date)}<section
|
||||
class:outside={!day.inSelectedMonth}
|
||||
class:today={day.isToday}
|
||||
class="show-calendar-day"
|
||||
aria-label={day.date}
|
||||
>
|
||||
<strong>{day.dayNumber}</strong>
|
||||
{#if day.inSelectedMonth}<div class="show-calendar-events">
|
||||
{#each showsByDate[day.date] ?? [] as show (show.id)}<a
|
||||
href={resolve('/sendungen/[id]', { id: show.id })}
|
||||
class={`show-calendar-event ${show.status}`}
|
||||
>
|
||||
<time>{berlinTime(show.startsAtUtc!)}</time>
|
||||
<span>{show.title}</span>
|
||||
<small>{statusLabel(show.status)}</small>
|
||||
</a>{/each}
|
||||
</div>{/if}
|
||||
</section>{/each}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="show-agenda" aria-label={`Termine ${formatMonthLabel(data.selectedMonth)}`}>
|
||||
{#if agendaDays.length}{#each agendaDays as day (day.date)}<section
|
||||
class:today={day.isToday}
|
||||
class="show-agenda-day"
|
||||
>
|
||||
<h3>{agendaDate(day.date)}</h3>
|
||||
<div>
|
||||
{#each showsByDate[day.date] ?? [] as show (show.id)}<a
|
||||
class="show-agenda-event"
|
||||
href={resolve('/sendungen/[id]', { id: show.id })}
|
||||
>
|
||||
<time>{berlinTime(show.startsAtUtc!)}</time>
|
||||
<span
|
||||
><strong>{show.title}</strong><small>{statusLabel(show.status)}</small></span
|
||||
>
|
||||
</a>{/each}
|
||||
</div>
|
||||
</section>{/each}{:else}<div class="empty-state compact">
|
||||
<h2>Keine Termine in diesem Monat</h2>
|
||||
</div>{/if}
|
||||
</div>
|
||||
{/if}
|
||||
</section>
|
||||
|
||||
{#if undatedShows.length}<section
|
||||
class="show-library show-undated"
|
||||
aria-labelledby="undated-title"
|
||||
>
|
||||
<header>
|
||||
<h2 id="undated-title">Ohne Termin</h2>
|
||||
<span>{undatedShows.length}</span>
|
||||
</header>
|
||||
<div class="show-card-list">
|
||||
{#each undatedShows as show (show.id)}<a
|
||||
class="show-card"
|
||||
href={resolve('/sendungen/[id]', { id: show.id })}
|
||||
>
|
||||
<div>
|
||||
<span class={`show-state ${show.status}`}>{statusLabel(show.status)}</span>
|
||||
<h3>{show.title}</h3>
|
||||
<p>Termin offen</p>
|
||||
</div>
|
||||
<div class="show-card-facts">
|
||||
<b aria-hidden="true"><AppIcon name="arrow-right" /></b>
|
||||
</div>
|
||||
</a>{/each}
|
||||
</div>
|
||||
</section>{/if}
|
||||
</div>
|
||||
@@ -1,13 +1,23 @@
|
||||
import { randomUUID } from 'node:crypto';
|
||||
import { error, fail } from '@sveltejs/kit';
|
||||
import { error, fail, redirect } from '@sveltejs/kit';
|
||||
import type { Actions, PageServerLoad } from './$types';
|
||||
import { requireUser } from '#lib/server/auth.js';
|
||||
import { requireBarkeeper, requireUser } from '#lib/server/auth.js';
|
||||
import { getHistoricalActualDurations } from '#lib/server/completion.js';
|
||||
import { getTaxonomy, listPieces, listPieceTemplates } from '#lib/server/content.js';
|
||||
import {
|
||||
createShare,
|
||||
deleteShare,
|
||||
listShares,
|
||||
replaceShareToken,
|
||||
updateShare
|
||||
} from '#lib/server/shares.js';
|
||||
import { berlinLocalToUtc } from '#lib/server/time.js';
|
||||
import {
|
||||
addPieceUsage,
|
||||
addShowSection,
|
||||
createAndAddPieceUsage,
|
||||
duplicatePieceUsage,
|
||||
duplicateCompletedShow,
|
||||
getShow,
|
||||
getPieceUsageContexts,
|
||||
movePieceUsage,
|
||||
@@ -35,32 +45,6 @@ function pieceDurationInSeconds(data: FormData) {
|
||||
return Math.round(Number(data.get('durationMinutes')) * 60);
|
||||
}
|
||||
|
||||
function berlinLocalToUtc(value: string): string | null {
|
||||
if (!value) return null;
|
||||
const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})$/.exec(value);
|
||||
if (!match) throw new Error('INVALID_TIMESTAMP');
|
||||
const parts = match.slice(1).map(Number);
|
||||
const localMilliseconds = Date.UTC(parts[0], parts[1] - 1, parts[2], parts[3], parts[4]);
|
||||
let candidate = localMilliseconds;
|
||||
for (let attempt = 0; attempt < 2; attempt += 1) {
|
||||
const formatted = new Intl.DateTimeFormat('en-CA', {
|
||||
timeZone: 'Europe/Berlin',
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hourCycle: 'h23'
|
||||
}).formatToParts(new Date(candidate));
|
||||
const read = (type: Intl.DateTimeFormatPartTypes) =>
|
||||
Number(formatted.find((part) => part.type === type)?.value);
|
||||
candidate +=
|
||||
localMilliseconds -
|
||||
Date.UTC(read('year'), read('month') - 1, read('day'), read('hour'), read('minute'));
|
||||
}
|
||||
return new Date(candidate).toISOString();
|
||||
}
|
||||
|
||||
function berlinInput(value: string | null) {
|
||||
if (!value) return '';
|
||||
const parts = new Intl.DateTimeFormat('en-CA', {
|
||||
@@ -104,6 +88,12 @@ function actionError(cause: unknown) {
|
||||
};
|
||||
if (code === 'INVALID_DURATION')
|
||||
return { status: 400, error: 'Piece-Dauern müssen zwischen 0 und 1.440 Minuten liegen.' };
|
||||
if (code === 'INVALID_PASSWORD')
|
||||
return { status: 400, error: 'Ein Freigabepasswort benötigt mindestens 12 Zeichen.' };
|
||||
if (code === 'INVALID_EXPIRY')
|
||||
return { status: 400, error: 'Der Ablaufzeitpunkt muss in der Zukunft liegen.' };
|
||||
if (code === 'INVALID_SCOPE' || code === 'INVALID_PASSWORD_MODE')
|
||||
return { status: 400, error: 'Die Einstellungen der Freigabe sind ungültig.' };
|
||||
if (code.startsWith('INVALID_'))
|
||||
return { status: 400, error: 'Mindestens ein Feld ist ungültig oder zu lang.' };
|
||||
return { status: 500, error: 'Die Änderung konnte nicht gespeichert werden.' };
|
||||
@@ -118,11 +108,28 @@ function attempt(intent: string, operation: () => unknown) {
|
||||
}
|
||||
|
||||
export const load: PageServerLoad = ({ locals, params, url }) => {
|
||||
requireUser(locals.user);
|
||||
const actor = requireUser(locals.user);
|
||||
const show = getShow(params.id);
|
||||
if (!show) error(404, 'Sendung nicht gefunden');
|
||||
const shares = actor.role === 'barkeeper' ? listShares(actor, show.id) : [];
|
||||
if (show.status === 'completed') {
|
||||
return {
|
||||
show,
|
||||
shares,
|
||||
canManageShares: actor.role === 'barkeeper',
|
||||
historical: true,
|
||||
actualDurations: getHistoricalActualDurations(show.id),
|
||||
duplicateCommandId: randomUUID(),
|
||||
startsAtLocal: berlinInput(show.startsAtUtc),
|
||||
pieces: [],
|
||||
taxonomy: getTaxonomy(),
|
||||
pieceTemplates: [],
|
||||
createCommandId: randomUUID(),
|
||||
filters: { query: '', categoryId: '', includeUsed: false, includePlanned: false }
|
||||
};
|
||||
}
|
||||
const pieces = listPieces({
|
||||
statuses: ['ready'],
|
||||
statuses: ['preparing', 'ready'],
|
||||
query: url.searchParams.get('q') ?? '',
|
||||
categoryId: url.searchParams.get('category') ?? ''
|
||||
});
|
||||
@@ -132,6 +139,11 @@ export const load: PageServerLoad = ({ locals, params, url }) => {
|
||||
);
|
||||
return {
|
||||
show,
|
||||
shares,
|
||||
canManageShares: actor.role === 'barkeeper',
|
||||
historical: false,
|
||||
actualDurations: {} as Record<string, number>,
|
||||
duplicateCommandId: randomUUID(),
|
||||
startsAtLocal: berlinInput(show.startsAtUtc),
|
||||
pieces: pieces.map((piece) => ({ ...piece, ...usageContexts[piece.id] })),
|
||||
taxonomy: getTaxonomy(),
|
||||
@@ -147,6 +159,80 @@ export const load: PageServerLoad = ({ locals, params, url }) => {
|
||||
};
|
||||
|
||||
export const actions = {
|
||||
createShare: async ({ locals, params, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
const share = await createShare(actor, {
|
||||
showId: params.id,
|
||||
scope: text(data, 'scope'),
|
||||
password: text(data, 'password'),
|
||||
expiresAtUtc: berlinLocalToUtc(text(data, 'expiresAt'), 'INVALID_EXPIRY')
|
||||
});
|
||||
return {
|
||||
intent: 'createShare',
|
||||
success: 'Leselink angelegt. Der Link wird nur jetzt vollständig angezeigt.',
|
||||
shareUrl: `/freigabe/${share.token}`
|
||||
};
|
||||
} catch (cause) {
|
||||
return fail(actionError(cause).status, { intent: 'createShare', ...actionError(cause) });
|
||||
}
|
||||
},
|
||||
updateShare: async ({ locals, params, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
await updateShare(
|
||||
actor,
|
||||
text(data, 'shareId'),
|
||||
{
|
||||
scope: text(data, 'scope'),
|
||||
passwordMode: text(data, 'passwordMode'),
|
||||
password: text(data, 'password'),
|
||||
expiresAtUtc: berlinLocalToUtc(text(data, 'expiresAt'), 'INVALID_EXPIRY')
|
||||
},
|
||||
params.id
|
||||
);
|
||||
return { intent: 'updateShare', success: 'Freigabe aktualisiert.' };
|
||||
} catch (cause) {
|
||||
return fail(actionError(cause).status, { intent: 'updateShare', ...actionError(cause) });
|
||||
}
|
||||
},
|
||||
replaceShare: async ({ locals, params, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
const token = replaceShareToken(actor, text(data, 'shareId'), params.id);
|
||||
return {
|
||||
intent: 'replaceShare',
|
||||
success: 'Ersatzlink angelegt. Der bisherige Link ist ungültig.',
|
||||
shareUrl: `/freigabe/${token}`
|
||||
};
|
||||
} catch (cause) {
|
||||
return fail(actionError(cause).status, { intent: 'replaceShare', ...actionError(cause) });
|
||||
}
|
||||
},
|
||||
deleteShare: async ({ locals, params, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
deleteShare(actor, text(data, 'shareId'), params.id);
|
||||
return { intent: 'deleteShare', success: 'Freigabe gelöscht.' };
|
||||
} catch (cause) {
|
||||
return fail(actionError(cause).status, { intent: 'deleteShare', ...actionError(cause) });
|
||||
}
|
||||
},
|
||||
duplicateShow: async ({ locals, params, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
const duplicate = duplicateCompletedShow(params.id, text(data, 'commandId'));
|
||||
redirect(303, `/sendungen/${duplicate.id}`);
|
||||
} catch (cause) {
|
||||
if (cause && typeof cause === 'object' && 'status' in cause) throw cause;
|
||||
return fail(actionError(cause).status, { intent: 'duplicateShow', ...actionError(cause) });
|
||||
}
|
||||
},
|
||||
saveMetadata: async ({ locals, params, request }) => {
|
||||
requireUser(locals.user);
|
||||
const data = await request.formData();
|
||||
@@ -167,7 +253,8 @@ export const actions = {
|
||||
addShowSection(params.id, Number(data.get('revision')), {
|
||||
name: text(data, 'name'),
|
||||
categoryId: text(data, 'categoryId') || null,
|
||||
explicitDurationSeconds: nullableDuration(data)
|
||||
explicitDurationSeconds: nullableDuration(data),
|
||||
twitchTags: text(data, 'twitchTags').split(/[\n,]/)
|
||||
})
|
||||
);
|
||||
},
|
||||
@@ -178,7 +265,8 @@ export const actions = {
|
||||
updateShowSection(params.id, text(data, 'sectionId'), Number(data.get('revision')), {
|
||||
name: text(data, 'name'),
|
||||
categoryId: text(data, 'categoryId') || null,
|
||||
explicitDurationSeconds: nullableDuration(data)
|
||||
explicitDurationSeconds: nullableDuration(data),
|
||||
twitchTags: text(data, 'twitchTags').split(/[\n,]/)
|
||||
})
|
||||
);
|
||||
},
|
||||
@@ -237,6 +325,7 @@ export const actions = {
|
||||
intro: text(data, 'intro'),
|
||||
research: text(data, 'research'),
|
||||
moderation: text(data, 'moderation'),
|
||||
interaction: text(data, 'interaction'),
|
||||
transition: text(data, 'transition'),
|
||||
presentation: text(data, 'presentation'),
|
||||
presentationMode: text(data, 'presentationMode') as PieceUsageUpdate['presentationMode'],
|
||||
@@ -249,6 +338,9 @@ export const actions = {
|
||||
presentationDescription: text(data, 'presentationDescription'),
|
||||
presentationImageUrl: text(data, 'presentationImageUrl'),
|
||||
presentationSiteName: text(data, 'presentationSiteName'),
|
||||
preparationStatus: text(data, 'preparationStatus') as PieceUsageUpdate['preparationStatus'],
|
||||
preparationEffort: (text(data, 'preparationEffort') ||
|
||||
null) as PieceUsageUpdate['preparationEffort'],
|
||||
presentationMediaId: text(data, 'presentationMediaId') || null,
|
||||
tools: toolIds.map((id, index) => ({
|
||||
id,
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
import { onMount, untrack } from 'svelte';
|
||||
import PieceUsageHistory from '#lib/components/PieceUsageHistory.svelte';
|
||||
import AppIcon from '#lib/components/AppIcon.svelte';
|
||||
import ShareManagement from '#lib/components/ShareManagement.svelte';
|
||||
import UsageEditorDialog from '#lib/components/UsageEditorDialog.svelte';
|
||||
import { formatClock, formatDuration } from '#lib/format.js';
|
||||
import type { PageProps } from './$types';
|
||||
@@ -20,10 +21,10 @@
|
||||
| null
|
||||
>(null);
|
||||
let dropTarget = $state<string | null>(null);
|
||||
let moveSectionForm: HTMLFormElement;
|
||||
let moveUsageForm: HTMLFormElement;
|
||||
let addUsageForm: HTMLFormElement;
|
||||
let removeUsageForm: HTMLFormElement;
|
||||
let moveSectionForm = $state<HTMLFormElement>();
|
||||
let moveUsageForm = $state<HTMLFormElement>();
|
||||
let addUsageForm = $state<HTMLFormElement>();
|
||||
let removeUsageForm = $state<HTMLFormElement>();
|
||||
let draggedSectionId = $state('');
|
||||
let draggedUsageId = $state('');
|
||||
let draggedPieceId = $state('');
|
||||
@@ -150,7 +151,7 @@
|
||||
draggedSectionId = dragged.id;
|
||||
dropPosition = position;
|
||||
finishDrag();
|
||||
setTimeout(() => moveSectionForm.requestSubmit());
|
||||
setTimeout(() => moveSectionForm?.requestSubmit());
|
||||
}
|
||||
|
||||
function dropUsage(sectionId: string | null, position: number) {
|
||||
@@ -160,12 +161,12 @@
|
||||
if (dragged.kind === 'piece') {
|
||||
draggedPieceId = dragged.id;
|
||||
finishDrag();
|
||||
setTimeout(() => addUsageForm.requestSubmit());
|
||||
setTimeout(() => addUsageForm?.requestSubmit());
|
||||
return;
|
||||
}
|
||||
draggedUsageId = dragged.id;
|
||||
finishDrag();
|
||||
setTimeout(() => moveUsageForm.requestSubmit());
|
||||
setTimeout(() => moveUsageForm?.requestSubmit());
|
||||
}
|
||||
|
||||
function removeDraggedUsage() {
|
||||
@@ -176,7 +177,7 @@
|
||||
}
|
||||
removedUsageId = dragged.id;
|
||||
finishDrag();
|
||||
setTimeout(() => removeUsageForm.requestSubmit());
|
||||
setTimeout(() => removeUsageForm?.requestSubmit());
|
||||
}
|
||||
|
||||
const enhanceCommand: SubmitFunction = ({ formElement, submitter }) => {
|
||||
@@ -205,10 +206,106 @@
|
||||
|
||||
<svelte:head><title>{data.show.title} | Sendungen | Sendewerk</title></svelte:head>
|
||||
|
||||
{#if data.historical}
|
||||
<div class="page-wrap historical-show-page">
|
||||
<header class="page-heading show-heading">
|
||||
<div class="show-heading-copy">
|
||||
<a class="back-link" href={resolve('/archiv')}><AppIcon name="arrow-left" /> Archiv</a>
|
||||
<p class="eyebrow">Unveränderliche Sendungshistorie</p>
|
||||
<h1>{data.show.title}</h1>
|
||||
<p class="show-date">
|
||||
{data.show.startsAtUtc ? `${berlinDate(data.show.startsAtUtc)} Uhr` : 'Termin offen'}
|
||||
</p>
|
||||
</div>
|
||||
<div class="show-summary">
|
||||
<div><strong>{plannedCount}</strong><span>Pieces</span></div>
|
||||
<div>
|
||||
<strong>{formatDuration(data.show.totalDurationSeconds)}</strong><span>Planzeit</span>
|
||||
</div>
|
||||
<form method="POST" action="?/duplicateShow">
|
||||
<input type="hidden" name="commandId" value={data.duplicateCommandId} />
|
||||
<button class="secondary-button" type="submit">Als neue Sendung duplizieren</button>
|
||||
</form>
|
||||
</div>
|
||||
</header>
|
||||
{#if form?.error && !form.intent?.toLowerCase().includes('share')}<div
|
||||
class="form-message error"
|
||||
role="alert"
|
||||
>
|
||||
{form.error}
|
||||
</div>{/if}
|
||||
{#if data.canManageShares}<ShareManagement
|
||||
shows={[data.show]}
|
||||
shares={data.shares}
|
||||
fixedShowId={data.show.id}
|
||||
{form}
|
||||
/>{/if}
|
||||
<div class="historical-rundown">
|
||||
{#each data.show.sections as section (section.id)}<section
|
||||
class="quiet-panel historical-section"
|
||||
>
|
||||
<header>
|
||||
<div>
|
||||
{#if section.category}<small
|
||||
style={`--tax-color: ${section.categoryColor ?? '#67dde8'}`}
|
||||
>{section.category}</small
|
||||
>{/if}
|
||||
<h2>{section.name}</h2>
|
||||
</div>
|
||||
<strong>{formatDuration(section.durationSeconds)}</strong>
|
||||
</header>
|
||||
{#each section.usages as usage (usage.id)}<article class="historical-usage">
|
||||
<header>
|
||||
<div>
|
||||
<small
|
||||
>{usage.status === 'done'
|
||||
? 'Gesendet'
|
||||
: usage.status === 'skipped'
|
||||
? 'Übersprungen'
|
||||
: 'Offen beim Abschluss'}</small
|
||||
>
|
||||
<h3>{usage.title}</h3>
|
||||
</div>
|
||||
<span
|
||||
>{formatDuration(data.actualDurations[usage.id] ?? 0)} Ist · {formatDuration(
|
||||
usage.durationSeconds
|
||||
)} Plan</span
|
||||
>
|
||||
</header>
|
||||
{#if usage.intro}<section>
|
||||
<strong>Einleitung</strong>
|
||||
<p>{usage.intro}</p>
|
||||
</section>{/if}
|
||||
{#if usage.moderation}<section>
|
||||
<strong>Moderation</strong>
|
||||
<p>{usage.moderation}</p>
|
||||
</section>{/if}
|
||||
{#if usage.interaction}<section>
|
||||
<strong>Interaktion</strong>
|
||||
<p>{usage.interaction}</p>
|
||||
</section>{/if}
|
||||
{#if usage.transition}<section>
|
||||
<strong>Überleitung</strong>
|
||||
<p>{usage.transition}</p>
|
||||
</section>{/if}
|
||||
{#if usage.research}<details>
|
||||
<summary>Recherche</summary>
|
||||
<p>{usage.research}</p>
|
||||
</details>{/if}
|
||||
{#if usage.ownNotes}<details>
|
||||
<summary>Eigene Notizen</summary>
|
||||
<p>{usage.ownNotes}</p>
|
||||
</details>{/if}
|
||||
</article>{/each}
|
||||
</section>{/each}
|
||||
</div>
|
||||
</div>
|
||||
{:else}
|
||||
<div class="page-wrap builder-page">
|
||||
<header class="page-heading show-heading">
|
||||
<div class="show-heading-copy">
|
||||
<a class="back-link" href={resolve('/sendungen')}><AppIcon name="arrow-left" /> Sendungen</a>
|
||||
<a class="back-link" href={resolve('/sendungen')}><AppIcon name="arrow-left" /> Sendungen</a
|
||||
>
|
||||
<h1>{data.show.title}</h1>
|
||||
<p class="show-date">
|
||||
{data.show.startsAtUtc ? `${berlinDate(data.show.startsAtUtc)} Uhr` : 'Termin offen'}
|
||||
@@ -225,8 +322,18 @@
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{#if form?.error}<div class="form-message error" role="alert">{form.error}</div>{/if}
|
||||
{#if form?.success}<div class="form-message success" role="status">{form.success}</div>{/if}
|
||||
{#if form?.error && !form.intent?.toLowerCase().includes('share')}<div
|
||||
class="form-message error"
|
||||
role="alert"
|
||||
>
|
||||
{form.error}
|
||||
</div>{/if}
|
||||
{#if form?.success && !form.intent?.toLowerCase().includes('share')}<div
|
||||
class="form-message success"
|
||||
role="status"
|
||||
>
|
||||
{form.success}
|
||||
</div>{/if}
|
||||
<div class="sr-only" role="status" aria-live="polite">{copyMessage}</div>
|
||||
|
||||
<details class="show-settings">
|
||||
@@ -270,8 +377,9 @@
|
||||
>Ankündigung<span class="copy-field"
|
||||
><textarea name="announcementText" maxlength="20000" rows="4"
|
||||
>{data.show.announcementText}</textarea
|
||||
><button type="button" onclick={() => copyText('Ankündigung', data.show.announcementText)}
|
||||
>Kopieren</button
|
||||
><button
|
||||
type="button"
|
||||
onclick={() => copyText('Ankündigung', data.show.announcementText)}>Kopieren</button
|
||||
></span
|
||||
></label
|
||||
>
|
||||
@@ -282,6 +390,12 @@
|
||||
</div>
|
||||
</form>
|
||||
</details>
|
||||
{#if data.canManageShares}<ShareManagement
|
||||
shows={[data.show]}
|
||||
shares={data.shares}
|
||||
fixedShowId={data.show.id}
|
||||
{form}
|
||||
/>{/if}
|
||||
|
||||
<div class="mobile-pane-switch" aria-label="Arbeitsbereich auswählen">
|
||||
<button
|
||||
@@ -317,7 +431,7 @@
|
||||
<header class="pane-heading">
|
||||
<div>
|
||||
<p class="eyebrow">Quelle</p>
|
||||
<h2 id="source-title">Sendefertiger Fundus</h2>
|
||||
<h2 id="source-title">Planbarer Fundus</h2>
|
||||
</div>
|
||||
<span>{visiblePieces.length}</span>
|
||||
</header>
|
||||
@@ -418,7 +532,8 @@
|
||||
>{/if}{piece.title}
|
||||
</h3>
|
||||
<p>
|
||||
{piece.format} · {piece.topics.map((item) => item.name).join(', ') || 'Ohne Thema'}
|
||||
{piece.format} · {piece.topics.map((item) => item.name).join(', ') ||
|
||||
'Ohne Thema'}
|
||||
</p>
|
||||
{#if piece.isPlannedInCurrentShow}<span class="planned-label">Eingeplant</span>{/if}
|
||||
<PieceUsageHistory history={piece.sentHistory} />
|
||||
@@ -538,13 +653,15 @@
|
||||
/><input type="hidden" name="position" value={index + 1} /><button
|
||||
type="submit"
|
||||
disabled={index === data.show.sections.length - 1}
|
||||
aria-label={`${section.name} nach unten`}><AppIcon name="arrow-down" /></button
|
||||
aria-label={`${section.name} nach unten`}
|
||||
><AppIcon name="arrow-down" /></button
|
||||
>
|
||||
</form>
|
||||
</div>
|
||||
{#if section.usages.length}<div class="usage-list">
|
||||
{#each section.usages as usage, usageIndex (usage.id)}
|
||||
<div
|
||||
id={`usage-${usage.id}`}
|
||||
class="usage-drag-slot"
|
||||
role="presentation"
|
||||
ondragover={(event) => {
|
||||
@@ -593,11 +710,15 @@
|
||||
</div>
|
||||
<div class="row-actions">
|
||||
<form use:enhance={enhanceCommand} method="POST" action="?/moveUsage">
|
||||
<input type="hidden" name="revision" value={data.show.revision} /><input
|
||||
<input
|
||||
type="hidden"
|
||||
name="usageId"
|
||||
value={usage.id}
|
||||
/><input type="hidden" name="sectionId" value={section.id} /><input
|
||||
name="revision"
|
||||
value={data.show.revision}
|
||||
/><input type="hidden" name="usageId" value={usage.id} /><input
|
||||
type="hidden"
|
||||
name="sectionId"
|
||||
value={section.id}
|
||||
/><input
|
||||
type="hidden"
|
||||
name="position"
|
||||
value={usageIndex - 1}
|
||||
@@ -609,11 +730,15 @@
|
||||
>
|
||||
</form>
|
||||
<form use:enhance={enhanceCommand} method="POST" action="?/moveUsage">
|
||||
<input type="hidden" name="revision" value={data.show.revision} /><input
|
||||
<input
|
||||
type="hidden"
|
||||
name="usageId"
|
||||
value={usage.id}
|
||||
/><input type="hidden" name="sectionId" value={section.id} /><input
|
||||
name="revision"
|
||||
value={data.show.revision}
|
||||
/><input type="hidden" name="usageId" value={usage.id} /><input
|
||||
type="hidden"
|
||||
name="sectionId"
|
||||
value={section.id}
|
||||
/><input
|
||||
type="hidden"
|
||||
name="position"
|
||||
value={usageIndex + 1}
|
||||
@@ -626,6 +751,7 @@
|
||||
</form>
|
||||
<UsageEditorDialog
|
||||
{usage}
|
||||
open={page.url.searchParams.get('usage') === usage.id}
|
||||
revision={data.show.revision}
|
||||
sectionId={section.id}
|
||||
sections={data.show.sections}
|
||||
@@ -637,14 +763,20 @@
|
||||
</div>
|
||||
{/each}
|
||||
{#if showsUsagePreview(section.id, section.usages.length)}
|
||||
<div class="drag-insert-preview usage-insert-preview" data-drop-preview="usage">
|
||||
<div
|
||||
class="drag-insert-preview usage-insert-preview"
|
||||
data-drop-preview="usage"
|
||||
>
|
||||
<strong>{draggedTitle()}</strong><small>Hier einfügen</small>
|
||||
</div>
|
||||
{/if}
|
||||
</div>{:else}
|
||||
{#if showsUsagePreview(section.id, 0)}
|
||||
<div class="usage-list">
|
||||
<div class="drag-insert-preview usage-insert-preview" data-drop-preview="usage">
|
||||
<div
|
||||
class="drag-insert-preview usage-insert-preview"
|
||||
data-drop-preview="usage"
|
||||
>
|
||||
<strong>{draggedTitle()}</strong><small>Hier einfügen</small>
|
||||
</div>
|
||||
</div>
|
||||
@@ -675,7 +807,12 @@
|
||||
name="sectionId"
|
||||
value={section.id}
|
||||
/><label
|
||||
>Name<input name="name" required maxlength="200" value={section.name} /></label
|
||||
>Name<input
|
||||
name="name"
|
||||
required
|
||||
maxlength="200"
|
||||
value={section.name}
|
||||
/></label
|
||||
><label
|
||||
>Kategorie<select name="categoryId"
|
||||
><option value="">Ohne Kategorie</option
|
||||
@@ -693,6 +830,13 @@
|
||||
value={section.explicitDurationSeconds ?? ''}
|
||||
placeholder="Summe der Pieces"
|
||||
/></label
|
||||
><label
|
||||
>Twitch-Tags<input
|
||||
name="twitchTags"
|
||||
maxlength="300"
|
||||
value={section.twitchTags.join(', ')}
|
||||
placeholder="Gaming, Deutsch"
|
||||
/></label
|
||||
><button class="secondary-button" type="submit">Abschnitt speichern</button>
|
||||
</form>
|
||||
<form
|
||||
@@ -750,6 +894,12 @@
|
||||
max="86400"
|
||||
placeholder="optional, Sekunden"
|
||||
/></label
|
||||
><label
|
||||
>Twitch-Tags<input
|
||||
name="twitchTags"
|
||||
maxlength="300"
|
||||
placeholder="Gaming, Deutsch"
|
||||
/></label
|
||||
><button class="primary-button" type="submit">Abschnitt hinzufügen</button>
|
||||
</form>
|
||||
|
||||
@@ -841,7 +991,8 @@
|
||||
/><button
|
||||
class="text-button danger-text"
|
||||
type="submit"
|
||||
aria-label={`${usage.title} aus Sendung entfernen`}>Aus Sendung entfernen</button
|
||||
aria-label={`${usage.title} aus Sendung entfernen`}
|
||||
>Aus Sendung entfernen</button
|
||||
>
|
||||
</form>
|
||||
<UsageEditorDialog
|
||||
@@ -921,3 +1072,4 @@
|
||||
<input type="hidden" name="usageId" value={removedUsageId} />
|
||||
</form>
|
||||
</div>
|
||||
{/if}
|
||||
@@ -8,7 +8,23 @@ import {
|
||||
type TaxonomyKind
|
||||
} from '#lib/server/content.js';
|
||||
import { getMailConfig } from '#lib/server/config.js';
|
||||
import {
|
||||
createShare,
|
||||
deleteShare,
|
||||
listShares,
|
||||
replaceShareToken,
|
||||
updateShare
|
||||
} from '#lib/server/shares.js';
|
||||
import { listShows } from '#lib/server/shows.js';
|
||||
import { berlinLocalToUtc } from '#lib/server/time.js';
|
||||
import { createTool, listTools, updateTool, type ToolInput } from '#lib/server/tools.js';
|
||||
import { deleteFeedSource, fetchFeed, listFeedSources, saveFeedSource } from '#lib/server/feeds.js';
|
||||
import {
|
||||
createTechnicalAccess,
|
||||
listTechnicalAccesses,
|
||||
revokeTechnicalAccess,
|
||||
updateTechnicalAccess
|
||||
} from '#lib/server/technical-access.js';
|
||||
import {
|
||||
inviteUser,
|
||||
isRole,
|
||||
@@ -28,6 +44,10 @@ export const load: PageServerLoad = ({ locals }) => {
|
||||
users: listUsers(),
|
||||
invitations: listOpenInvitations(),
|
||||
tools: listTools(true),
|
||||
shows: listShows(),
|
||||
shares: listShares(locals.user!),
|
||||
feeds: listFeedSources(),
|
||||
technicalAccesses: listTechnicalAccesses(),
|
||||
mailTransport: getMailConfig().transport
|
||||
};
|
||||
};
|
||||
@@ -50,6 +70,12 @@ function actionError(cause: unknown): string {
|
||||
if (code === 'INVALID_TOOL_FORMAT')
|
||||
return 'Mindestens ein gewähltes Format existiert nicht mehr.';
|
||||
if (code === 'INVALID_TOOL') return 'Bitte die Werkzeugdaten prüfen.';
|
||||
if (code === 'INVALID_PASSWORD') return 'Ein Freigabepasswort benötigt mindestens 12 Zeichen.';
|
||||
if (code === 'INVALID_EXPIRY') return 'Der Ablaufzeitpunkt muss in der Zukunft liegen.';
|
||||
if (code === 'INVALID_SCOPE') return 'Der Informationsumfang ist ungültig.';
|
||||
if (code === 'INVALID_PASSWORD_MODE') return 'Die Passwortoption ist ungültig.';
|
||||
if (code === 'INVALID_FEED') return 'Name, URL und Abrufintervall bitte prüfen.';
|
||||
if (code === 'INVALID_ACCESS') return 'Name und Berechtigung bitte prüfen.';
|
||||
return 'Die Aktion konnte nicht ausgeführt werden.';
|
||||
}
|
||||
|
||||
@@ -65,6 +91,64 @@ function toolInput(data: FormData): ToolInput {
|
||||
}
|
||||
|
||||
export const actions = {
|
||||
createShare: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
const share = await createShare(actor, {
|
||||
showId: String(data.get('showId') || ''),
|
||||
scope: String(data.get('scope') || ''),
|
||||
password: String(data.get('password') || ''),
|
||||
expiresAtUtc: berlinLocalToUtc(String(data.get('expiresAt') || ''), 'INVALID_EXPIRY')
|
||||
});
|
||||
return {
|
||||
intent: 'createShare',
|
||||
success: 'Leselink angelegt. Der Link wird nur jetzt vollständig angezeigt.',
|
||||
shareUrl: `/freigabe/${share.token}`
|
||||
};
|
||||
} catch (cause) {
|
||||
return fail(400, { intent: 'createShare', error: actionError(cause) });
|
||||
}
|
||||
},
|
||||
updateShare: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
await updateShare(actor, String(data.get('shareId') || ''), {
|
||||
scope: String(data.get('scope') || ''),
|
||||
passwordMode: String(data.get('passwordMode') || ''),
|
||||
password: String(data.get('password') || ''),
|
||||
expiresAtUtc: berlinLocalToUtc(String(data.get('expiresAt') || ''), 'INVALID_EXPIRY')
|
||||
});
|
||||
return { intent: 'updateShare', success: 'Freigabe aktualisiert.' };
|
||||
} catch (cause) {
|
||||
return fail(400, { intent: 'updateShare', error: actionError(cause) });
|
||||
}
|
||||
},
|
||||
replaceShare: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
const token = replaceShareToken(actor, String(data.get('shareId') || ''));
|
||||
return {
|
||||
intent: 'replaceShare',
|
||||
success: 'Ersatzlink angelegt. Der bisherige Link ist ungültig.',
|
||||
shareUrl: `/freigabe/${token}`
|
||||
};
|
||||
} catch (cause) {
|
||||
return fail(400, { intent: 'replaceShare', error: actionError(cause) });
|
||||
}
|
||||
},
|
||||
deleteShare: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
deleteShare(actor, String(data.get('shareId') || ''));
|
||||
return { intent: 'deleteShare', success: 'Freigabe gelöscht.' };
|
||||
} catch (cause) {
|
||||
return fail(400, { intent: 'deleteShare', error: actionError(cause) });
|
||||
}
|
||||
},
|
||||
invite: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
@@ -196,5 +280,93 @@ export const actions = {
|
||||
} catch (cause) {
|
||||
return fail(400, { intent: 'tool', error: actionError(cause) });
|
||||
}
|
||||
},
|
||||
saveFeed: async ({ locals, request }) => {
|
||||
requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
saveFeedSource(String(data.get('feedId') || '') || null, {
|
||||
name: String(data.get('name') || ''),
|
||||
url: String(data.get('url') || ''),
|
||||
isEnabled: data.get('isEnabled') === '1',
|
||||
refreshIntervalMinutes: Number(data.get('refreshIntervalMinutes')),
|
||||
defaultCategoryId: String(data.get('defaultCategoryId') || '') || null
|
||||
});
|
||||
return { intent: 'feed', success: 'Feed gespeichert.' };
|
||||
} catch (cause) {
|
||||
return fail(400, { intent: 'feed', error: actionError(cause) });
|
||||
}
|
||||
},
|
||||
deleteFeed: async ({ locals, request }) => {
|
||||
requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
deleteFeedSource(String(data.get('feedId') || ''));
|
||||
return { intent: 'feed', success: 'Feed entfernt.' };
|
||||
} catch (cause) {
|
||||
return fail(400, { intent: 'feed', error: actionError(cause) });
|
||||
}
|
||||
},
|
||||
fetchFeed: async ({ locals, request }) => {
|
||||
requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
const result = await fetchFeed(String(data.get('feedId') || ''));
|
||||
return {
|
||||
intent: 'feed',
|
||||
success: result.unchanged
|
||||
? 'Feed ist unverändert.'
|
||||
: `${result.inserted} neue Beiträge abgerufen.`
|
||||
};
|
||||
} catch {
|
||||
return fail(400, {
|
||||
intent: 'feed',
|
||||
error: 'Feed konnte nicht sicher abgerufen oder gelesen werden.'
|
||||
});
|
||||
}
|
||||
},
|
||||
createTechnicalAccess: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
const created = createTechnicalAccess(
|
||||
actor,
|
||||
String(data.get('name') || ''),
|
||||
String(data.get('permissions') || '')
|
||||
);
|
||||
return {
|
||||
intent: 'technicalAccess',
|
||||
success:
|
||||
'Technischer Zugang angelegt. Token jetzt sicher hinterlegen; es wird nicht erneut angezeigt.',
|
||||
technicalToken: created.token
|
||||
};
|
||||
} catch (cause) {
|
||||
return fail(400, { intent: 'technicalAccess', error: actionError(cause) });
|
||||
}
|
||||
},
|
||||
updateTechnicalAccess: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
updateTechnicalAccess(
|
||||
actor,
|
||||
String(data.get('accessId') || ''),
|
||||
String(data.get('name') || ''),
|
||||
String(data.get('permissions') || '')
|
||||
);
|
||||
return { intent: 'technicalAccess', success: 'Technischer Zugang aktualisiert.' };
|
||||
} catch (cause) {
|
||||
return fail(400, { intent: 'technicalAccess', error: actionError(cause) });
|
||||
}
|
||||
},
|
||||
revokeTechnicalAccess: async ({ locals, request }) => {
|
||||
const actor = requireBarkeeper(locals.user);
|
||||
const data = await request.formData();
|
||||
try {
|
||||
revokeTechnicalAccess(actor, String(data.get('accessId') || ''));
|
||||
return { intent: 'technicalAccess', success: 'Technischer Zugang widerrufen.' };
|
||||
} catch (cause) {
|
||||
return fail(400, { intent: 'technicalAccess', error: actionError(cause) });
|
||||
}
|
||||
}
|
||||
} satisfies Actions;
|
||||
@@ -1,10 +1,19 @@
|
||||
<script lang="ts">
|
||||
import { resolve } from '$app/paths';
|
||||
import AppIcon from '#lib/components/AppIcon.svelte';
|
||||
import FeedEditorDialog from '#lib/components/FeedEditorDialog.svelte';
|
||||
import IconPicker from '#lib/components/IconPicker.svelte';
|
||||
import ShareManagement from '#lib/components/ShareManagement.svelte';
|
||||
import TechnicalAccessDialog from '#lib/components/TechnicalAccessDialog.svelte';
|
||||
import ToolEditorDialog from '#lib/components/ToolEditorDialog.svelte';
|
||||
import type { PageProps } from './$types';
|
||||
let { data, form }: PageProps = $props();
|
||||
let toolDialog: { showModal: (tool?: (typeof data.tools)[number] | null) => void };
|
||||
let feedDialog: { showModal: (feed?: (typeof data.feeds)[number] | null) => void };
|
||||
let technicalAccessDialog: {
|
||||
showModal: (access?: (typeof data.technicalAccesses)[number] | null) => void;
|
||||
};
|
||||
let managementIntent = $derived(form?.intent?.toLowerCase() ?? '');
|
||||
|
||||
function confirmTaxonomyRemoval(event: SubmitEvent) {
|
||||
if (!confirm('Eintrag wirklich entfernen?')) event.preventDefault();
|
||||
@@ -18,8 +27,144 @@
|
||||
<h1>Verwaltung</h1>
|
||||
<p class="page-intro">Konten, Werkzeuge und bestehende Taxonomie verwalten.</p>
|
||||
</header>
|
||||
{#if form?.error}<div class="form-message error" role="alert">{form.error}</div>{/if}
|
||||
{#if form?.success}<div class="form-message success" role="status">{form.success}</div>{/if}
|
||||
{#if form?.error && !['share', 'technicalaccess'].some( (intent) => managementIntent.includes(intent) )}<div
|
||||
class="form-message error"
|
||||
role="alert"
|
||||
>
|
||||
{form.error}
|
||||
</div>{/if}
|
||||
{#if form?.success && !['share', 'technicalaccess'].some( (intent) => managementIntent.includes(intent) )}<div
|
||||
class="form-message success"
|
||||
role="status"
|
||||
>
|
||||
{form.success}
|
||||
</div>{/if}
|
||||
<h2 class="section-heading">Schnittstellen</h2>
|
||||
<section class="quiet-panel integration-catalog">
|
||||
<div class="panel-heading">
|
||||
<div>
|
||||
<p class="eyebrow">Import</p>
|
||||
<h2>RSS-Feeds</h2>
|
||||
</div>
|
||||
<button class="compact-add-button" type="button" onclick={() => feedDialog.showModal()}>
|
||||
<AppIcon name="plus" /> Feed hinzufügen
|
||||
</button>
|
||||
</div>
|
||||
<p class="catalog-note">
|
||||
Aktive Feeds werden im gewählten Intervall abgerufen. Beiträge landen zuerst separat im
|
||||
Eingang.
|
||||
</p>
|
||||
<div class="catalog-settings-list integration-settings-list">
|
||||
{#each data.feeds as feed (feed.id)}
|
||||
<article class:inactive={!feed.isEnabled} class="catalog-setting-row">
|
||||
<button
|
||||
class="catalog-entry-main"
|
||||
type="button"
|
||||
aria-label={`${feed.name} bearbeiten`}
|
||||
onclick={() => feedDialog.showModal(feed)}
|
||||
>
|
||||
<span class="catalog-entry-icon"><AppIcon name="rss" /></span>
|
||||
<span class="catalog-entry-copy">
|
||||
<strong>{feed.name}</strong>
|
||||
<small
|
||||
>{feed.lastError
|
||||
? `Fehler: ${feed.lastError}`
|
||||
: feed.lastFetchedAtUtc
|
||||
? `Zuletzt ${new Date(feed.lastFetchedAtUtc).toLocaleString('de-DE')}`
|
||||
: 'Noch nicht abgerufen'} · {feed.isEnabled ? 'Automatisch' : 'Pausiert'}</small
|
||||
>
|
||||
</span>
|
||||
<AppIcon name="pen" />
|
||||
</button>
|
||||
<div class="catalog-entry-actions">
|
||||
<form method="POST" action="?/fetchFeed">
|
||||
<input type="hidden" name="feedId" value={feed.id} />
|
||||
<button type="submit" aria-label={`${feed.name} jetzt abrufen`} title="Jetzt abrufen"
|
||||
><AppIcon name="arrow-rotate-right" /></button
|
||||
>
|
||||
</form>
|
||||
<form
|
||||
method="POST"
|
||||
action="?/deleteFeed"
|
||||
onsubmit={(event) =>
|
||||
!confirm('Feed und seinen Importeingang löschen?') && event.preventDefault()}
|
||||
>
|
||||
<input type="hidden" name="feedId" value={feed.id} />
|
||||
<button
|
||||
class="danger-text"
|
||||
type="submit"
|
||||
aria-label={`${feed.name} löschen`}
|
||||
title="Feed löschen"><AppIcon name="trash" /></button
|
||||
>
|
||||
</form>
|
||||
</div>
|
||||
</article>
|
||||
{/each}
|
||||
{#if !data.feeds.length}<p class="empty-copy">Noch keine RSS-Feeds eingerichtet.</p>{/if}
|
||||
</div>
|
||||
</section>
|
||||
<FeedEditorDialog bind:this={feedDialog} categories={data.taxonomy.categories} />
|
||||
|
||||
<section class="quiet-panel integration-catalog">
|
||||
<div class="panel-heading">
|
||||
<div>
|
||||
<p class="eyebrow">Externe Assistenz</p>
|
||||
<h2>Technische Zugänge</h2>
|
||||
</div>
|
||||
<button
|
||||
class="compact-add-button"
|
||||
type="button"
|
||||
onclick={() => technicalAccessDialog.showModal()}
|
||||
>
|
||||
<AppIcon name="plus" /> Zugang hinzufügen
|
||||
</button>
|
||||
</div>
|
||||
<p class="catalog-note">
|
||||
Tokens gelten ausschließlich für die API. Schreibende Aufrufe werden protokolliert und müssen
|
||||
idempotent sein. <a href={resolve('/api/v1/openapi.json')} target="_blank">OpenAPI öffnen</a>
|
||||
</p>
|
||||
<div class="catalog-settings-list integration-settings-list">
|
||||
{#each data.technicalAccesses as access (access.id)}
|
||||
<article class:inactive={Boolean(access.revokedAtUtc)} class="catalog-setting-row">
|
||||
<button
|
||||
class="catalog-entry-main"
|
||||
type="button"
|
||||
disabled={Boolean(access.revokedAtUtc)}
|
||||
aria-label={`${access.name} bearbeiten`}
|
||||
onclick={() => technicalAccessDialog.showModal(access)}
|
||||
>
|
||||
<span class="catalog-entry-icon"><AppIcon name="key" /></span>
|
||||
<span class="catalog-entry-copy">
|
||||
<strong>{access.name}</strong>
|
||||
<small
|
||||
>{access.permissions === 'read' ? 'Nur lesen' : 'Lesen und schreiben'} · {access.revokedAtUtc
|
||||
? 'Widerrufen'
|
||||
: access.lastUsedAtUtc
|
||||
? `Zuletzt genutzt ${new Date(access.lastUsedAtUtc).toLocaleString('de-DE')}`
|
||||
: 'Noch nicht genutzt'}</small
|
||||
>
|
||||
</span>
|
||||
{#if !access.revokedAtUtc}<AppIcon name="pen" />{/if}
|
||||
</button>
|
||||
{#if !access.revokedAtUtc}<div class="catalog-entry-actions">
|
||||
<form method="POST" action="?/revokeTechnicalAccess">
|
||||
<input type="hidden" name="accessId" value={access.id} />
|
||||
<button
|
||||
class="danger-text"
|
||||
type="submit"
|
||||
aria-label={`${access.name} widerrufen`}
|
||||
title="Zugang widerrufen"><AppIcon name="ban" /></button
|
||||
>
|
||||
</form>
|
||||
</div>{/if}
|
||||
</article>
|
||||
{/each}
|
||||
{#if !data.technicalAccesses.length}<p class="empty-copy">
|
||||
Noch keine technischen Zugänge angelegt.
|
||||
</p>{/if}
|
||||
</div>
|
||||
</section>
|
||||
<TechnicalAccessDialog bind:this={technicalAccessDialog} {form} />
|
||||
|
||||
<section class="quiet-panel account-panel">
|
||||
<div class="panel-heading">
|
||||
@@ -117,7 +262,8 @@
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<h2 class="section-heading">Werkzeuge</h2>
|
||||
<h2 class="section-heading">Werkzeuge & Freigaben</h2>
|
||||
<ShareManagement shows={data.shows} shares={data.shares} {form} catalogPanel />
|
||||
<section class="quiet-panel tool-management">
|
||||
<div class="panel-heading">
|
||||
<div>
|
||||
@@ -260,3 +406,13 @@
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.integration-catalog {
|
||||
margin-block: 1.5rem;
|
||||
padding: clamp(0.85rem, 2vw, 1.2rem);
|
||||
}
|
||||
.integration-catalog .catalog-note a {
|
||||
white-space: nowrap;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"name": "Sendewerk",
|
||||
"short_name": "Sendewerk",
|
||||
"description": "Redaktion, Sendungsplanung und Live-Regie für heinzlive",
|
||||
"start_url": "/sendungen",
|
||||
"display": "standalone",
|
||||
"background_color": "#0b1220",
|
||||
"theme_color": "#0b1220",
|
||||
"lang": "de",
|
||||
"orientation": "any"
|
||||
}
|
||||
+789
-30
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user