melosh/mal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle proxy stream errors

Browse Source
This commit is contained in:
mkelvers
2026-06-20 18:29:35 +02:00
committed by Milas Holsting
parent fed837f868
commit 2f035ebdd9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/playback/handler/proxy_stream.go
View File

@@ -5,6 +5,7 @@ import (
"errors" "errors"
"io" "io"
"mal/internal/observability" "mal/internal/observability"
"mal/pkg/errlog"
netutil "mal/pkg/net" netutil "mal/pkg/net"
"net/http" "net/http"
@@ -33,12 +34,14 @@ func (h *PlaybackHandler) HandleProxyStream(c *gin.Context) {
if err != nil { if err != nil {
if !errors.Is(err, context.Canceled) { if !errors.Is(err, context.Canceled) {
observability.ErrorContext(c.Request.Context(), "proxy_stream_upstream_failed", "playback", "", map[string]any{"target_url": targetURL}, err) observability.ErrorContext(c.Request.Context(), "proxy_stream_upstream_failed", "playback", "", map[string]any{"target_url": targetURL}, err)
_ = c.Error(err).SetType(gin.ErrorTypePrivate) recordPrivateGinError(c, err)
} }
c.Status(http.StatusBadGateway) c.Status(http.StatusBadGateway)
return return
} }
defer func() { _ = resp.Body.Close() }() defer func() {
errlog.Log("failed to close proxy stream response body", resp.Body.Close())
}()
if isHLSPlaylistResponse(targetURL, resp.Header) { if isHLSPlaylistResponse(targetURL, resp.Header) {
h.writeProxyPlaylist(c, resp, targetURL, referer) h.writeProxyPlaylist(c, resp, targetURL, referer)
@@ -62,7 +65,7 @@ func (h *PlaybackHandler) writeProxyPlaylist(c *gin.Context, resp *http.Response
body, err := io.ReadAll(io.LimitReader(resp.Body, netutil.MiB2)) body, err := io.ReadAll(io.LimitReader(resp.Body, netutil.MiB2))
if err != nil { if err != nil {
observability.ErrorContext(c.Request.Context(), "proxy_stream_playlist_read_failed", "playback", "", map[string]any{"target_url": targetURL}, err) observability.ErrorContext(c.Request.Context(), "proxy_stream_playlist_read_failed", "playback", "", map[string]any{"target_url": targetURL}, err)
_ = c.Error(err).SetType(gin.ErrorTypePrivate) recordPrivateGinError(c, err)
c.Status(http.StatusBadGateway) c.Status(http.StatusBadGateway)
return return
} }
@@ -70,7 +73,7 @@ func (h *PlaybackHandler) writeProxyPlaylist(c *gin.Context, resp *http.Response
rewritten, err := h.rewriteHLSPlaylist(string(body), targetURL, referer) rewritten, err := h.rewriteHLSPlaylist(string(body), targetURL, referer)
if err != nil { if err != nil {
observability.ErrorContext(c.Request.Context(), "proxy_stream_playlist_rewrite_failed", "playback", "", map[string]any{"target_url": targetURL}, err) observability.ErrorContext(c.Request.Context(), "proxy_stream_playlist_rewrite_failed", "playback", "", map[string]any{"target_url": targetURL}, err)
_ = c.Error(err).SetType(gin.ErrorTypePrivate) recordPrivateGinError(c, err)
c.Status(http.StatusBadGateway) c.Status(http.StatusBadGateway)
return return
} }