toposync-ext-streaming 0.4.0__tar.gz → 0.4.2__tar.gz

{toposync_ext_streaming-0.4.0 → toposync_ext_streaming-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toposync-ext-streaming
-Version: 0.4.0
+Version: 0.4.2
 Summary: Toposync first-party extension: streaming settings, API surface, and pipeline sink bootstrap.
 License-Expression: MIT
 License-File: LICENSE
@@ -1106,7 +1106,7 @@ Then run Toposync as usual (see repo `docs/DEVELOPMENT.md`).
 
 - Public wheels do not ship MediaMTX binaries. The extension downloads the correct release asset on demand and caches it under `runtime/streaming/mediamtx/<version>/<platform>/`.
   - License notice: [LICENSE.mediamtx](LICENSE.mediamtx)
-- Public wheels do not ship go2rtc binaries. The MSE sidecar downloads go2rtc `v1.9.14` on demand and caches it under `~/.toposync/runtime/streaming/go2rtc/<version>/<platform>/`, unless `TOPOSYNC_STREAMING_GO2RTC_PATH` points to an explicit binary.
+- Public wheels do not ship go2rtc binaries. The MSE sidecar downloads go2rtc `v1.9.14` automatically on first start and caches it under `~/.toposync/runtime/streaming/go2rtc/<version>/<platform>/`, unless `TOPOSYNC_STREAMING_GO2RTC_PATH` points to an explicit binary. The official Docker/Home Assistant images can pre-bundle `/usr/local/bin/go2rtc` and set that environment variable so MSE does not depend on a runtime download.
 - FFmpeg integration expects an external binary by default (`PATH` or `TOPOSYNC_STREAMING_FFMPEG_PATH`). Bundling FFmpeg binaries is optional and must be handled carefully for redistribution.
   - License placeholder: [LICENSE.ffmpeg](LICENSE.ffmpeg)
 

{toposync_ext_streaming-0.4.0 → toposync_ext_streaming-0.4.2}/README.md

@@ -1093,7 +1093,7 @@ Then run Toposync as usual (see repo `docs/DEVELOPMENT.md`).
 
 - Public wheels do not ship MediaMTX binaries. The extension downloads the correct release asset on demand and caches it under `runtime/streaming/mediamtx/<version>/<platform>/`.
   - License notice: [LICENSE.mediamtx](LICENSE.mediamtx)
-- Public wheels do not ship go2rtc binaries. The MSE sidecar downloads go2rtc `v1.9.14` on demand and caches it under `~/.toposync/runtime/streaming/go2rtc/<version>/<platform>/`, unless `TOPOSYNC_STREAMING_GO2RTC_PATH` points to an explicit binary.
+- Public wheels do not ship go2rtc binaries. The MSE sidecar downloads go2rtc `v1.9.14` automatically on first start and caches it under `~/.toposync/runtime/streaming/go2rtc/<version>/<platform>/`, unless `TOPOSYNC_STREAMING_GO2RTC_PATH` points to an explicit binary. The official Docker/Home Assistant images can pre-bundle `/usr/local/bin/go2rtc` and set that environment variable so MSE does not depend on a runtime download.
 - FFmpeg integration expects an external binary by default (`PATH` or `TOPOSYNC_STREAMING_FFMPEG_PATH`). Bundling FFmpeg binaries is optional and must be handled carefully for redistribution.
   - License placeholder: [LICENSE.ffmpeg](LICENSE.ffmpeg)
 

{toposync_ext_streaming-0.4.0 → toposync_ext_streaming-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "toposync-ext-streaming"
-version = "0.4.0"
+version = "0.4.2"
 description = "Toposync first-party extension: streaming settings, API surface, and pipeline sink bootstrap."
 readme = "README.md"
 license = "MIT"

{toposync_ext_streaming-0.4.0 → toposync_ext_streaming-0.4.2}/src/toposync_ext_streaming/api/models.py

@@ -1377,7 +1377,7 @@ class TransmissionDemandHeartbeatRequest(BaseModel):
     quality_profile_id: StreamingQualityProfileId | None = None
     transport: Literal["hls", "webrtc", "rtsp", "mse", "jsmpeg"] = "hls"
     source: Literal["player", "home_assistant_entity"] = "player"
-    ttl_seconds: float | None = Field(default=None, ge=5.0, le=300.0)
+    ttl_seconds: float | None = Field(default=None, ge=5.0, le=1800.0)
 
 
 class TransmissionDemandHeartbeatResponse(BaseModel):

{toposync_ext_streaming-0.4.0 → toposync_ext_streaming-0.4.2}/src/toposync_ext_streaming/api/routes.py

@@ -518,6 +518,7 @@ def _hls_proxy_public_base_path(request: Request) -> str:
 
 MEDIA_TOKEN_SCOPE = "stream:media:read"
 LEGACY_HLS_MEDIA_TOKEN_SCOPE = "stream:hls:read"
+MAX_MEDIA_TOKEN_TTL_OVERRIDE_SECONDS = 1800.0
 
 
 def _hls_proxy_url(
@@ -571,15 +572,10 @@ def _mse_sidecar_start_blocking_errors(
     if settings.engine.enabled and settings.engine.mse_sidecar.enabled:
         try:
             platform = detect_go2rtc_platform()
-            installed = find_installed_go2rtc_binary(
+            find_installed_go2rtc_binary(
                 platform=platform,
                 version=settings.engine.mse_sidecar.go2rtc_version,
             )
-            if installed is None:
-                errors.append(
-                    "go2rtc binary is not installed. Use /api/streams/mse/download or set "
-                    "TOPOSYNC_STREAMING_GO2RTC_PATH before using MSE."
-                )
         except Exception as exc:
             errors.append(f"go2rtc binary is unavailable: {exc}")
     return _dedupe_messages(errors)
@@ -656,9 +652,18 @@ def _issue_media_token(
     output: TransmissionOutput,
     engine_path: str,
     transport: Literal["hls", "mse", "jsmpeg"],
+    ttl_seconds: float | None = None,
 ) -> tuple[str, float, float]:
     now = time.time()
-    ttl_s = max(30.0, float(settings.engine.media_auth.token_ttl_seconds))
+    configured_ttl_s = max(30.0, float(settings.engine.media_auth.token_ttl_seconds))
+    if ttl_seconds is not None:
+        requested_ttl_s = max(
+            30.0,
+            min(float(ttl_seconds), MAX_MEDIA_TOKEN_TTL_OVERRIDE_SECONDS),
+        )
+        ttl_s = max(configured_ttl_s, requested_ttl_s)
+    else:
+        ttl_s = configured_ttl_s
     renew_margin_s = max(1.0, float(settings.engine.media_auth.renew_margin_seconds))
     expires_at = now + ttl_s
     renew_after = max(now, expires_at - min(renew_margin_s, ttl_s - 1.0))
@@ -685,6 +690,7 @@ def _issue_hls_media_token(
     transmission: Transmission,
     output: TransmissionOutput,
     engine_path: str,
+    ttl_seconds: float | None = None,
 ) -> tuple[str, float, float]:
     return _issue_media_token(
         config_store=config_store,
@@ -693,6 +699,7 @@ def _issue_hls_media_token(
         output=output,
         engine_path=engine_path,
         transport="hls",
+        ttl_seconds=ttl_seconds,
     )
 
 
@@ -1540,6 +1547,7 @@ async def _resolve_local_transmission_urls(
     transmission: Transmission,
     output_id: str | None = None,
     quality_profile_id: str | None = None,
+    media_token_ttl_seconds: float | None = None,
 ) -> TransmissionUrlsResponse:
     bridge = _writer_bridge(request)
     prime_demand = getattr(bridge, "prime_transmission_demand", None)
@@ -1677,6 +1685,7 @@ async def _resolve_local_transmission_urls(
                     transmission=transmission,
                     output=output,
                     engine_path=engine_path,
+                    ttl_seconds=media_token_ttl_seconds,
                 )
                 url = _hls_proxy_url(request, engine_path, media_token=media_token) or ""
                 media_auth_type = "signed_url"
@@ -1706,6 +1715,7 @@ async def _resolve_local_transmission_urls(
                         output=output,
                         engine_path=engine_path,
                         transport="mse",
+                        ttl_seconds=media_token_ttl_seconds,
                     )
                     outputs.append(
                         TransmissionOutputUrl(
@@ -1729,6 +1739,7 @@ async def _resolve_local_transmission_urls(
                         output=output,
                         engine_path=engine_path,
                         transport="jsmpeg",
+                        ttl_seconds=media_token_ttl_seconds,
                     )
                     outputs.append(
                         TransmissionOutputUrl(
@@ -1781,6 +1792,7 @@ async def _resolve_local_transmission_urls(
                 output=output,
                 engine_path=engine_path,
                 transport="mse",
+                ttl_seconds=media_token_ttl_seconds,
             )
             outputs.append(
                 TransmissionOutputUrl(
@@ -1804,6 +1816,7 @@ async def _resolve_local_transmission_urls(
                 output=output,
                 engine_path=engine_path,
                 transport="jsmpeg",
+                ttl_seconds=media_token_ttl_seconds,
             )
             outputs.append(
                 TransmissionOutputUrl(
@@ -1851,6 +1864,7 @@ async def _resolve_remote_transmission_urls(
     transmission: Transmission,
     output_id: str | None = None,
     quality_profile_id: str | None = None,
+    media_token_ttl_seconds: float | None = None,
 ) -> TransmissionUrlsResponse:
     servers_by_id = await _processing_servers_by_id(config_store)
     host_server_id = normalize_server_id(transmission.host_server_id, fallback="local")
@@ -1877,6 +1891,7 @@ async def _resolve_remote_transmission_urls(
         for key, value in {
             "output_id": str(output_id or "").strip(),
             "quality_profile_id": str(quality_profile_id or "").strip(),
+            "media_token_ttl_seconds": str(media_token_ttl_seconds or "").strip(),
         }.items()
         if value
     }
@@ -5951,7 +5966,7 @@ def create_streaming_router() -> APIRouter:
             warnings.append("MSE sidecar needs the MediaMTX streaming engine to be enabled.")
         if settings.engine.mse_sidecar.enabled and not status.running and not binary_path:
             warnings.append(
-                "go2rtc binary is not installed yet. Starting MSE will download it (internet required), "
+                "go2rtc binary is not installed yet. The next MSE start will download it automatically (internet required), "
                 "or set TOPOSYNC_STREAMING_GO2RTC_PATH to a local path."
             )
         return StreamingMseSidecarStatusResponse(
@@ -6290,6 +6305,7 @@ def create_streaming_router() -> APIRouter:
         live_view_id: str,
         context: StreamingCameraLiveContext = "thumbnail",
         variant_id: str | None = None,
+        media_token_ttl_seconds: float | None = None,
     ) -> CameraLiveViewPlaybackResponse:
         _require_auth(request, action="core:settings:read")
         config_store = _config_store(request)
@@ -6343,12 +6359,14 @@ def create_streaming_router() -> APIRouter:
                 settings=settings,
                 transmission=transmission,
                 quality_profile_id=variant.quality_profile_id,
+                media_token_ttl_seconds=media_token_ttl_seconds,
             )
         else:
             urls = await _resolve_remote_transmission_urls(
                 config_store=config_store,
                 transmission=transmission,
                 quality_profile_id=variant.quality_profile_id,
+                media_token_ttl_seconds=media_token_ttl_seconds,
             )
 
         selected_output = _select_live_playback_output(urls=urls, variant=variant)
@@ -7440,6 +7458,7 @@ def create_streaming_router() -> APIRouter:
         transmission_id: str,
         output_id: str | None = None,
         quality_profile_id: str | None = None,
+        media_token_ttl_seconds: float | None = None,
     ) -> TransmissionUrlsResponse:
         _require_auth(request, action="core:settings:read")
         config_store = _config_store(request)
@@ -7461,12 +7480,14 @@ def create_streaming_router() -> APIRouter:
                 transmission=transmission,
                 output_id=output_id,
                 quality_profile_id=quality_profile_id,
+                media_token_ttl_seconds=media_token_ttl_seconds,
             )
         return await _resolve_remote_transmission_urls(
             config_store=config_store,
             transmission=transmission,
             output_id=output_id,
             quality_profile_id=quality_profile_id,
+            media_token_ttl_seconds=media_token_ttl_seconds,
         )
 
     @router.get(
@@ -7481,6 +7502,7 @@ def create_streaming_router() -> APIRouter:
         quality_profile_id: str | None = None,
         context: StreamingCameraLiveContext | None = None,
         low_latency: bool = False,
+        media_token_ttl_seconds: float | None = None,
     ) -> StreamingPlaybackPlanResponse:
         _require_auth(request, action="core:settings:read")
         config_store = _config_store(request)
@@ -7498,6 +7520,7 @@ def create_streaming_router() -> APIRouter:
                 transmission=transmission,
                 output_id=output_id,
                 quality_profile_id=quality_profile_id,
+                media_token_ttl_seconds=media_token_ttl_seconds,
             )
             runtime_health: StreamingRuntimeTransmissionHealth | None = None
             try:
@@ -7514,6 +7537,7 @@ def create_streaming_router() -> APIRouter:
                 transmission=transmission,
                 output_id=output_id,
                 quality_profile_id=quality_profile_id,
+                media_token_ttl_seconds=media_token_ttl_seconds,
             )
             runtime_health = None
 
@@ -7693,6 +7717,7 @@ def create_streaming_router() -> APIRouter:
         transmission_id: str,
         output_id: str | None = None,
         quality_profile_id: str | None = None,
+        media_token_ttl_seconds: float | None = None,
     ) -> TransmissionUrlsResponse:
         _require_auth(request, action="core:settings:read")
         config_store = _config_store(request)
@@ -7721,6 +7746,7 @@ def create_streaming_router() -> APIRouter:
             transmission=transmission,
             output_id=output_id,
             quality_profile_id=quality_profile_id,
+            media_token_ttl_seconds=media_token_ttl_seconds,
         )
 
     @router.get("/distributed/settings/{server_id}", response_model=StreamingExtensionSettings)

{toposync_ext_streaming-0.4.0 → toposync_ext_streaming-0.4.2}/src/toposync_ext_streaming/streaming/writer_bridge.py

@@ -238,7 +238,7 @@ class StreamWriterBridge:
         selected_profile_id = _as_str(quality_profile_id)
 
         now_monotonic = self._monotonic()
-        ttl = self._on_demand_prime_ttl_s if ttl_s is None else min(300.0, max(1.0, float(ttl_s)))
+        ttl = self._on_demand_prime_ttl_s if ttl_s is None else min(1800.0, max(1.0, float(ttl_s)))
         _engine_settings, targets, _path_auth, _bypass, _ingest, _ingest_configs = await self._load_settings(now_monotonic)
 
         primed_publishers: set[str] = set()