Commit Graph
1 Commits
Author SHA1 Message Date
Divarion_D 5b35907388 refactor(admin): readable, testable stream entry points (+2 bug fixes)
Clean up the admin stream loopback scripts (api/live/proxy_api/thumb/
timeshift/vod) for readability and to give their core logic unit-test
coverage, without changing behavior — except the two bugs called out below.

Readability:
- Invert the pervasive empty `if (c) {} else { body }` into `if (!c) { body }`.
- Flatten deep if/else nests into guard-clause / elseif chains (live, vod).
- Drop dead blank lines.

Testability (pure logic extracted, then covered):
- New value object XcVm\Domain\Stream\AdminStreamToken (decode + isValid)
  replaces the uitoken decrypt+expiry+IP block duplicated across live/thumb/
  timeshift/vod; it reuses the existing-but-unadopted NetworkUtils::ipMatches().
  Token start/duration are kept raw (a timeshift date string must not be cast).
- Four pure helpers folded into the existing StreamUtils (not new one-method
  classes): sanitizeSegmentName, containerMimeType, timeshiftStartTimestamp,
  segmentRetryBudget — replacing inline path sanitization, a 44-line MIME
  switch, the timeshift date parser, and the retry-budget math.
- Tests: AdminStreamTokenTest, NetworkUtilsTest (ipMatches had no coverage),
  and StreamUtilsTest extended for the four helpers. OPENSSL_EXTRA is defined
  in tests/bootstrap.php so token round-trips work.

Bug fixes (behavior changes):
- live: the retry budget used `$rTotalFails < intval(...) ?: 20`, which by
  operator precedence parsed as `(... < ...) ?: 20` — always truthy — so the
  `seg_time * 2` floor was ignored and the budget was always the configured
  wait. Now max(seg_time*2, wait ?: 20) via StreamUtils::segmentRetryBudget().
- proxy_api: the per-second byte-rate divided by `time() - last`, which is 0
  for two samples in the same second (division by zero). Clamp to >= 1s.
2026-09-09 22:32:37 +03:00