hl-valdemar/terebi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

fix: retain Zoko opening and ending metadata through playback

Browse Source
This commit is contained in:
Valdemar Høgsvig Lorenzen
2026-10-25 23:01:38 +01:00
parent d8fb648c90
commit 41aa0abd56
11 changed files with 341 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Checks/zoko.swift
+62 -3
View File
@@ -15,7 +15,10 @@ struct ZokoCheck {
throw Failure(message: "Incorrect provider error category")
}
static func page(_ config: [String: Any]) throws -> String {
var data = Array(try JSONSerialization.data(withJSONObject: config))
try page(data: JSONSerialization.data(withJSONObject: config))
}
static func page(data: Data) -> String {
var data = Array(data)
let key = Array("otaku-embed-v1".utf8)
for i in data.indices { data[i] ^= key[i % key.count] }
return "<script>window.__P = '\(Data(data).base64EncodedString())';</script>"
@@ -35,7 +38,60 @@ struct ZokoCheck {
}
var config: [String: Any] = ["src": "https://hls.dramahot.top/master.m3u8?token=fixture",
"subtitles": [["src": "https://hls.dramahot.top/en.vtt", "lang": "en", "label": "English", "default": true]]]
let intro = ProviderInterval(kind: .intro, start: 49.25, end: 144.75)
let outro = ProviderInterval(kind: .outro, start: 1357.125, end: 1451.5)
config["skip"] = ["intro": ["start": intro.start, "end": intro.end],
"outro": ["start": outro.start, "end": outro.end]]
let source = try ZokoResolver.parse(page: page(config), mediaID: "1", episode: 1)
try require(source.intervals == [intro, outro], "fractional provider boundaries retain seconds and kinds")
let replaced = source.replacingSubtitles([])
try require(replaced.intervals == source.intervals && replaced.subtitles.isEmpty &&
replaced.identity == source.identity && replaced.requirements.zoko,
"subtitle replacement preserves provider intervals and playback requirements")
let malformedMetadata: [Any] = [NSNull(), true, "bad", [], [:], ["intro": NSNull(), "outro": "bad"]]
for metadata in malformedMetadata {
var malformed = config
malformed["skip"] = metadata
let parsed = try ZokoResolver.parse(page: page(malformed), mediaID: "1", episode: 1)
try require(parsed.intervals.isEmpty && parsed.url == source.url && parsed.subtitles.count == 1,
"missing or malformed skip metadata does not block valid playback")
}
var absent = config
absent.removeValue(forKey: "skip")
let withoutTimings = try ZokoResolver.parse(page: page(absent), mediaID: "1", episode: 1)
try require(withoutTimings.intervals.isEmpty && withoutTimings.url == source.url,
"provider timings are optional")
let invalidTimings: [Any] = [
NSNull(), true, "bad", [], [:], ["start": 1], ["end": 2],
["start": true, "end": 144], ["start": 49, "end": false],
["start": "49", "end": 144], ["start": 49, "end": "144"],
["start": -1, "end": 144], ["start": 49, "end": -1],
["start": 49, "end": 49], ["start": 144, "end": 49]
]
for invalid in invalidTimings {
for badKind in ["intro", "outro"] {
var malformed = config
var skip = config["skip"] as! [String: Any]
skip[badKind] = invalid
malformed["skip"] = skip
let parsed = try ZokoResolver.parse(page: page(malformed), mediaID: "1", episode: 1)
try require(parsed.intervals == (badKind == "intro" ? [outro] : [intro]) && parsed.url == source.url,
"each malformed interval is discarded independently without blocking playback")
}
}
for timing in [#"{"start":1e999,"end":144}"#, #"{"start":49,"end":1e999}"#] {
let data = Data("""
{"src":"https://hls.dramahot.top/master.m3u8","subtitles":[],
"skip":{"intro":\(timing),"outro":{"start":1357.125,"end":1451.5}}}
""".utf8)
let parsed = try ZokoResolver.parse(page: page(data: data), mediaID: "1", episode: 1)
try require(parsed.intervals == [outro], "nonfinite numeric interval never blocks a valid sibling or playback")
}
var zeroStart = config
zeroStart["skip"] = ["intro": ["start": 0, "end": 1.5]]
let zeroSource = try ZokoResolver.parse(page: page(zeroStart), mediaID: "1", episode: 1)
try require(zeroSource.intervals == [ProviderInterval(kind: .intro, start: 0, end: 1.5)],
"zero-based intervals remain valid")
let mapped = try await ZokoResolver.resolve(mediaID: "97940", episode: 1, fetchResponse: { request in
let data: Data
let mime: String
@@ -46,13 +102,16 @@ struct ZokoCheck {
mime = "application/json"
} else {
try require(request.url?.absoluteString == "https://zokoanime.video/stream/mal/34572/1/sub", "provider lookup uses the exact mapped MAL ID, not AniList ID")
data = Data(try page(["src": "https://hls.dramahot.top/master.m3u8", "subtitles": []]).utf8)
data = Data(try page(["src": "https://hls.dramahot.top/master.m3u8", "subtitles": [],
"skip": ["intro": ["start": 49.25, "end": 144.75]]]).utf8)
mime = "text/html"
}
return (data, HTTPURLResponse(url: request.url!, statusCode: 200, httpVersion: nil, headerFields: ["Content-Type": mime])!)
})
try require(mapped.identity == "anilist:97940:1" && mapped.title == "Black Clover · Episode 1 (sub)",
"mapped playback preserves AniList identity and catalog title")
try require(mapped.intervals == [intro] && mapped.requirements.zoko,
"catalog title enrichment preserves provider intervals and transport requirements")
for bad in [
#"{"data":{"Media":{"id":34572,"idMal":97940}}}"#,
#"{"data":{"Media":{"id":97940,"idMal":0}}}"#,
@@ -116,7 +175,7 @@ struct ZokoCheck {
progress = PlaybackProgress(defaults: defaults)
try require(progress.position(for: identity) == 123 && progress.position(for: URL(string: "miruro:1:1")!) == 456,
"AniList resume persists separately from Miruro")
print("PASS: AniList URL/identity, static codec, unavailable/protection/malformed categories, bounded resources/subtitles, narrow CDN policy and isolated resume")
print("PASS: AniList URL/identity, static codec, optional independent fractional skip metadata, source transformations, unavailable/protection/malformed categories, bounded resources/subtitles, narrow CDN policy and isolated resume")
}
// No NSApplication, window or audio playback. The production player opens and