Fix stream keep-alive handling and bump to v1.0.0
- Force-close each /stream/{channel_id} response instead of allowing
keep-alive reuse. Jellyfin's SharedHttpStream tuner client was reusing
a pooled keep-alive connection mid-stream from an earlier request and
reading raw MPEG-TS bytes as an HTTP status line, failing with
'Received an invalid status line'.
- Broaden the disconnect exception handling to ConnectionAbortedError
alongside ConnectionResetError.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WDDfSVPh5pgNe7TRpZUgJA
This commit is contained in:
@@ -14,3 +14,13 @@ All notable changes to this project are documented in this file.
|
|||||||
(`channels.example.yaml`, `.env.example`).
|
(`channels.example.yaml`, `.env.example`).
|
||||||
- Unit test suite covering config parsing, URL expiry parsing, ffmpeg argument building, playlist generation, and
|
- Unit test suite covering config parsing, URL expiry parsing, ffmpeg argument building, playlist generation, and
|
||||||
broadcast fan-out.
|
broadcast fan-out.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- `/stream/{channel_id}` now forces the connection closed after each response (`Connection: close`) instead of
|
||||||
|
allowing keep-alive. Jellyfin's M3U tuner client (`SharedHttpStream`) was reusing a pooled keep-alive connection
|
||||||
|
still mid-stream from an earlier request and reading raw MPEG-TS bytes as if they were a fresh HTTP response,
|
||||||
|
failing with "Received an invalid status line".
|
||||||
|
- The yt-dlp resolver now correctly classifies which of the two `requested_formats` entries is audio when a live
|
||||||
|
stream is split into separate video-only and audio-only renditions; it previously relied on `acodec` being set,
|
||||||
|
which yt-dlp does not consistently do for audio-only formats, causing every resolve to fail.
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "restreamer"
|
name = "restreamer"
|
||||||
version = "0.1.0"
|
version = "1.0.0"
|
||||||
description = "Restreams YouTube livestreams as continuous local streams consumable by Jellyfin Live TV"
|
description = "Restreams YouTube livestreams as continuous local streams consumable by Jellyfin Live TV"
|
||||||
authors = [
|
authors = [
|
||||||
{name = "Jan Doubravsky",email = "jan.doubravsky@gmail.com"}
|
{name = "Jan Doubravsky",email = "jan.doubravsky@gmail.com"}
|
||||||
|
|||||||
@@ -42,6 +42,10 @@ async def _handle_stream(request: web.Request) -> web.StreamResponse:
|
|||||||
raise web.HTTPNotFound(text=f"Unknown channel '{channel_id}'")
|
raise web.HTTPNotFound(text=f"Unknown channel '{channel_id}'")
|
||||||
|
|
||||||
response = web.StreamResponse(status=200, headers={"Content-Type": MPEGTS_CONTENT_TYPE})
|
response = web.StreamResponse(status=200, headers={"Content-Type": MPEGTS_CONTENT_TYPE})
|
||||||
|
# A live stream is never meant to be pooled and reused for a later request; some HTTP
|
||||||
|
# clients (e.g. Jellyfin's SharedHttpStream) get fed stale bytes from a dangling
|
||||||
|
# keep-alive connection if we let one linger here. Force a fresh connection every time.
|
||||||
|
response.force_close()
|
||||||
await response.prepare(request)
|
await response.prepare(request)
|
||||||
|
|
||||||
queue = broadcaster.subscribe()
|
queue = broadcaster.subscribe()
|
||||||
@@ -51,7 +55,7 @@ async def _handle_stream(request: web.Request) -> web.StreamResponse:
|
|||||||
if chunk is None:
|
if chunk is None:
|
||||||
break
|
break
|
||||||
await response.write(chunk)
|
await response.write(chunk)
|
||||||
except ConnectionResetError:
|
except (ConnectionResetError, ConnectionAbortedError):
|
||||||
logger.debug("Client disconnected from channel '{}'", channel_id)
|
logger.debug("Client disconnected from channel '{}'", channel_id)
|
||||||
finally:
|
finally:
|
||||||
broadcaster.unsubscribe(queue)
|
broadcaster.unsubscribe(queue)
|
||||||
|
|||||||
Reference in New Issue
Block a user