fix(player): preserve private cancellation causes on shutdown

Co-authored-by: GPT-6 <gpt-6@openai.com>
This commit is contained in:
ZeusinaandGPT-6 Bot committed 2026-10-11 09:16:08 +03:00
1 parent 3f9fd2f36f
commit d7397ed6cf
3 files changed
+207 -13

No files matched your search

+11 -1
View File
@@ -26,6 +26,12 @@ var discoveryDNSLabel = regexp.MustCompile(`^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])
type playerRunner func(context.Context, []string, io.Writer, io.Writer) error
// Keep request diagnostics private while retaining typed causes for supervision.
type playerRequestError struct{ cause error }
func (e *playerRequestError) Error() string { return "player request failed or exceeded output limit" }
func (e *playerRequestError) Unwrap() error { return e.cause }
func runPlayerCurl(ctx context.Context, args []string, stdout, stderr io.Writer) error {
cmd := exec.CommandContext(ctx, "curl", args...)
cmd.Stdout, cmd.Stderr = stdout, stderr
@@ -158,7 +164,11 @@ func requestPlayer(videoID, proxy string, runner playerRunner) ([]byte, error) {
err := runner(ctx, []string{"--disable", "--silent", "--show-error", "--fail", "--max-time", "30",
"--noproxy", "", "--proxy", proxy, "--user-agent", playerUserAgent, "--json", string(payload), playerURL}, output, diagnostics)
if err != nil || output.exceeded || diagnostics.exceeded {
return nil, errors.New("player request failed or exceeded output limit")
if output.exceeded || diagnostics.exceeded {
// An output failure remains unsafe even if the child was also canceled.
err = errors.Join(err, errors.New("player output limit exceeded"))
}
return nil, &playerRequestError{cause: err}
}
return body.Bytes(), nil
}