Drei zusammenhängende Blöcke in einem Commit (Files überlappen sich
zwischen den Themen — sauberer Split nicht ohne Friktion möglich):
1. Wordeck-Text-Only-Cleanup
Image-Occlusion + Audio-Front-Code raus. Server ist seit Migration
0004_wordeck_text_only.sql text-only (in Prod waren 0 Karten der
Typen, 0 Media-Files). Native-Code war Build-11-Altlast.
- Gelöscht: MediaCache, MediaEnvironment, RemoteImage,
AudioPlayerButton, MaskEditorView, CardEditorMediaFields,
CardEditorPayload, Media.swift
- CardType-Enum auf 5 Werte: basic / basic-reverse / cloze /
typing / multiple-choice
- media_refs aus Card, CardCreateBody, CardUpdateBody, call-sites
- WordeckAPI.uploadMedia / .fetchMedia / .deleteMedia + Single-File-
makeMultipartBody gestrichen
- MarketplaceCardConverter ohne Media-Cases
- CardRenderer ohne imageOcclusionView / audioFrontView
2. AI-Media-Mode raus
/decks/from-image-Endpoint existiert serverseitig nicht (server
registriert nur /decks/generate für Text-Prompts). Native-Aufrufe
wären 404 — toter Code.
- aiMedia-Case aus DeckEditorView.CreateMode, ModePicker auf
3 Optionen (Leer / KI / CSV)
- AIMediaFormSections, MediaFileRow, mediaPickers, thumbnail,
ingestPhotoItems, handlePDFImport raus
- generateDeckFromMedia + makeFromImageMultipartBody raus
- GenerationMediaFile-Struct + PhotosUI-Import + PlatformImage-
typealias raus
- NSPhotoLibraryUsageDescription aus project.yml entfernt (es gibt
keinen Photo-Library-Zugriff mehr)
- maxMediaFiles/maxImageBytes/maxPDFBytes + inferImageMimeType +
imageExtension aus DeckEditorHelpers raus
3. ζ-1 Offline-Sync
Konzept in docs/OFFLINE_SYNC.md. Server-authoritative-FSRS bleibt —
kein lokales FSRS, nur Snapshot-Modell.
- Neue SwiftData-Models: CachedCard + CachedDueReview, beide mit
userId/deckId-Indizes
- ModelContainer um die zwei Models erweitert (additive Migration,
sollte automatisch laufen — vor TestFlight verifizieren)
- DueReview bekommt programmatischen init(review:card:) für die
Cache-Rekonstruktion
- DeckListStore.refresh() zieht Cards + Due-Reviews pro Deck
parallel in einer TaskGroup; applyToCache in drei Helpers
gesplittet (applyDecks / applyCards / applyDueReviews)
- Karten: Upsert mit Orphan-Cleanup
- Due-Reviews: voll ersetzt pro Refresh (Server-`due`-Zeiten
ändern sich, Merge wäre falsch)
- StudySession.start() fällt bei Netz-Fehler auf
CachedDueReview-Snapshot zurück, setzt isOfflineSession-Flag
- StudySessionView zeigt offline-Banner und am Ende der Session
einen Hinweis „Weitere Karten erst nach Verbindung verfügbar"
- AccountView.wipeLocalCache(): DSGVO-Wipe vor signOut() und nach
deleteAccount → CachedDeck + CachedCard + CachedDueReview +
PendingGrade werden gelöscht
Plus: Keychain-Test in WordeckNativeTests.swift fix — erwartete
"ev.mana.wordeck", muss seit Cross-App-SSO-Commit 19fee75
ManaSharedKeychainGroup nutzen. Auf Konstant-Reference umgestellt,
damit's nicht wieder driftet.
Verifikation:
- xcodebuild iOS-Simulator: BUILD SUCCEEDED
- swiftlint --strict: 0 violations in 68 files
- swiftformat: clean
- 37/37 Tests grün (inkl. fix-Keychain-Test)
- macOS-Build scheitert an pre-existing .topBarTrailing in
StudySessionView (iOS-only API seit 2026-05-13, nicht durch
diesen Commit verursacht)
Pflicht-Verifikation vor TestFlight (in PLAN.md verewigt):
- SwiftData-Migration auf Bestandsbuilder
- Offline-Endurance (50+ Karten Flugmodus)
- Logout-Wipe mit Account-Switch
- Cross-Check Web ↔ Native nach Offline-Grade
Diff: 35 files, +869 / -1622, netto ~−750 LOC.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
382 lines
15 KiB
Swift
382 lines
15 KiB
Swift
import Foundation
|
|
import ManaCore
|
|
|
|
// swiftlint:disable type_body_length
|
|
|
|
/// Wordeck-API-Client. Wrapper um `AuthenticatedTransport`
|
|
/// aus ManaCore, der die Wordeck-Endpoints kennt. Marketplace-Moderation
|
|
/// + Self-Endpoints + AI-Generation sind in `WordeckAPI+Marketplace.swift`
|
|
/// und `WordeckAPI+Generation.swift` ausgelagert.
|
|
actor WordeckAPI {
|
|
let transport: AuthenticatedTransport
|
|
let decoder: JSONDecoder
|
|
|
|
init(auth: AuthClient) {
|
|
transport = AuthenticatedTransport(baseURL: AppConfig.apiBaseURL, auth: auth)
|
|
decoder = JSONDecoder()
|
|
decoder.dateDecodingStrategy = .iso8601withFractional
|
|
}
|
|
|
|
/// Health-Probe — verifiziert dass wordeck-api erreichbar ist
|
|
/// und der eigene JWT akzeptiert wird.
|
|
func healthCheck() async throws -> Bool {
|
|
let (_, http) = try await transport.request(path: "/healthz")
|
|
return http.statusCode == 200
|
|
}
|
|
|
|
// MARK: - Decks
|
|
|
|
/// `GET /api/v1/decks?archived=false` — alle aktiven Decks des Users.
|
|
/// Optional: `forkedFromMarketplaceOnly` filtert auf Inbox-Decks
|
|
/// (für den Inbox-Banner).
|
|
func listDecks(forkedFromMarketplaceOnly: Bool = false) async throws -> [Deck] {
|
|
var path = "/api/v1/decks"
|
|
if forkedFromMarketplaceOnly {
|
|
path += "?forked_from_marketplace=true"
|
|
}
|
|
let (data, http) = try await transport.request(path: path)
|
|
try ensureOK(http, data: data)
|
|
let body = try decoder.decode(DeckListResponse.self, from: data)
|
|
return body.decks
|
|
}
|
|
|
|
/// `GET /api/v1/cards?deck_id=...` — Anzahl Karten in einem Deck.
|
|
/// Web macht das pro Deck einzeln; identisches Pattern hier.
|
|
func cardCount(deckId: String) async throws -> Int {
|
|
let (data, http) = try await transport.request(path: "/api/v1/cards?deck_id=\(deckId)")
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(CardListResponse.self, from: data).total
|
|
}
|
|
|
|
/// `GET /api/v1/cards?deck_id=...` — komplette Liste der Karten
|
|
/// für den Browse-Modus im DeckDetailView.
|
|
func listCards(deckId: String) async throws -> [Card] {
|
|
let (data, http) = try await transport.request(path: "/api/v1/cards?deck_id=\(deckId)")
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(CardListResponse.self, from: data).cards
|
|
}
|
|
|
|
/// `GET /api/v1/decks/:deckId/distractors` — N zufällige Feldwerte
|
|
/// aus anderen Karten desselben Decks. Server-Schema erlaubt nur
|
|
/// `front`, `back`, `answer`, `question` als field.
|
|
func distractors(
|
|
deckId: String,
|
|
cardId: String,
|
|
field: String = "answer",
|
|
count: Int = 3
|
|
) async throws -> [String] {
|
|
let path = "/api/v1/decks/\(deckId)/distractors?card_id=\(cardId)&field=\(field)&count=\(count)"
|
|
let (data, http) = try await transport.request(path: path)
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(DistractorsResponse.self, from: data).distractors
|
|
}
|
|
|
|
/// `GET /api/v1/reviews/due?deck_id=...&limit=500` — Anzahl fälliger
|
|
/// Reviews in einem Deck.
|
|
func dueCount(deckId: String) async throws -> Int {
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/reviews/due?deck_id=\(deckId)&limit=500"
|
|
)
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(DueReviewsResponse.self, from: data).total
|
|
}
|
|
|
|
// MARK: - Marketplace
|
|
|
|
/// `GET /api/v1/marketplace/explore` — Featured + Trending.
|
|
func explore() async throws -> ExploreResponse {
|
|
let (data, http) = try await transport.request(path: "/api/v1/marketplace/explore")
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(ExploreResponse.self, from: data)
|
|
}
|
|
|
|
/// `GET /api/v1/marketplace/decks` — Browse mit Filtern.
|
|
func browseMarketplace(
|
|
query: String? = nil,
|
|
sort: MarketplaceSort = .recent,
|
|
language: String? = nil,
|
|
limit: Int = 20,
|
|
offset: Int = 0
|
|
) async throws -> BrowseResponse {
|
|
var items: [URLQueryItem] = [
|
|
.init(name: "sort", value: sort.rawValue),
|
|
.init(name: "limit", value: "\(limit)"),
|
|
.init(name: "offset", value: "\(offset)")
|
|
]
|
|
if let query, !query.trimmingCharacters(in: .whitespaces).isEmpty {
|
|
items.append(.init(name: "q", value: query))
|
|
}
|
|
if let language {
|
|
items.append(.init(name: "language", value: language))
|
|
}
|
|
var components = URLComponents()
|
|
components.queryItems = items
|
|
let queryString = components.percentEncodedQuery ?? ""
|
|
let path = "/api/v1/marketplace/decks?\(queryString)"
|
|
|
|
let (data, http) = try await transport.request(path: path)
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(BrowseResponse.self, from: data)
|
|
}
|
|
|
|
/// `GET /api/v1/marketplace/decks/:slug`.
|
|
func publicDeck(slug: String) async throws -> PublicDeckDetail {
|
|
let (data, http) = try await transport.request(path: "/api/v1/marketplace/decks/\(slug)")
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(PublicDeckDetail.self, from: data)
|
|
}
|
|
|
|
/// `POST /api/v1/marketplace/decks/:slug/subscribe` — Auto-Fork
|
|
/// passiert serverseitig, Response liefert `private_deck_id`.
|
|
@discardableResult
|
|
func subscribe(slug: String) async throws -> SubscribeResponse {
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/marketplace/decks/\(slug)/subscribe",
|
|
method: "POST"
|
|
)
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(SubscribeResponse.self, from: data)
|
|
}
|
|
|
|
/// `DELETE /api/v1/marketplace/decks/:slug/subscribe`.
|
|
func unsubscribe(slug: String) async throws {
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/marketplace/decks/\(slug)/subscribe",
|
|
method: "DELETE"
|
|
)
|
|
try ensureOK(http, data: data)
|
|
}
|
|
|
|
// MARK: - Deck-Mutations
|
|
|
|
/// `POST /api/v1/decks` — Deck anlegen.
|
|
@discardableResult
|
|
func createDeck(_ body: DeckCreateBody) async throws -> Deck {
|
|
let data = try makeJSON(body)
|
|
let (responseData, http) = try await transport.request(
|
|
path: "/api/v1/decks",
|
|
method: "POST",
|
|
body: data
|
|
)
|
|
try ensureOK(http, data: responseData)
|
|
return try decoder.decode(Deck.self, from: responseData)
|
|
}
|
|
|
|
/// `PATCH /api/v1/decks/:id` — Deck-Felder ändern.
|
|
@discardableResult
|
|
func updateDeck(id: String, body: DeckUpdateBody) async throws -> Deck {
|
|
let data = try makeJSON(body)
|
|
let (responseData, http) = try await transport.request(
|
|
path: "/api/v1/decks/\(id)",
|
|
method: "PATCH",
|
|
body: data
|
|
)
|
|
try ensureOK(http, data: responseData)
|
|
return try decoder.decode(Deck.self, from: responseData)
|
|
}
|
|
|
|
/// `DELETE /api/v1/decks/:id` — Deck löschen (kaskadiert Cards + Reviews).
|
|
func deleteDeck(id: String) async throws {
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/decks/\(id)",
|
|
method: "DELETE"
|
|
)
|
|
try ensureOK(http, data: data)
|
|
}
|
|
|
|
/// `POST /api/v1/decks/:id/duplicate` — Server-seitige Kopie mit
|
|
/// "(Kopie)"-Suffix, ohne FSRS-Verlauf, ohne Marketplace-Pointer.
|
|
@discardableResult
|
|
func duplicateDeck(id: String) async throws -> Deck {
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/decks/\(id)/duplicate",
|
|
method: "POST"
|
|
)
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(Deck.self, from: data)
|
|
}
|
|
|
|
/// `POST /api/v1/marketplace/private/:deckId/pull-update` — Smart-Merge-
|
|
/// Pull. Holt neue/geänderte Karten aus der jüngsten Marketplace-Version
|
|
/// in das geforkte private Deck. Removed-Karten bleiben lokal (User-
|
|
/// Choice gewinnt). 422 wenn das Deck kein Fork ist.
|
|
func pullUpdate(deckId: String) async throws -> PullUpdateResponse {
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/marketplace/private/\(deckId)/pull-update",
|
|
method: "POST"
|
|
)
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(PullUpdateResponse.self, from: data)
|
|
}
|
|
|
|
// MARK: - Marketplace-Publish
|
|
|
|
/// `POST /api/v1/marketplace/authors/me` — Author-Profil upserten.
|
|
/// Pflicht-Schritt vor dem ersten Deck-Init im Marketplace.
|
|
func upsertAuthor(_ body: AuthorUpsertBody) async throws {
|
|
let payload = try makeJSON(body)
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/marketplace/authors/me",
|
|
method: "POST",
|
|
body: payload
|
|
)
|
|
try ensureOK(http, data: data)
|
|
}
|
|
|
|
/// `GET /api/v1/marketplace/authors/me` — eigenes Author-Profil
|
|
/// lesen, gibt `nil` zurück wenn noch keins existiert.
|
|
func myAuthor() async throws -> Bool {
|
|
let (data, http) = try await transport.request(path: "/api/v1/marketplace/authors/me")
|
|
try ensureOK(http, data: data)
|
|
// Server liefert entweder Author-Objekt oder JSON-null.
|
|
if let raw = try? JSONSerialization.jsonObject(with: data), raw is NSNull {
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
|
|
/// `POST /api/v1/marketplace/decks` — Marketplace-Deck-Init.
|
|
/// Erstellt nur Metadaten; Karten folgen via `publishMarketplaceVersion`.
|
|
@discardableResult
|
|
func initMarketplaceDeck(_ body: MarketplaceDeckInitBody) async throws -> PublicDeck {
|
|
let payload = try makeJSON(body)
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/marketplace/decks",
|
|
method: "POST",
|
|
body: payload
|
|
)
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(PublicDeck.self, from: data)
|
|
}
|
|
|
|
/// `POST /api/v1/marketplace/decks/:slug/publish` — neue Version
|
|
/// publishen. Karten werden serverseitig durch AI-Moderation geschickt.
|
|
func publishMarketplaceVersion(
|
|
slug: String,
|
|
body: MarketplacePublishBody
|
|
) async throws -> MarketplacePublishResponse {
|
|
let payload = try makeJSON(body)
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/marketplace/decks/\(slug)/publish",
|
|
method: "POST",
|
|
body: payload
|
|
)
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(MarketplacePublishResponse.self, from: data)
|
|
}
|
|
|
|
// MARK: - Card-Mutations
|
|
|
|
/// `POST /api/v1/cards` — Karte anlegen. Server validiert `fields`
|
|
/// gegen den Card-Type und erstellt automatisch Reviews
|
|
/// (1 für basic, 2 für basic-reverse, N für cloze).
|
|
@discardableResult
|
|
func createCard(_ body: CardCreateBody) async throws -> Card {
|
|
let data = try makeJSON(body)
|
|
let (responseData, http) = try await transport.request(
|
|
path: "/api/v1/cards",
|
|
method: "POST",
|
|
body: data
|
|
)
|
|
try ensureOK(http, data: responseData)
|
|
return try decoder.decode(Card.self, from: responseData)
|
|
}
|
|
|
|
/// `PATCH /api/v1/cards/:id` — nur `fields` und `media_refs`
|
|
/// sind änderbar.
|
|
@discardableResult
|
|
func updateCard(id: String, body: CardUpdateBody) async throws -> Card {
|
|
let data = try makeJSON(body)
|
|
let (responseData, http) = try await transport.request(
|
|
path: "/api/v1/cards/\(id)",
|
|
method: "PATCH",
|
|
body: data
|
|
)
|
|
try ensureOK(http, data: responseData)
|
|
return try decoder.decode(Card.self, from: responseData)
|
|
}
|
|
|
|
/// `DELETE /api/v1/cards/:id` — Karte + zugehörige Reviews löschen
|
|
/// (Cascade auf DB-Ebene).
|
|
func deleteCard(id: String) async throws {
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/cards/\(id)",
|
|
method: "DELETE"
|
|
)
|
|
try ensureOK(http, data: data)
|
|
}
|
|
|
|
// MARK: - Study
|
|
|
|
/// `GET /api/v1/reviews/due?deck_id=...&limit=500` — fällige Reviews
|
|
/// inklusive zugehöriger Card-Daten. Hot-Path für die Study-View.
|
|
func dueReviews(deckId: String, limit: Int = 500) async throws -> [DueReview] {
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/reviews/due?deck_id=\(deckId)&limit=\(limit)"
|
|
)
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(DueReviewsListResponse.self, from: data).reviews
|
|
}
|
|
|
|
/// `POST /api/v1/reviews/:cardId/:subIndex/grade` — gibt eine
|
|
/// Bewertung ab. Server rechnet FSRS, antwortet mit aktualisiertem
|
|
/// Review.
|
|
@discardableResult
|
|
func gradeReview(
|
|
cardId: String,
|
|
subIndex: Int,
|
|
rating: Rating,
|
|
reviewedAt: Date = .now
|
|
) async throws -> Review {
|
|
let body = try makeJSON(GradeReviewBody(rating: rating, reviewedAt: reviewedAt))
|
|
let (data, http) = try await transport.request(
|
|
path: "/api/v1/reviews/\(cardId)/\(subIndex)/grade",
|
|
method: "POST",
|
|
body: body
|
|
)
|
|
try ensureOK(http, data: data)
|
|
return try decoder.decode(Review.self, from: data)
|
|
}
|
|
|
|
// MARK: - JSON-Encoding
|
|
|
|
func makeJSON(_ value: some Encodable) throws -> Data {
|
|
let encoder = JSONEncoder()
|
|
encoder.dateEncodingStrategy = .iso8601
|
|
return try encoder.encode(value)
|
|
}
|
|
|
|
// MARK: - Helpers
|
|
|
|
func ensureOK(_ http: HTTPURLResponse, data: Data) throws {
|
|
guard (200 ..< 300).contains(http.statusCode) else {
|
|
let message = (try? JSONDecoder().decode(CardsServerError.self, from: data))?.error
|
|
throw AuthError.serverError(status: http.statusCode, code: nil, message: message)
|
|
}
|
|
}
|
|
}
|
|
|
|
// swiftlint:enable type_body_length
|
|
|
|
private struct CardsServerError: Decodable {
|
|
let error: String?
|
|
}
|
|
|
|
extension JSONDecoder.DateDecodingStrategy {
|
|
/// Cards-API liefert ISO8601 mit Fractional-Seconds aus
|
|
/// `.toISOString()`. Standard-Strategy `.iso8601` akzeptiert die
|
|
/// fractional seconds nicht — wir nutzen einen eigenen Formatter.
|
|
static let iso8601withFractional: JSONDecoder.DateDecodingStrategy = .custom { decoder in
|
|
let container = try decoder.singleValueContainer()
|
|
let raw = try container.decode(String.self)
|
|
let f = ISO8601DateFormatter()
|
|
f.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
|
|
if let date = f.date(from: raw) { return date }
|
|
f.formatOptions = [.withInternetDateTime]
|
|
if let date = f.date(from: raw) { return date }
|
|
throw DecodingError.dataCorruptedError(
|
|
in: container,
|
|
debugDescription: "Cannot decode ISO8601 date: \(raw)"
|
|
)
|
|
}
|
|
}
|