# Conflicts:
#	main.go
#	recorder.exe
This commit is contained in:
Linrador 2025-12-08 19:09:19 +01:00
commit 65e03e794a
4 changed files with 259 additions and 244 deletions

6
go.mod
View File

@ -7,9 +7,3 @@ require (
github.com/gorilla/websocket v1.5.3 github.com/gorilla/websocket v1.5.3
github.com/grafov/m3u8 v0.12.1 github.com/grafov/m3u8 v0.12.1
) )
require (
github.com/PuerkitoBio/goquery v1.10.3 // indirect
github.com/andybalholm/cascadia v1.3.3 // indirect
golang.org/x/net v0.39.0 // indirect
)

71
go.sum
View File

@ -1,77 +1,6 @@
github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo=
github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y=
github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
github.com/gofrs/uuid/v5 v5.3.2 h1:2jfO8j3XgSwlz/wHqemAEugfnTlikAYHhnqQ8Xh4fE0= github.com/gofrs/uuid/v5 v5.3.2 h1:2jfO8j3XgSwlz/wHqemAEugfnTlikAYHhnqQ8Xh4fE0=
github.com/gofrs/uuid/v5 v5.3.2/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= github.com/gofrs/uuid/v5 v5.3.2/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grafov/m3u8 v0.12.1 h1:DuP1uA1kvRRmGNAZ0m+ObLv1dvrfNO0TPx0c/enNk0s= github.com/grafov/m3u8 v0.12.1 h1:DuP1uA1kvRRmGNAZ0m+ObLv1dvrfNO0TPx0c/enNk0s=
github.com/grafov/m3u8 v0.12.1/go.mod h1:nqzOkfBiZJENr52zTVd/Dcl03yzphIMbJqkXGu+u080= github.com/grafov/m3u8 v0.12.1/go.mod h1:nqzOkfBiZJENr52zTVd/Dcl03yzphIMbJqkXGu+u080=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

426
main.go
View File

@ -20,107 +20,172 @@ import (
var roomDossierRegexp = regexp.MustCompile(`window\.initialRoomDossier = "(.*?)"`) var roomDossierRegexp = regexp.MustCompile(`window\.initialRoomDossier = "(.*?)"`)
// HTTPClient kapselt http.Client + Header/Cookies (wie internal.Req im DVR)
type HTTPClient struct {
client *http.Client
userAgent string
}
// gemeinsamen HTTP-Client erzeugen
func NewHTTPClient(userAgent string) *HTTPClient {
if userAgent == "" {
// Default, falls kein UA übergeben wird
userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
}
return &HTTPClient{
client: &http.Client{
Timeout: 10 * time.Second,
},
userAgent: userAgent,
}
}
// Request-Erstellung mit User-Agent + Cookies
func (h *HTTPClient) NewRequest(ctx context.Context, method, url, cookieStr string) (*http.Request, error) {
req, err := http.NewRequestWithContext(ctx, method, url, nil)
if err != nil {
return nil, err
}
// Basis-Header, die immer gesetzt werden
if h.userAgent != "" {
req.Header.Set("User-Agent", h.userAgent)
} else {
req.Header.Set("User-Agent", "Mozilla/5.0")
}
req.Header.Set("Accept", "*/*")
// Cookie-String wie "name=value; foo=bar"
addCookiesFromString(req, cookieStr)
return req, nil
}
// Seite laden + einfache Erkennung von Schutzseiten (Cloudflare / Age-Gate)
func (h *HTTPClient) FetchPage(ctx context.Context, url, cookieStr string) (string, error) {
req, err := h.NewRequest(ctx, http.MethodGet, url, cookieStr)
if err != nil {
return "", err
}
resp, err := h.client.Do(req)
if err != nil {
return "", err
}
defer resp.Body.Close()
data, err := io.ReadAll(resp.Body)
if err != nil {
return "", err
}
body := string(data)
// Etwas aussagekräftigere Fehler als nur "room dossier nicht gefunden"
if strings.Contains(body, "<title>Just a moment...</title>") {
return "", errors.New("Schutzseite von Cloudflare erhalten (\"Just a moment...\") kein Room-HTML")
}
if strings.Contains(body, "Verify your age") {
return "", errors.New("Altersverifikationsseite erhalten kein Room-HTML")
}
if resp.StatusCode != http.StatusOK {
return "", fmt.Errorf("HTTP %d beim Laden von %s", resp.StatusCode, url)
}
return body, nil
}
// --- main --- // --- main ---
func main() { func main() {
if len(os.Args) < 2 { if len(os.Args) < 2 {
fmt.Println("Verwendung: recorder.exe [--http-cookie \"<Cookie>\"] <Chaturbate-URL oder Benutzername> [best] [-o <Pfad/zieldatei.ts>] [-f]") fmt.Println("Verwendung: recorder.exe [--http-cookie \"<Cookie>\"] [--user-agent \"<UA>\"] [--domain \"https://chaturbate.com/\"] <Chaturbate-URL oder Benutzername> [best] [-o <Pfad/zieldatei.ts>] [-f]")
os.Exit(1) os.Exit(1)
} }
var ( var (
httpCookie string httpCookie string
outputPath string outputPath string
urlArg string urlArg string
) userAgent string
domain = "https://chaturbate.com/" // Standard wie beim DVR
)
args := os.Args[1:] args := os.Args[1:]
for i := 0; i < len(args); i++ { for i := 0; i < len(args); i++ {
a := args[i] a := args[i]
switch a { switch a {
case "--http-cookie": case "--http-cookie":
if i+1 >= len(args) { if i+1 >= len(args) {
fmt.Println("Fehlender Wert nach --http-cookie") fmt.Println("Fehlender Wert nach --http-cookie")
os.Exit(1) os.Exit(1)
} }
httpCookie = args[i+1] httpCookie = args[i+1]
i++ i++
case "-o": case "--user-agent":
if i+1 >= len(args) { if i+1 >= len(args) {
fmt.Println("Fehlender Wert nach -o") fmt.Println("Fehlender Wert nach --user-agent")
os.Exit(1) os.Exit(1)
} }
outputPath = args[i+1] userAgent = args[i+1]
i++ i++
case "-f": case "--domain":
// nur für Kompatibilität, wird ignoriert if i+1 >= len(args) {
case "best": fmt.Println("Fehlender Wert nach --domain")
// wird ignoriert, wir wählen sowieso beste Qualität os.Exit(1)
}
domain = args[i+1]
i++
default: case "-o":
// erste „normale“ Angabe ist die URL / der Benutzername if i+1 >= len(args) {
if urlArg == "" { fmt.Println("Fehlender Wert nach -o")
urlArg = a os.Exit(1)
} }
} outputPath = args[i+1]
} i++
if urlArg == "" { case "-f":
fmt.Println("Keine URL / kein Benutzername angegeben.") // nur für Kompatibilität, wird ignoriert
os.Exit(1)
}
username := extractUsername(urlArg) case "best":
// wird ignoriert, wir wählen sowieso beste Qualität
// Default-Ausgabedatei, falls kein -o default:
if outputPath == "" { // erste „normale“ Angabe ist die URL / der Benutzername
outputPath = fmt.Sprintf("%s_%s.ts", username, time.Now().Format("20060102_150405")) if urlArg == "" {
} urlArg = a
}
}
}
ctx := context.Background() if urlArg == "" {
fmt.Println("Keine URL / kein Benutzername angegeben.")
os.Exit(1)
}
// Seite laden (inkl. Cookie, falls gesetzt) username := extractUsername(urlArg)
body, err := fetchPage("https://chaturbate.com/"+username, httpCookie) username = strings.Trim(username, "/\\")
if err != nil {
fmt.Println("❌ Fehler beim Laden der Seite:", err)
os.Exit(1)
}
hlsURL, err := ParseStream(body) if outputPath == "" {
if err != nil { outputPath = fmt.Sprintf("%s_%s.ts", username, time.Now().Format("20060102_150405"))
fmt.Println("❌ Stream nicht gefunden oder offline:", err) }
os.Exit(1)
}
playlist, err := FetchPlaylist(ctx, hlsURL, httpCookie) ctx := context.Background()
if err != nil {
fmt.Println("❌ Fehler beim Abrufen der Playlist:", err)
os.Exit(1)
}
file, err := os.Create(outputPath) // HIER User-Agent an den Client durchreichen
if err != nil { hc := NewHTTPClient(userAgent)
fmt.Println("❌ Datei konnte nicht erstellt werden:", err)
os.Exit(1)
}
defer file.Close()
fmt.Println("📡 Aufnahme gestartet:", outputPath) if err := RecordStream(ctx, hc, domain, username, outputPath, httpCookie); err != nil {
fmt.Println("❌ Aufnahmefehler:", err)
err = playlist.WatchSegments(ctx, httpCookie, func(b []byte, _ float64) error { os.Exit(1)
_, err := file.Write(b) }
if err != nil {
fmt.Println("❌ Fehler beim Schreiben in Datei:", err)
}
return err
})
if err != nil {
fmt.Println("❌ Aufnahmefehler:", err)
}
// TS -> MP4 remuxen (wie gehabt) // TS -> MP4 remuxen (wie gehabt)
mp4Out := outputPath mp4Out := outputPath
@ -145,79 +210,118 @@ func main() {
} }
} }
// --- DVR-ähnlicher Recorder-Ablauf ---
// Entspricht grob dem RecordStream aus dem Channel-Snippet:
func RecordStream(
ctx context.Context,
hc *HTTPClient,
domain string,
username string,
outputPath string,
httpCookie string,
) error {
// 1) Seite laden
// Domain sauber zusammenbauen (mit/ohne Slash)
base := strings.TrimRight(domain, "/")
pageURL := base + "/" + username
body, err := hc.FetchPage(ctx, pageURL, httpCookie)
// 2) HLS-URL aus roomDossier extrahieren (wie DVR.ParseStream)
hlsURL, err := ParseStream(body)
if err != nil {
return fmt.Errorf("stream-parsing: %w", err)
}
// 3) Playlist holen (wie stream.GetPlaylist im DVR)
playlist, err := FetchPlaylist(ctx, hc, hlsURL, httpCookie)
if err != nil {
return fmt.Errorf("playlist abrufen: %w", err)
}
fmt.Printf("Stream-Qualität: %dp @ %dfps\n", playlist.Resolution, playlist.Framerate)
// 4) Datei öffnen
file, err := os.Create(outputPath)
if err != nil {
return fmt.Errorf("datei erstellen: %w", err)
}
defer func() {
_ = file.Close()
}()
fmt.Println("📡 Aufnahme gestartet:", outputPath)
// 5) Segmente „watchen“ analog zu WatchSegments + HandleSegment im DVR
err = playlist.WatchSegments(ctx, hc, httpCookie, func(b []byte, duration float64) error {
// Hier wäre im DVR ch.HandleSegment bei dir einfach in eine Datei schreiben
if _, err := file.Write(b); err != nil {
return fmt.Errorf("schreibe segment: %w", err)
}
// Könntest hier z.B. auch Dauer/Größe loggen, wenn du möchtest
_ = duration // aktuell unbenutzt
return nil
})
if err != nil {
return fmt.Errorf("watch segments: %w", err)
}
return nil
}
// --- helper --- // --- helper ---
func extractUsername(input string) string { func extractUsername(input string) string {
input = strings.TrimPrefix(input, "https://") input = strings.TrimSpace(input)
input = strings.TrimPrefix(input, "http://") input = strings.TrimPrefix(input, "https://")
input = strings.TrimPrefix(input, "www.") input = strings.TrimPrefix(input, "http://")
if strings.HasPrefix(input, "chaturbate.com/") { input = strings.TrimPrefix(input, "www.")
return strings.TrimPrefix(input, "chaturbate.com/") if strings.HasPrefix(input, "chaturbate.com/") {
} input = strings.TrimPrefix(input, "chaturbate.com/")
return strings.TrimSpace(input) }
// alles nach dem ersten Slash abschneiden (Pfadteile, /, etc.)
if idx := strings.IndexAny(input, "/?#"); idx != -1 {
input = input[:idx]
}
// zur Sicherheit evtl. übrig gebliebene Slash/Backslash trimmen
return strings.Trim(input, "/\\")
} }
// Cookie-Hilfsfunktion (wie ParseCookies + AddCookie im DVR)
func addCookiesFromString(req *http.Request, cookieStr string) { func addCookiesFromString(req *http.Request, cookieStr string) {
if cookieStr == "" { if cookieStr == "" {
return return
} }
pairs := strings.Split(cookieStr, ";") pairs := strings.Split(cookieStr, ";")
for _, pair := range pairs { for _, pair := range pairs {
parts := strings.SplitN(strings.TrimSpace(pair), "=", 2) parts := strings.SplitN(strings.TrimSpace(pair), "=", 2)
if len(parts) != 2 { if len(parts) != 2 {
continue continue
} }
name := strings.TrimSpace(parts[0]) name := strings.TrimSpace(parts[0])
value := strings.TrimSpace(parts[1]) value := strings.TrimSpace(parts[1])
if name == "" { if name == "" {
continue continue
} }
req.AddCookie(&http.Cookie{ req.AddCookie(&http.Cookie{
Name: name, Name: name,
Value: value, Value: value,
}) })
} }
} }
// ParseStream entspricht der DVR-Variante (roomDossier → hls_source)
func fetchPage(url, httpCookie string) (string, error) {
client := http.Client{Timeout: 10 * time.Second}
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return "", err
}
req.Header.Set("User-Agent", "Mozilla/5.0")
if httpCookie != "" {
// kompletter Inhalt von --http-cookie, z.B. "session=XYZ; foo=bar"
addCookiesFromString(req, httpCookie)
}
resp, err := client.Do(req)
if err != nil {
return "", err
}
defer resp.Body.Close()
if resp.StatusCode != 200 {
return "", fmt.Errorf("HTTP %d: %s", resp.StatusCode, url)
}
data, err := io.ReadAll(resp.Body)
if err != nil {
return "", err
}
return string(data), nil
}
func ParseStream(html string) (string, error) { func ParseStream(html string) (string, error) {
matches := roomDossierRegexp.FindStringSubmatch(html) matches := roomDossierRegexp.FindStringSubmatch(html)
if len(matches) < 2 { if len(matches) == 0 {
return "", errors.New("room dossier nicht gefunden") return "", errors.New("room dossier nicht gefunden")
} }
encoded := matches[1]
decoded, err := strconv.Unquote(`"` + strings.ReplaceAll(encoded, `\\u`, `\u`) + `"`) // DVR-Style Unicode-Decode
decoded, err := strconv.Unquote(
strings.Replace(strconv.Quote(matches[1]), `\\u`, `\u`, -1),
)
if err != nil { if err != nil {
return "", fmt.Errorf("Unicode-decode failed: %w", err) return "", fmt.Errorf("Unicode-decode failed: %w", err)
} }
@ -234,6 +338,7 @@ func ParseStream(html string) (string, error) {
return rd.HLSSource, nil return rd.HLSSource, nil
} }
// --- Playlist/WatchSegments wie gehabt ---
type Playlist struct { type Playlist struct {
PlaylistURL string PlaylistURL string
RootURL string RootURL string
@ -246,22 +351,18 @@ type Resolution struct {
Width int Width int
} }
func FetchPlaylist(ctx context.Context, hlsSource, httpCookie string) (*Playlist, error) { // nimmt jetzt *HTTPClient entgegen
func FetchPlaylist(ctx context.Context, hc *HTTPClient, hlsSource, httpCookie string) (*Playlist, error) {
if hlsSource == "" { if hlsSource == "" {
return nil, errors.New("HLS-URL leer") return nil, errors.New("HLS-URL leer")
} }
client := http.Client{Timeout: 10 * time.Second} req, err := hc.NewRequest(ctx, http.MethodGet, hlsSource, httpCookie)
req, err := http.NewRequestWithContext(ctx, "GET", hlsSource, nil)
if err != nil { if err != nil {
return nil, fmt.Errorf("Fehler beim Erstellen der Playlist-Request: %w", err) return nil, fmt.Errorf("Fehler beim Erstellen der Playlist-Request: %w", err)
} }
req.Header.Set("User-Agent", "Mozilla/5.0")
if httpCookie != "" {
req.Header.Set("Cookie", httpCookie)
}
resp, err := client.Do(req) resp, err := hc.client.Do(req)
if err != nil { if err != nil {
return nil, fmt.Errorf("Fehler beim Laden der Playlist: %w", err) return nil, fmt.Errorf("Fehler beim Laden der Playlist: %w", err)
} }
@ -317,14 +418,14 @@ func FetchPlaylist(ctx context.Context, hlsSource, httpCookie string) (*Playlist
}, nil }, nil
} }
// nutzt ebenfalls *HTTPClient
func (p *Playlist) WatchSegments( func (p *Playlist) WatchSegments(
ctx context.Context, ctx context.Context,
hc *HTTPClient,
httpCookie string, httpCookie string,
handler func([]byte, float64) error, handler func([]byte, float64) error,
) error { ) error {
var lastSeq int64 = -1 var lastSeq int64 = -1
client := http.Client{Timeout: 10 * time.Second}
emptyRounds := 0 emptyRounds := 0
const maxEmptyRounds = 5 const maxEmptyRounds = 5
@ -336,16 +437,12 @@ func (p *Playlist) WatchSegments(
} }
// Playlist holen // Playlist holen
req, err := http.NewRequestWithContext(ctx, "GET", p.PlaylistURL, nil) req, err := hc.NewRequest(ctx, http.MethodGet, p.PlaylistURL, httpCookie)
if err != nil { if err != nil {
return fmt.Errorf("Fehler beim Erstellen der Playlist-Request: %w", err) return fmt.Errorf("Fehler beim Erstellen der Playlist-Request: %w", err)
} }
req.Header.Set("User-Agent", "Mozilla/5.0")
if httpCookie != "" {
req.Header.Set("Cookie", httpCookie)
}
resp, err := client.Do(req) resp, err := hc.client.Do(req)
if err != nil { if err != nil {
emptyRounds++ emptyRounds++
if emptyRounds >= maxEmptyRounds { if emptyRounds >= maxEmptyRounds {
@ -383,16 +480,12 @@ func (p *Playlist) WatchSegments(
segmentURL := p.RootURL + segment.URI segmentURL := p.RootURL + segment.URI
segReq, err := http.NewRequestWithContext(ctx, "GET", segmentURL, nil) segReq, err := hc.NewRequest(ctx, http.MethodGet, segmentURL, httpCookie)
if err != nil { if err != nil {
continue continue
} }
segReq.Header.Set("User-Agent", "Mozilla/5.0")
if httpCookie != "" {
segReq.Header.Set("Cookie", httpCookie)
}
segResp, err := client.Do(segReq) segResp, err := hc.client.Do(segReq)
if err != nil { if err != nil {
continue continue
} }
@ -420,4 +513,3 @@ func (p *Playlist) WatchSegments(
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
} }
} }

Binary file not shown.