Compare commits

..
2 Commits
Author SHA1 Message Date
HonzaandClaude Sonnet 5 daa951c172 Add Gitea Actions CI: test + build/push to registry
CI / build-and-push (push) Failing after 4s
CI / test (push) Successful in 1m43s
Matches the pattern used by Dashboard and Zbrane-Reiner-Web -- release
branch pushes :latest, devel pushes :devel. Requires a REGISTRY_TOKEN
secret on this repo (Settings -> Actions -> Secrets), same as those two.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WDDfSVPh5pgNe7TRpZUgJA
2026-09-27 18:07:19 +02:00
HonzaandClaude Sonnet 5 9663734435 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
2026-09-27 18:06:51 +02:00
4 changed files with 82 additions and 2 deletions
+66
View File
@@ -0,0 +1,66 @@
name: CI
# Spustí se při pushi do devel/release a jde i ručně spustit z GUI.
on:
push:
branches: [devel, release]
workflow_dispatch:
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.12"
- name: Instalace Poetry
run: pip install poetry==2.4.1
- name: Instalace závislostí (vč. dev skupiny)
run: poetry install --no-interaction
- name: Ruff
run: poetry run ruff check .
- name: Mypy
run: poetry run mypy src
- name: Testy
run: poetry run pytest -q
build-and-push:
needs: test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
# Docker jméno musí být malými písmeny (Honza/Restreamer -> honza/restreamer)
- name: Název image
run: |
echo "IMAGE=gitea.doubynet.eu/$(echo '${{ github.repository }}' \
| tr '[:upper:]' '[:lower:]')" >> "$GITHUB_ENV"
# release -> latest (produkce), devel -> devel (staging)
- name: Značka podle větve
run: |
if [ "${{ github.ref_name }}" = "release" ]; then
echo "MOVING_TAG=latest" >> "$GITHUB_ENV"
else
echo "MOVING_TAG=devel" >> "$GITHUB_ENV"
fi
- name: Přihlášení do Gitea registry
run: |
echo '${{ secrets.REGISTRY_TOKEN }}' \
| docker login gitea.doubynet.eu -u '${{ github.actor }}' --password-stdin
- name: Build image
run: docker build -t "$IMAGE:$MOVING_TAG" -t "$IMAGE:${{ github.sha }}" .
- name: Push image
run: |
docker push "$IMAGE:$MOVING_TAG"
docker push "$IMAGE:${{ github.sha }}"
+10
View File
@@ -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
View File
@@ -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"}
+5 -1
View File
@@ -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)