@torrent-tv/proxy 2.86.0 → 2.87.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +2142 -1915
- package/CLAUDE.md +322 -197
- package/assets/calibration/NOTICE.md +2 -2
- package/bin/cli.js +684 -616
- package/biome.json +409 -233
- package/docs/browser-proxy-contract.md +94 -0
- package/docs/container-architecture.md +218 -213
- package/docs/download-architecture.md +7 -7
- package/docs/encode-architecture.md +287 -11
- package/docs/encode-run-state.md +2 -2
- package/docs/logs.md +97 -97
- package/docs/{disk-architecture.md → storage-architecture.md} +107 -1
- package/openspec/changes/adaptive-bitrate/design.md +2 -2
- package/openspec/changes/adaptive-bitrate/proposal.md +1 -1
- package/openspec/changes/adaptive-bitrate/tasks.md +1 -1
- package/openspec/changes/chunked-request-bodies/design.md +1 -1
- package/openspec/changes/chunked-request-bodies/proposal.md +1 -1
- package/openspec/changes/chunked-request-bodies/tasks.md +1 -1
- package/openspec/changes/cold-start/design.md +1 -1
- package/openspec/changes/disk-cap/proposal.md +1 -1
- package/openspec/changes/proxy-observability/proposal.md +2 -2
- package/openspec/changes/track-selection/proposal.md +1 -1
- package/openspec/changes/transcode-quality/proposal.md +1 -1
- package/package.json +2 -2
- package/research/delivery-wedge-stand-ladder-2026-09-13.md +329 -329
- package/research/double-spawn-2026-09-10.md +171 -171
- package/routes/api/playback-plan/post.js +2 -2
- package/routes/api/sources/files/get.js +1 -1
- package/routes/api/sources/stats/get.js +1 -1
- package/routes/api/sources/warm/post.js +10 -3
- package/routes/api/subtitles/get.js +230 -230
- package/routes/api/transcode-sessions/fragment-far/post.js +3 -3
- package/routes/api/transcode-sessions/net-report/post.js +129 -94
- package/routes/api/transcode-sessions/post.js +160 -139
- package/routes/api/transcode-sessions/progress/get.js +3 -3
- package/routes/api/transcode-sessions/release/post.js +3 -3
- package/routes/api/transcode-sessions/seek/post.js +12 -3
- package/routes/stream/get.js +2 -2
- package/routes/transcode/audio-file/get.js +15 -6
- package/routes/transcode/audio-warm/get.js +9 -6
- package/routes/transcode/session-file/get.js +52 -268
- package/routes/transcode/variant-file/get.js +46 -7
- package/routes/transcode/variant-warm/get.js +19 -6
- package/scripts/render-run-graph.js +1 -1
- package/server.js +720 -465
- package/services/encode/CoverageMap.js +428 -428
- package/services/encode/CushionReport.js +345 -0
- package/services/encode/EncodeAdmission.js +332 -0
- package/services/{orchestrators → encode}/EncodeOrchestrator.js +307 -29
- package/services/encode/EncodeRun.js +16 -9
- package/services/encode/EncodeRuns.js +1229 -0
- package/services/encode/Encoder.js +18 -2
- package/services/encode/EncoderSelection.js +38 -0
- package/services/encode/LocalObservations.js +359 -0
- package/services/encode/NvencEncoder.js +5 -0
- package/services/encode/OutputOpening.js +755 -0
- package/services/encode/OutputTimes.js +579 -0
- package/services/encode/Renditions.js +2162 -0
- package/services/encode/RunProgress.js +84 -0
- package/services/encode/SoftwareEncoder.js +12 -7
- package/services/encode/args.js +402 -186
- package/services/encode/calibration.js +361 -0
- package/services/encode/contention.js +128 -128
- package/services/encode/encode-run-state.js +16 -20
- package/services/encode/fingerprint.js +322 -0
- package/services/{hwaccel.js → encode/hwaccel.js} +82 -42
- package/services/{learned-median.js → encode/learned-median.js} +11 -0
- package/services/encode/output/EncodedOutput.js +57 -0
- package/services/encode/output/Output.js +131 -0
- package/services/{output/LiveOutputs.js → encode/output/OutputCatalog.js} +141 -40
- package/services/encode/output/OutputSpec.js +390 -0
- package/services/{output → encode/output}/Timeline.js +12 -37
- package/services/encode/output/index.js +20 -0
- package/services/encode/output/ladder.js +32 -0
- package/services/{output → encode/output}/playlists.js +3 -0
- package/services/encode/output-key-format.js +21 -0
- package/services/encode/quality/EncodeCost.js +1083 -0
- package/services/encode/quality/HostLoad.js +525 -0
- package/services/encode/quality/HostTimings.js +249 -0
- package/services/encode/quality/OutputQualityState.js +28 -0
- package/services/encode/quality/QualityController.js +935 -0
- package/services/encode/quality/QualityOffer.js +416 -0
- package/services/encode/quality/drain-threat.js +47 -0
- package/services/encode/quality/link-budget.js +254 -0
- package/services/encode/quality/output-format.js +266 -0
- package/services/encode/quality/serving-output.js +216 -0
- package/services/encode/quality/visible-rung.js +57 -0
- package/services/encode/run-command.js +23 -20
- package/services/encode/run-inputs.js +42 -0
- package/services/{segment-formats → encode/segment-formats}/fmp4.js +63 -0
- package/services/{segment-formats → encode/segment-formats}/index.js +3 -3
- package/services/encode/segment-formats/init-compat.js +324 -0
- package/services/{segment-formats → encode/segment-formats}/mp4-boxes.js +8 -3
- package/services/encode/throughput.js +97 -0
- package/services/{orchestrators → media}/ContainerOrchestrator.js +45 -7
- package/services/media/KeyframeTables.js +316 -0
- package/services/{source → media}/SourceFile.js +7 -55
- package/services/{torrent-worker/subtitle-cues.js → media/SubtitleCues.js} +103 -132
- package/services/media/SubtitleOrchestrator.js +167 -0
- package/services/{audio-inventory.js → media/audio-inventory.js} +7 -1
- package/services/{container → media/container}/AviContainer.js +266 -266
- package/services/{container → media/container}/Container.js +596 -601
- package/services/media/container/ContainerFactory.js +56 -0
- package/services/media/container/KeyframeTable.js +272 -0
- package/services/{container → media/container}/MatroskaContainer.js +1485 -1485
- package/services/{container → media/container}/Mp4Container.js +1244 -1244
- package/services/{container → media/container}/SubtitleFileContainer.js +322 -322
- package/services/media/keyframe-probe.js +157 -0
- package/services/media/media-info-probe.js +93 -0
- package/services/{playback-planner.js → media/playback-planner.js} +82 -39
- package/services/{tracks → media/tracks}/AudioTrack.js +131 -131
- package/services/{tracks → media/tracks}/language-detect.js +174 -174
- package/services/server/OutputLifecycle.js +418 -0
- package/services/server/SegmentServing.js +1146 -0
- package/services/server/ViewerRequests.js +522 -0
- package/services/server/controllers/PlaybackController.js +36 -0
- package/services/{controllers → server/controllers}/SubtitleController.js +17 -33
- package/services/server/http-responses.js +60 -0
- package/services/server/transcode-session-files.js +325 -0
- package/services/server/wire-outputs.js +983 -0
- package/services/storage/Diagnostics.js +202 -0
- package/services/storage/MachineBudget.js +235 -0
- package/services/{piece-store → storage}/allowance.js +107 -107
- package/services/{core-dumps.js → storage/core-dumps.js} +1 -1
- package/services/{files → storage/files}/CompletedFiles.js +116 -1
- package/services/{disk → storage}/free.js +33 -0
- package/services/storage/machine-memory.js +56 -0
- package/services/{memory-report.js → storage/memory-report.js} +575 -596
- package/services/{piece-store → storage/piece-store}/piece-disk-store.js +0 -7
- package/services/{piece-store → storage/piece-store}/shared-piece-store.js +28 -21
- package/services/{encode → storage/segment-store}/SegmentStore.js +395 -8
- package/services/storage/wire.js +175 -0
- package/services/{download → torrent/download}/SwarmSelection.js +2 -2
- package/services/{download → torrent/download}/registry.js +2 -2
- package/services/torrent/files.js +1 -1
- package/services/torrent/piece-store-of.js +29 -0
- package/services/{torrent-pool.js → torrent/torrent-pool.js} +26 -119
- package/services/{torrent-worker → torrent/worker}/background-fill.js +2 -2
- package/services/{torrent-worker → torrent/worker}/channel.js +271 -250
- package/services/{torrent-worker → torrent/worker}/client.js +77 -58
- package/services/torrent/worker/held-bytes.js +155 -0
- package/services/{torrent-worker → torrent/worker}/install-webrtc-shim.js +1 -1
- package/services/{torrent-worker → torrent/worker}/piece-reader.js +21 -30
- package/services/{torrent-worker → torrent/worker}/pool-adapter.js +101 -137
- package/services/{torrent-worker → torrent/worker}/protocol.js +26 -30
- package/services/torrent/worker/resume-warm.js +107 -0
- package/services/{torrent-worker → torrent/worker}/webrtc-shim.js +2 -2
- package/services/{torrent-worker → torrent/worker}/worker.js +68 -159
- package/services/{data-channel-handler.js → transport/data-channel-handler.js} +1356 -1356
- package/services/{delivery-probe.js → transport/delivery-probe.js} +842 -842
- package/services/{health-collector.js → transport/health-collector.js} +6 -35
- package/services/{packet-witness.js → transport/packet-witness.js} +808 -784
- package/services/{port-mapper.js → transport/port-mapper.js} +1 -1
- package/services/{usrsctp-state.js → transport/usrsctp-state.js} +1 -1
- package/services/{webrtc-manager.js → transport/webrtc-manager.js} +1 -1
- package/services/viewer/Assignments.js +340 -0
- package/services/{priority → viewer}/PriorityMap.js +390 -390
- package/services/{priority → viewer}/PriorityOrchestrator.js +325 -320
- package/services/viewer/Viewer.js +657 -483
- package/services/viewer/Viewers.js +368 -257
- package/services/viewer/active-output.js +37 -54
- package/services/viewer/audio-start.js +4 -3
- package/services/viewer/buffer-trend.js +81 -0
- package/services/viewer/choices.js +647 -0
- package/services/viewer/positions.js +126 -120
- package/services/viewer/report-intake.js +46 -45
- package/test/asset-paths.test.js +28 -0
- package/test/audio-inventory.test.js +3 -3
- package/test/audio-track-bitrate.test.js +40 -0
- package/test/auto-quality-step.test.js +707 -515
- package/test/available-share.test.js +1 -1
- package/test/background-fill.test.js +1 -1
- package/test/client-log-file.test.js +110 -110
- package/test/completed-files.test.js +1 -1
- package/test/concurrent-cost.test.js +13 -3
- package/test/container-media-info.test.js +3 -3
- package/test/core-dumps.test.js +1 -1
- package/test/coverage-follows-the-disk.test.js +46 -9
- package/test/cue-push-carries-what-the-walk-found.test.js +58 -0
- package/test/cut-times-timeline.test.js +2 -2
- package/test/cuts-follow-published-grid.test.js +9 -8
- package/test/data-channel-frame.test.js +1 -1
- package/test/dead-torrent-handle.test.js +1 -1
- package/test/declared-rates.test.js +2 -2
- package/test/declared-tracks.test.js +2 -2
- package/test/decode-cost-fit.test.js +1 -1
- package/test/decode-cost.test.js +34 -25
- package/test/delivery-probe.test.js +1 -1
- package/test/demand-register.test.js +4 -4
- package/test/dht-bootstrap.test.js +1 -1
- package/test/drain-threat.test.js +65 -0
- package/test/duplicate-add.test.js +1 -1
- package/test/encode-admission.test.js +146 -0
- package/test/encode-cost.test.js +199 -10
- package/test/encode-orchestrator.test.js +39 -1
- package/test/encode-plan-viewers.test.js +2 -2
- package/test/encode-run.test.js +2 -2
- package/test/encode-slope.test.js +1 -1
- package/test/encoded-output.test.js +39 -0
- package/test/encoder-readings.test.js +1 -1
- package/test/every-claimant-is-told-its-share.test.js +152 -0
- package/test/failed-encoder-still-serves-what-exists.test.js +354 -0
- package/test/failed-start-breaker.test.js +81 -30
- package/test/fastest-wires.test.js +1 -1
- package/test/ffmpeg-stream-counts.test.js +1 -1
- package/test/file-edges.test.js +3 -3
- package/test/fmp4-self-contained.test.js +1 -1
- package/test/fmp4-timestamps.test.js +1 -1
- package/test/fmp4-track-completeness.test.js +1 -1
- package/test/format-keyed-outputs.test.js +78 -0
- package/test/health-metrics.test.js +3 -2
- package/test/held-request-width.test.js +22 -23
- package/test/helpers/encode-run.js +136 -136
- package/test/helpers/held-file.js +29 -0
- package/test/helpers/manager.js +57 -0
- package/test/helpers/output-spec.js +63 -0
- package/test/host-load.test.js +1 -1
- package/test/index-accuracy-is-about-the-file.test.js +128 -0
- package/test/init-compat.test.js +219 -0
- package/test/input-lost-quiets-the-plan.test.js +1 -1
- package/test/input-unavailable.test.js +1 -1
- package/test/keeping-period.test.js +4 -4
- package/test/keyframe-index-accuracy.test.js +97 -45
- package/test/keyframe-table-budget.test.js +28 -33
- package/test/keyframes-belong-to-the-file.test.js +174 -57
- package/test/learned-median.test.js +1 -1
- package/test/letting-go-asks-who-is-watching.test.js +191 -0
- package/test/limit-row-by-area.test.js +60 -0
- package/test/link-budget.test.js +111 -0
- package/test/link-probe.test.js +56 -56
- package/test/local-encoding-data.test.js +273 -0
- package/test/look-ahead-coverage.test.js +1 -1
- package/test/manager-surface.test.js +294 -0
- package/test/matroska-blocks.test.js +0 -0
- package/test/matroska-cues-track.test.js +1 -1
- package/test/memory-budget.test.js +2 -2
- package/test/mp4-composition-times.test.js +0 -0
- package/test/mp4-subtitles.test.js +1 -1
- package/test/one-authority.test.js +45 -41
- package/test/one-budget.test.js +149 -0
- package/test/one-output-one-session.test.js +204 -0
- package/test/{disk-space.test.js → one-resource-divided.test.js} +30 -10
- package/test/one-serving-output-per-height.test.js +458 -0
- package/test/orchestrator-wired.test.js +46 -45
- package/test/output-catalog.test.js +39 -0
- package/test/output-shape.test.js +4 -51
- package/test/output-spec.test.js +251 -157
- package/test/output-speed.test.js +17 -15
- package/test/outputs-being-prepared.test.js +40 -0
- package/test/packet-witness-ring.test.js +2 -2
- package/test/packet-witness.test.js +1 -1
- package/test/piece-disk-store.test.js +2 -2
- package/test/piece-from-whole-file.test.js +1 -1
- package/test/piece-lru.test.js +1 -1
- package/test/piece-reader.test.js +2 -2
- package/test/piece-store-eviction.test.js +1 -1
- package/test/piece-store-never-refuses.test.js +1 -1
- package/test/piece-store-reservations.test.js +1 -1
- package/test/piece-store-slow-disk.test.js +1 -1
- package/test/piece-tail.test.js +1 -1
- package/test/plan-host-timings.test.js +1 -1
- package/test/plan-is-steady.test.js +225 -225
- package/test/priority-map-download.test.js +4 -4
- package/test/priority-map-emptied.test.js +204 -205
- package/test/priority-map-per-output.test.js +215 -209
- package/test/priority-map.test.js +1 -1
- package/test/probe-wedge-certainty.test.js +1 -1
- package/test/produced-copy-choice.test.js +15 -60
- package/test/quality-offer.test.js +162 -0
- package/test/quality-variants.test.js +1229 -1167
- package/test/rate-control-in-the-output.test.js +180 -0
- package/test/read-survives-withdrawal.test.js +2 -2
- package/test/read-window.test.js +10 -3
- package/test/resume-warm.test.js +1 -1
- package/test/run-inputs.test.js +80 -0
- package/test/run-position-follows-published-grid.test.js +13 -11
- package/test/run-progress.test.js +65 -0
- package/test/same-height-switch.test.js +664 -0
- package/test/seek-frees-the-viewers-requests.test.js +217 -0
- package/test/seek-landing.test.js +13 -13
- package/test/seek-target-not-superseded.test.js +28 -29
- package/test/segment-closed-on-both-branches.test.js +96 -0
- package/test/segment-cut-times.test.js +1 -1
- package/test/segment-hold-supersede.test.js +28 -35
- package/test/segment-judged-by-its-own-header.test.js +221 -0
- package/test/segment-serve-wiring.test.js +130 -39
- package/test/segment-store-eviction.test.js +22 -7
- package/test/segment-store.test.js +98 -14
- package/test/segment-true-start.test.js +1 -1
- package/test/segments-are-shared.test.js +17 -16
- package/test/send-chunk-bytes.test.js +1 -1
- package/test/serving-existing-output.test.js +102 -0
- package/test/serving-output.test.js +102 -0
- package/test/shared-piece-store.test.js +1 -1
- package/test/source-file.test.js +1 -1
- package/test/stale-request-after-seek.test.js +17 -21
- package/test/startup-readings.test.js +10 -5
- package/test/subtitle-cue-framing.test.js +5 -5
- package/test/subtitle-cue-source.test.js +36 -38
- package/test/subtitle-cue-walk.test.js +11 -10
- package/test/subtitle-defaults.test.js +1 -1
- package/test/subtitle-language.test.js +4 -4
- package/test/subtitle-track-numbering.test.js +5 -4
- package/test/supply-margin.test.js +1 -1
- package/test/swarm-follows-readers.test.js +3 -3
- package/test/swarm-reach.test.js +1 -1
- package/test/swarm-selection.test.js +3 -3
- package/test/tail-duplication.test.js +1 -1
- package/test/the-channel-has-both-ends.test.js +91 -0
- package/test/the-torrent-thread-serves-bytes.test.js +107 -0
- package/test/thread-pool.test.js +3 -3
- package/test/timeline.test.js +1 -12
- package/test/torrent-cost.test.js +1 -1
- package/test/tracks-begin-together.test.js +38 -24
- package/test/tunnel-renewal.test.js +1 -1
- package/test/two-viewers-one-picture.test.js +120 -87
- package/test/upload-hurry.test.js +3 -3
- package/test/usrsctp-state.test.js +1 -1
- package/test/video-facts.test.js +1 -1
- package/test/viewer-assignments.test.js +143 -0
- package/test/viewer-outputs.test.js +60 -52
- package/test/viewer-presence.test.js +22 -25
- package/test/viewer-requests-admission.test.js +89 -0
- package/test/viewer-states.test.js +189 -202
- package/test/viewer-subtitle-subscription.test.js +1 -1
- package/test/viewer.test.js +139 -136
- package/test/viewing-generations.test.js +390 -0
- package/test/visible-rung.test.js +37 -0
- package/test/wait-ledger.test.js +1 -1
- package/test/webrtc-shim.test.js +3 -3
- package/test/wedge-certainty.test.js +2 -2
- package/test/withdraw-piece-claim.test.js +2 -2
- package/test/worker-channel.test.js +1 -31
- package/utils/client-log-file.js +151 -151
- package/scripts/read-container-index.mjs +0 -108
- package/services/container/ContainerFactory.js +0 -122
- package/services/controllers/PlaybackController.js +0 -33
- package/services/disk/DiskSpace.js +0 -150
- package/services/disk/wire.js +0 -61
- package/services/hls-session-manager.js +0 -9608
- package/services/orchestrators/SubtitleOrchestrator.js +0 -160
- package/services/output/Output.js +0 -94
- package/services/output/OutputSpec.js +0 -202
- package/services/output/index.js +0 -1
- package/services/output/ladder.js +0 -26
- package/services/produced-index.js +0 -222
- package/services/quality/EncodeCost.js +0 -555
- package/services/torrent-worker/container-tracks.js +0 -414
- package/services/viewer/link-readings.js +0 -56
- package/test/produced-index.test.js +0 -142
- /package/{services → bin}/thread-pool.js +0 -0
- /package/services/{available-share.js → encode/available-share.js} +0 -0
- /package/services/{decode-cost-fit.js → encode/decode-cost-fit.js} +0 -0
- /package/services/{encoder-readings.js → encode/encoder-readings.js} +0 -0
- /package/services/{host-load.js → encode/host-load.js} +0 -0
- /package/services/{output → encode/output}/cut-grid.js +0 -0
- /package/services/{output → encode/output}/rates.js +0 -0
- /package/services/{segment-formats → encode/segment-formats}/mpegts.js +0 -0
- /package/services/{torrent-cost.js → encode/torrent-cost.js} +0 -0
- /package/services/{container → media/container}/ebml-reader.js +0 -0
- /package/services/{ffmpeg-banner.js → media/ffmpeg-banner.js} +0 -0
- /package/services/{tracks → media/tracks}/ContainerTrack.js +0 -0
- /package/services/{tracks → media/tracks}/ImageSubtitleTrack.js +0 -0
- /package/services/{tracks → media/tracks}/SubtitleTrack.js +0 -0
- /package/services/{tracks → media/tracks}/TextSubtitleTrack.js +0 -0
- /package/services/{tracks → media/tracks}/VideoTrack.js +0 -0
- /package/services/{tracks → media/tracks}/index.js +0 -0
- /package/services/{files → storage/files}/piece-from-whole-file.js +0 -0
- /package/services/{disk → storage}/keep.js +0 -0
- /package/services/{piece-store → storage/piece-store}/piece-lru.js +0 -0
- /package/services/{disk → storage}/returns.js +0 -0
- /package/services/{demand → torrent/demand}/DemandRegister.js +0 -0
- /package/services/{demand → torrent/demand}/Urgency.js +0 -0
- /package/services/{demand → torrent/demand}/Window.js +0 -0
- /package/services/{demand → torrent/demand}/index.js +0 -0
- /package/services/{demand → torrent/demand}/pieces.js +0 -0
- /package/services/{download → torrent/download}/withdraw-claim.js +0 -0
- /package/services/{supply-margin.js → torrent/supply-margin.js} +0 -0
- /package/services/{torrent-source-key.js → torrent/torrent-source-key.js} +0 -0
- /package/services/{torrent-worker → torrent/worker}/fastest-wires.js +0 -0
- /package/services/{torrent-worker → torrent/worker}/handle-state.js +0 -0
- /package/services/{nat-classifier.js → transport/nat-classifier.js} +0 -0
- /package/services/{registry-api.js → transport/registry-api.js} +0 -0
- /package/services/{tunnel-client.js → transport/tunnel-client.js} +0 -0
- /package/services/{priority → viewer}/WaitLedger.js +0 -0
|
@@ -0,0 +1,217 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file A seek must free the requests it made pointless, on every output that
|
|
3
|
+
* viewer watches, and only theirs.
|
|
4
|
+
*
|
|
5
|
+
* hls.js keeps ONE fragment load outstanding per track, so a request held for a
|
|
6
|
+
* segment the viewer has just left blocks the request for where they now are.
|
|
7
|
+
* Measured 2026-08-04: 57 s of a 58 s backward seek was that wait, and the
|
|
8
|
+
* segment they wanted was served in 15 ms once it was asked for.
|
|
9
|
+
*
|
|
10
|
+
* The guard against it was built — the route compares a seek epoch and asks
|
|
11
|
+
* whether each held request is still wanted — and nothing moved that epoch: no
|
|
12
|
+
* caller of `invalidateWaits` was a seek.
|
|
13
|
+
*
|
|
14
|
+
* TWO THINGS THIS CHECK HAS TO DO, and the first version of it did neither.
|
|
15
|
+
* It must wait until the store really HOLDS the waits, because a seek that
|
|
16
|
+
* happens before they are registered frees nothing and passes all the same; and
|
|
17
|
+
* it must cover the three outputs one viewer watches — the picture the browser
|
|
18
|
+
* addresses, the step on their screen, their soundtrack — because waking only
|
|
19
|
+
* the one the browser named leaves two thirds of their requests standing.
|
|
20
|
+
*
|
|
21
|
+
* And waking is not cancelling: one viewer's seek must leave another viewer's
|
|
22
|
+
* request for the same segment of the same output exactly where it was.
|
|
23
|
+
*/
|
|
24
|
+
|
|
25
|
+
import test from "node:test";
|
|
26
|
+
import assert from "node:assert/strict";
|
|
27
|
+
import { rm, writeFile } from "node:fs/promises";
|
|
28
|
+
import path from "node:path";
|
|
29
|
+
import { setTimeout as delay } from "node:timers/promises";
|
|
30
|
+
import { wireOutputs } from "../services/server/wire-outputs.js";
|
|
31
|
+
import { waitForSessionFile } from "../routes/transcode/session-file/get.js";
|
|
32
|
+
import { SourceFile } from "../services/media/SourceFile.js";
|
|
33
|
+
import { Timeline } from "../services/encode/output/Timeline.js";
|
|
34
|
+
import { Output } from "../services/encode/output/Output.js";
|
|
35
|
+
import { KeyframeTable } from "../services/media/container/KeyframeTable.js";
|
|
36
|
+
import { fmp4Format } from "../services/encode/segment-formats/fmp4.js";
|
|
37
|
+
import { outputSpec } from "./helpers/output-spec.js";
|
|
38
|
+
|
|
39
|
+
const SESSION_ID = "2222222233334444";
|
|
40
|
+
const OUTPUT_KEY = "seek-frees:fmt=fmp4:grid=uniform:video-only:v=0/copy";
|
|
41
|
+
const STEP_ID = "3333333344445555";
|
|
42
|
+
const STEP_KEY = "seek-frees:fmt=fmp4:grid=uniform:video-only:v=0/libx264/960x540";
|
|
43
|
+
const SOUND_ID = "4444444455556666";
|
|
44
|
+
const SOUND_KEY = "seek-frees:fmt=fmp4:grid=uniform:audio-only:a=0/0/aac";
|
|
45
|
+
/** Long enough that running out of it is a failure and never the measurement. */
|
|
46
|
+
const HOLD_MS = 30_000;
|
|
47
|
+
|
|
48
|
+
/**
|
|
49
|
+
* One output of the film, with nothing produced for it yet.
|
|
50
|
+
*
|
|
51
|
+
* @param {object} manager
|
|
52
|
+
* @param {{ id: string, key: string, audioOnly?: boolean, height?: number }} what
|
|
53
|
+
* @returns {object}
|
|
54
|
+
*/
|
|
55
|
+
function outputOn(manager, { id, key, audioOnly = false, height = 0 }) {
|
|
56
|
+
manager.segmentStore.useFormat(key, fmp4Format);
|
|
57
|
+
const dirPath = manager.segmentStore.directoryFor(key);
|
|
58
|
+
const session = {
|
|
59
|
+
id,
|
|
60
|
+
spec: outputSpec({ transcodeVideo: height > 0, height, audioOnly, cutGrid: "uniform" }),
|
|
61
|
+
outputKey: key,
|
|
62
|
+
dirPath,
|
|
63
|
+
timeline: new Timeline({ boundaries: [0, 12.5, 25, 37.5, 50, 62.5], cutGrid: "uniform" }),
|
|
64
|
+
state: "ready",
|
|
65
|
+
file: new SourceFile({ sourceKey: "source-1", fileIndex: 0, name: "video.mkv" }).learn({ durationSeconds: 62.5 }),
|
|
66
|
+
get inputFile() { return this.file; },
|
|
67
|
+
get audioFile() { return this.file; },
|
|
68
|
+
lastAloneSpeed: 2,
|
|
69
|
+
startedAt: Date.now(),
|
|
70
|
+
lastAccessedAt: Date.now(),
|
|
71
|
+
runs: new Set(),
|
|
72
|
+
lastError: "",
|
|
73
|
+
consumers: new Set(),
|
|
74
|
+
viewers: new Map(),
|
|
75
|
+
segmentCount: 5,
|
|
76
|
+
segmentFormat: fmp4Format,
|
|
77
|
+
useSyntheticPlaylist: true,
|
|
78
|
+
playlistText: "#EXTM3U\n",
|
|
79
|
+
output: new Output({ encodeWidth: 0, encodeHeight: height, outputFps: 25, softwarePreset: null, applyTonemap: false }),
|
|
80
|
+
keyframes: new KeyframeTable().learn({ times: [0, 12.5, 25, 37.5, 50], format: "matroska" }),
|
|
81
|
+
audioOnly,
|
|
82
|
+
waitEpoch: 0
|
|
83
|
+
};
|
|
84
|
+
manager.outputs.set(id, session);
|
|
85
|
+
return session;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
/**
|
|
89
|
+
* Wait until the store really holds this many waits on an output.
|
|
90
|
+
*
|
|
91
|
+
* The deadline is a backstop and never the measurement: what is waited for is
|
|
92
|
+
* the registration itself, which is the store's own state.
|
|
93
|
+
*
|
|
94
|
+
* @param {object} manager
|
|
95
|
+
* @param {string} key
|
|
96
|
+
* @param {number} howMany
|
|
97
|
+
* @returns {Promise<void>}
|
|
98
|
+
*/
|
|
99
|
+
async function untilWaitsAreRegistered(manager, key, howMany) {
|
|
100
|
+
const giveUpAt = Date.now() + 5_000;
|
|
101
|
+
while (manager.segmentStore.waitingFor(key) < howMany) {
|
|
102
|
+
if (Date.now() > giveUpAt) {
|
|
103
|
+
throw new Error(`only ${manager.segmentStore.waitingFor(key)} wait(s) on ${key} after 5s`);
|
|
104
|
+
}
|
|
105
|
+
await new Promise((resolve) => setImmediate(resolve));
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
/**
|
|
110
|
+
* The picture, one quality step and one soundtrack of a film, with two viewers
|
|
111
|
+
* on the picture and one of them also on the step and the soundtrack.
|
|
112
|
+
*
|
|
113
|
+
* @returns {{ manager: object, session: object, step: object, sound: object }}
|
|
114
|
+
*/
|
|
115
|
+
function filmWithThreeOutputs() {
|
|
116
|
+
const manager = wireOutputs({
|
|
117
|
+
enabled: true,
|
|
118
|
+
ffmpegBin: "ffmpeg",
|
|
119
|
+
localBindHost: "127.0.0.1",
|
|
120
|
+
localPort: 9090
|
|
121
|
+
});
|
|
122
|
+
// No plan runs here: this is about the path that answers a request, and
|
|
123
|
+
// letting the plan run would spawn real encoders.
|
|
124
|
+
manager.encodeRuns.planEncodersNow = () => {};
|
|
125
|
+
manager.encodeRuns.planEncodersSoon = () => {};
|
|
126
|
+
const session = outputOn(manager, { id: SESSION_ID, key: OUTPUT_KEY });
|
|
127
|
+
const step = outputOn(manager, { id: STEP_ID, key: STEP_KEY, height: 540 });
|
|
128
|
+
const sound = outputOn(manager, { id: SOUND_ID, key: SOUND_KEY, audioOnly: true });
|
|
129
|
+
for (const consumerId of ["viewer-a", "viewer-b"]) {
|
|
130
|
+
manager.viewers.of(session, consumerId).moveTo(0);
|
|
131
|
+
}
|
|
132
|
+
for (const output of [step, sound]) {
|
|
133
|
+
manager.viewers.of(step === output ? step : sound, "viewer-a").moveTo(0);
|
|
134
|
+
}
|
|
135
|
+
return { manager, session, step, sound };
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
/**
|
|
139
|
+
* @param {object} manager
|
|
140
|
+
* @param {string} consumerId
|
|
141
|
+
* @param {string} sessionId
|
|
142
|
+
* @returns {Promise<{ kind: string }>}
|
|
143
|
+
*/
|
|
144
|
+
function holdFor(manager, consumerId, sessionId = SESSION_ID) {
|
|
145
|
+
return waitForSessionFile(manager.serving, sessionId, "segment-00000.mp4", {
|
|
146
|
+
holdMs: HOLD_MS,
|
|
147
|
+
consumerId
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
test("a seek frees the seeker's requests on every output they watch", async (t) => {
|
|
152
|
+
const { manager, session, step, sound } = filmWithThreeOutputs();
|
|
153
|
+
t.after(async () => {
|
|
154
|
+
await manager.lifecycle.disposeAll();
|
|
155
|
+
for (const output of [session, step, sound]) {
|
|
156
|
+
await rm(output.dirPath, { recursive: true, force: true });
|
|
157
|
+
}
|
|
158
|
+
});
|
|
159
|
+
|
|
160
|
+
const onPicture = holdFor(manager, "viewer-a");
|
|
161
|
+
const onStep = holdFor(manager, "viewer-a", STEP_ID);
|
|
162
|
+
const onSound = holdFor(manager, "viewer-a", SOUND_ID);
|
|
163
|
+
let stayed = "still held";
|
|
164
|
+
const stayer = holdFor(manager, "viewer-b").then((result) => {
|
|
165
|
+
stayed = result.kind;
|
|
166
|
+
return result;
|
|
167
|
+
});
|
|
168
|
+
// Every one of them must EXIST before the seek, or the check proves nothing.
|
|
169
|
+
await untilWaitsAreRegistered(manager, OUTPUT_KEY, 2);
|
|
170
|
+
await untilWaitsAreRegistered(manager, STEP_KEY, 1);
|
|
171
|
+
await untilWaitsAreRegistered(manager, SOUND_KEY, 1);
|
|
172
|
+
|
|
173
|
+
const startedAt = Date.now();
|
|
174
|
+
assert.equal(manager.viewerRequests.requestSeek(SESSION_ID, 50, "viewer-a"), true);
|
|
175
|
+
|
|
176
|
+
const released = await Promise.all([onPicture, onStep, onSound]);
|
|
177
|
+
const heldMs = Date.now() - startedAt;
|
|
178
|
+
|
|
179
|
+
for (const [index, answer] of released.entries()) {
|
|
180
|
+
assert.equal(
|
|
181
|
+
answer.kind,
|
|
182
|
+
"superseded",
|
|
183
|
+
`the request on output ${index} was made for a position its viewer has left`
|
|
184
|
+
);
|
|
185
|
+
}
|
|
186
|
+
assert.ok(heldMs < HOLD_MS / 2, `they were freed after ${heldMs}ms, which is the hold running out`);
|
|
187
|
+
|
|
188
|
+
// A grace before asserting that something did NOT happen: it can only ever
|
|
189
|
+
// pass too easily, never fail by luck.
|
|
190
|
+
await delay(300);
|
|
191
|
+
assert.equal(stayed, "still held", "the other viewer is where they were and still wants this segment");
|
|
192
|
+
void stayer;
|
|
193
|
+
});
|
|
194
|
+
|
|
195
|
+
test("the request that was kept is served when its segment appears", async (t) => {
|
|
196
|
+
const { manager, session, step, sound } = filmWithThreeOutputs();
|
|
197
|
+
t.after(async () => {
|
|
198
|
+
await manager.lifecycle.disposeAll();
|
|
199
|
+
for (const output of [session, step, sound]) {
|
|
200
|
+
await rm(output.dirPath, { recursive: true, force: true });
|
|
201
|
+
}
|
|
202
|
+
});
|
|
203
|
+
|
|
204
|
+
const seeker = holdFor(manager, "viewer-a");
|
|
205
|
+
const stayer = holdFor(manager, "viewer-b");
|
|
206
|
+
await untilWaitsAreRegistered(manager, OUTPUT_KEY, 2);
|
|
207
|
+
manager.viewerRequests.requestSeek(SESSION_ID, 50, "viewer-a");
|
|
208
|
+
assert.equal((await seeker).kind, "superseded");
|
|
209
|
+
|
|
210
|
+
// The piece the viewer who stayed was waiting for, written as a run writes
|
|
211
|
+
// it: under its served name, which is the whole of what says it is closed.
|
|
212
|
+
await writeFile(path.join(session.dirPath, fmp4Format.segmentFileName(0)), Buffer.alloc(256, 0x5a));
|
|
213
|
+
|
|
214
|
+
const answer = await stayer;
|
|
215
|
+
|
|
216
|
+
assert.equal(answer.kind, "file", `a wake is a re-check, not a cancellation — got ${answer.kind}`);
|
|
217
|
+
});
|
|
@@ -14,34 +14,34 @@
|
|
|
14
14
|
*/
|
|
15
15
|
|
|
16
16
|
import assert from "node:assert/strict";
|
|
17
|
-
import {
|
|
17
|
+
import { KeyframeTable } from "../services/media/container/KeyframeTable.js";
|
|
18
18
|
import test from "node:test";
|
|
19
19
|
|
|
20
|
-
import { seekLandingOffsetFor } from "../services/
|
|
20
|
+
import { seekLandingOffsetFor } from "../services/encode/run-command.js";
|
|
21
21
|
|
|
22
22
|
const OFFSET = 3 / 23;
|
|
23
23
|
|
|
24
24
|
test("a copied picture is asked for one heuristic later than the keyframe", () => {
|
|
25
|
-
const session = { transcodeVideo: false,
|
|
25
|
+
const session = { transcodeVideo: false, keyframes: new KeyframeTable().learn({ times: [0, 2.002, 4.004, 6.006] }) };
|
|
26
26
|
assert.equal(seekLandingOffsetFor(session, 2.002), OFFSET);
|
|
27
27
|
});
|
|
28
28
|
|
|
29
29
|
test("a re-encode is asked for exactly what it should produce", () => {
|
|
30
30
|
// It decodes from the keyframe and discards frames up to the requested time,
|
|
31
31
|
// so pushing the request later would start its output late.
|
|
32
|
-
const session = { transcodeVideo: true,
|
|
32
|
+
const session = { transcodeVideo: true, keyframes: new KeyframeTable().learn({ times: [0, 2.002, 4.004] }) };
|
|
33
33
|
assert.equal(seekLandingOffsetFor(session, 2.002), 0);
|
|
34
34
|
});
|
|
35
35
|
|
|
36
36
|
test("the offset never reaches the next keyframe", () => {
|
|
37
37
|
// Keyframes 0.1 s apart: half of that is the most that can be added without
|
|
38
38
|
// risking a landing on the NEXT one where the heuristic does not fire.
|
|
39
|
-
const session = { transcodeVideo: false,
|
|
39
|
+
const session = { transcodeVideo: false, keyframes: new KeyframeTable().learn({ times: [0, 0.1, 0.2, 0.3] }) };
|
|
40
40
|
assert.equal(seekLandingOffsetFor(session, 0.1), 0.05);
|
|
41
41
|
});
|
|
42
42
|
|
|
43
43
|
test("the last keyframe has nothing after it to collide with", () => {
|
|
44
|
-
const session = { transcodeVideo: false,
|
|
44
|
+
const session = { transcodeVideo: false, keyframes: new KeyframeTable().learn({ times: [0, 2.002, 4.004] }) };
|
|
45
45
|
assert.equal(seekLandingOffsetFor(session, 4.004), OFFSET);
|
|
46
46
|
});
|
|
47
47
|
|
|
@@ -58,7 +58,7 @@ test("a grid whose times are approximate is asked for that much later again", ()
|
|
|
58
58
|
// the one before that, which is the fault this offset exists for.
|
|
59
59
|
const session = {
|
|
60
60
|
transcodeVideo: false,
|
|
61
|
-
|
|
61
|
+
keyframes: new KeyframeTable().learn({ times: [0, 4.004, 8.008, 12.012], tolerance: 0.04 })
|
|
62
62
|
};
|
|
63
63
|
assert.equal(seekLandingOffsetFor(session, 4.004), OFFSET + 0.04);
|
|
64
64
|
});
|
|
@@ -66,12 +66,12 @@ test("a grid whose times are approximate is asked for that much later again", ()
|
|
|
66
66
|
test("an exact grid claims no tolerance", () => {
|
|
67
67
|
// Matroska and MP4 state instants outright — measured the same day, nine
|
|
68
68
|
// files and 11 665 keyframes with not one disagreement.
|
|
69
|
-
const session = { transcodeVideo: false,
|
|
69
|
+
const session = { transcodeVideo: false, keyframes: new KeyframeTable().learn({ times: [0, 4.004, 8.008], tolerance: 0 }) };
|
|
70
70
|
assert.equal(seekLandingOffsetFor(session, 4.004), OFFSET);
|
|
71
71
|
});
|
|
72
72
|
|
|
73
73
|
test("the bound still holds once a tolerance is added", () => {
|
|
74
|
-
const session = { transcodeVideo: false,
|
|
74
|
+
const session = { transcodeVideo: false, keyframes: new KeyframeTable().learn({ times: [0, 0.1, 0.2], tolerance: 1 }) };
|
|
75
75
|
assert.equal(seekLandingOffsetFor(session, 0.1), 0.05);
|
|
76
76
|
});
|
|
77
77
|
|
|
@@ -89,8 +89,8 @@ test("an output carrying only sound is not pushed past what it asked for", () =>
|
|
|
89
89
|
const soundtrack = {
|
|
90
90
|
audioOnly: true,
|
|
91
91
|
transcodeVideo: false,
|
|
92
|
-
|
|
93
|
-
.learn({
|
|
92
|
+
keyframes: new KeyframeTable()
|
|
93
|
+
.learn({ times: [0, 4.004, 8.008, 12.012], tolerance: 0 })
|
|
94
94
|
};
|
|
95
95
|
assert.equal(seekLandingOffsetFor(soundtrack, 4.004), 0);
|
|
96
96
|
});
|
|
@@ -102,8 +102,8 @@ test("the picture of the same film still gets the offset", () => {
|
|
|
102
102
|
const picture = {
|
|
103
103
|
audioOnly: false,
|
|
104
104
|
transcodeVideo: false,
|
|
105
|
-
|
|
106
|
-
.learn({
|
|
105
|
+
keyframes: new KeyframeTable()
|
|
106
|
+
.learn({ times: [0, 4.004, 8.008, 12.012], tolerance: 0 })
|
|
107
107
|
};
|
|
108
108
|
assert.equal(seekLandingOffsetFor(picture, 4.004), OFFSET);
|
|
109
109
|
});
|
|
@@ -15,16 +15,15 @@
|
|
|
15
15
|
|
|
16
16
|
import test from "node:test";
|
|
17
17
|
import assert from "node:assert/strict";
|
|
18
|
-
import { SourceFile } from "../services/
|
|
19
|
-
import { Timeline } from "../services/output/Timeline.js";
|
|
18
|
+
import { SourceFile } from "../services/media/SourceFile.js";
|
|
19
|
+
import { Timeline } from "../services/encode/output/Timeline.js";
|
|
20
20
|
import { mkdtemp, rm } from "node:fs/promises";
|
|
21
21
|
import os from "node:os";
|
|
22
22
|
import path from "node:path";
|
|
23
|
-
import {
|
|
24
|
-
import {
|
|
25
|
-
import { fmp4Format } from "../services/segment-formats/fmp4.js";
|
|
23
|
+
import { wireOutputs } from "../services/server/wire-outputs.js";
|
|
24
|
+
import { fmp4Format } from "../services/encode/segment-formats/fmp4.js";
|
|
26
25
|
|
|
27
|
-
const SESSION_ID = "
|
|
26
|
+
const SESSION_ID = "aaaaaaaa11112222";
|
|
28
27
|
const SEGMENT_SECONDS = 10.4;
|
|
29
28
|
const SEEK_TO_SECONDS = 1061;
|
|
30
29
|
const SEGMENT_AT_SEEK = Math.floor(SEEK_TO_SECONDS / SEGMENT_SECONDS);
|
|
@@ -32,11 +31,11 @@ const SEGMENT_AT_SEEK = Math.floor(SEEK_TO_SECONDS / SEGMENT_SECONDS);
|
|
|
32
31
|
/**
|
|
33
32
|
* A session whose viewer has just landed at {@link SEEK_TO_SECONDS}.
|
|
34
33
|
*
|
|
35
|
-
* @returns {Promise<{ manager:
|
|
34
|
+
* @returns {Promise<{ manager: object, dirPath: string }>}
|
|
36
35
|
*/
|
|
37
36
|
async function managerAfterSeek() {
|
|
38
37
|
const dirPath = await mkdtemp(path.join(os.tmpdir(), "seek-target-"));
|
|
39
|
-
const manager =
|
|
38
|
+
const manager = wireOutputs({
|
|
40
39
|
enabled: true,
|
|
41
40
|
ffmpegBin: "ffmpeg",
|
|
42
41
|
localBindHost: "127.0.0.1",
|
|
@@ -68,9 +67,9 @@ async function managerAfterSeek() {
|
|
|
68
67
|
waitEpoch: 1,
|
|
69
68
|
runState: "PRODUCING"
|
|
70
69
|
};
|
|
71
|
-
manager.
|
|
72
|
-
|
|
73
|
-
|
|
70
|
+
manager.outputs.set(SESSION_ID, session);
|
|
71
|
+
manager.viewers.of(session, "viewer").moveTo(SEEK_TO_SECONDS);
|
|
72
|
+
manager.viewers.of(session, "viewer").playing = false;
|
|
74
73
|
return { manager, dirPath };
|
|
75
74
|
}
|
|
76
75
|
|
|
@@ -78,7 +77,7 @@ test("the segment at the seek target is still wanted", async () => {
|
|
|
78
77
|
const { manager, dirPath } = await managerAfterSeek();
|
|
79
78
|
|
|
80
79
|
assert.equal(
|
|
81
|
-
manager.requestStillWanted(SESSION_ID, `segment-${String(SEGMENT_AT_SEEK).padStart(5, "0")}.mp4`),
|
|
80
|
+
manager.serving.requestStillWanted(SESSION_ID, `segment-${String(SEGMENT_AT_SEEK).padStart(5, "0")}.mp4`),
|
|
82
81
|
true,
|
|
83
82
|
"this is the segment the viewer is waiting for; refusing it is what froze the field session"
|
|
84
83
|
);
|
|
@@ -90,7 +89,7 @@ test("a segment behind the viewer is not wanted any more", async () => {
|
|
|
90
89
|
const { manager, dirPath } = await managerAfterSeek();
|
|
91
90
|
|
|
92
91
|
assert.equal(
|
|
93
|
-
manager.requestStillWanted(SESSION_ID, `segment-${String(SEGMENT_AT_SEEK - 3).padStart(5, "0")}.mp4`),
|
|
92
|
+
manager.serving.requestStillWanted(SESSION_ID, `segment-${String(SEGMENT_AT_SEEK - 3).padStart(5, "0")}.mp4`),
|
|
94
93
|
false,
|
|
95
94
|
"a request for the position the viewer left is exactly what the epoch exists to release"
|
|
96
95
|
);
|
|
@@ -102,7 +101,7 @@ test("a segment far beyond what the run will reach is not wanted", async () => {
|
|
|
102
101
|
const { manager, dirPath } = await managerAfterSeek();
|
|
103
102
|
|
|
104
103
|
assert.equal(
|
|
105
|
-
manager.requestStillWanted(SESSION_ID, `segment-${String(SEGMENT_AT_SEEK + 200).padStart(5, "0")}.mp4`),
|
|
104
|
+
manager.serving.requestStillWanted(SESSION_ID, `segment-${String(SEGMENT_AT_SEEK + 200).padStart(5, "0")}.mp4`),
|
|
106
105
|
false,
|
|
107
106
|
"nothing will produce it before the viewer moves again"
|
|
108
107
|
);
|
|
@@ -113,8 +112,8 @@ test("a segment far beyond what the run will reach is not wanted", async () => {
|
|
|
113
112
|
test("a playlist belongs to no position and is never stale", async () => {
|
|
114
113
|
const { manager, dirPath } = await managerAfterSeek();
|
|
115
114
|
|
|
116
|
-
assert.equal(manager.requestStillWanted(SESSION_ID, "index.m3u8"), true);
|
|
117
|
-
assert.equal(manager.requestStillWanted(SESSION_ID, "init.mp4"), true);
|
|
115
|
+
assert.equal(manager.serving.requestStillWanted(SESSION_ID, "index.m3u8"), true);
|
|
116
|
+
assert.equal(manager.serving.requestStillWanted(SESSION_ID, "init.mp4"), true);
|
|
118
117
|
|
|
119
118
|
await rm(dirPath, { recursive: true, force: true });
|
|
120
119
|
});
|
|
@@ -131,7 +130,7 @@ test("a request as deep as the cushion the browser is told to hold is still want
|
|
|
131
130
|
|
|
132
131
|
assert.ok(edge - SEGMENT_AT_SEEK > 8, "the case only exists past the old eight-segment width");
|
|
133
132
|
assert.equal(
|
|
134
|
-
manager.requestStillWanted(SESSION_ID, `segment-${String(edge).padStart(5, "0")}.mp4`),
|
|
133
|
+
manager.serving.requestStillWanted(SESSION_ID, `segment-${String(edge).padStart(5, "0")}.mp4`),
|
|
135
134
|
true,
|
|
136
135
|
"the far edge of the cushion the proxy itself keeps produced"
|
|
137
136
|
);
|
|
@@ -141,25 +140,25 @@ test("a request as deep as the cushion the browser is told to hold is still want
|
|
|
141
140
|
|
|
142
141
|
test("the viewer who made the request is the one it is judged against", async () => {
|
|
143
142
|
const { manager, dirPath } = await managerAfterSeek();
|
|
144
|
-
const session = manager.
|
|
143
|
+
const session = manager.outputs.get(SESSION_ID);
|
|
145
144
|
session.viewers = new Map();
|
|
146
145
|
// Two people watching one copied picture: one at the seek target, one a
|
|
147
146
|
// hundred segments back and waiting for a segment there. Asked about nobody
|
|
148
147
|
// in particular the answer is the FURTHEST of them, because what lies behind
|
|
149
148
|
// that one has already been made.
|
|
150
149
|
const behind = SEGMENT_AT_SEEK - 100;
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
150
|
+
manager.viewers.of(session, "behind").moveTo(behind * SEGMENT_SECONDS);
|
|
151
|
+
manager.viewers.of(session, "behind").playing = false;
|
|
152
|
+
manager.viewers.of(session, "ahead").moveTo(SEEK_TO_SECONDS);
|
|
153
|
+
manager.viewers.of(session, "ahead").playing = false;
|
|
155
154
|
|
|
156
155
|
assert.equal(
|
|
157
|
-
manager.requestStillWanted(SESSION_ID, `segment-${String(behind).padStart(5, "0")}.mp4`, "behind"),
|
|
156
|
+
manager.serving.requestStillWanted(SESSION_ID, `segment-${String(behind).padStart(5, "0")}.mp4`, "behind"),
|
|
158
157
|
true,
|
|
159
158
|
"held for the viewer who is there, whatever the viewer in front is doing"
|
|
160
159
|
);
|
|
161
160
|
assert.equal(
|
|
162
|
-
manager.requestStillWanted(SESSION_ID, `segment-${String(behind).padStart(5, "0")}.mp4`),
|
|
161
|
+
manager.serving.requestStillWanted(SESSION_ID, `segment-${String(behind).padStart(5, "0")}.mp4`),
|
|
163
162
|
false,
|
|
164
163
|
"unnamed, it is judged against the furthest viewer, which is the leader"
|
|
165
164
|
);
|
|
@@ -169,25 +168,25 @@ test("the viewer who made the request is the one it is judged against", async ()
|
|
|
169
168
|
|
|
170
169
|
test("a seek moves the seeking viewer's own head, and nobody else's", async () => {
|
|
171
170
|
const { manager, dirPath } = await managerAfterSeek();
|
|
172
|
-
const session = manager.
|
|
171
|
+
const session = manager.outputs.get(SESSION_ID);
|
|
173
172
|
session.viewers = new Map();
|
|
174
173
|
const staying = SEGMENT_AT_SEEK - 40;
|
|
175
|
-
|
|
174
|
+
manager.viewers.of(session, "staying").position = {
|
|
176
175
|
segment: staying,
|
|
177
176
|
seconds: staying * SEGMENT_SECONDS,
|
|
178
177
|
at: Date.now()
|
|
179
178
|
};
|
|
180
179
|
|
|
181
180
|
const jumpTo = 120;
|
|
182
|
-
manager.requestSeek(SESSION_ID, jumpTo, "jumping");
|
|
181
|
+
manager.viewerRequests.requestSeek(SESSION_ID, jumpTo, "jumping");
|
|
183
182
|
|
|
184
183
|
assert.equal(
|
|
185
|
-
manager.requestStillWanted(SESSION_ID, `segment-${String(Math.floor(jumpTo / SEGMENT_SECONDS)).padStart(5, "0")}.mp4`, "jumping"),
|
|
184
|
+
manager.serving.requestStillWanted(SESSION_ID, `segment-${String(Math.floor(jumpTo / SEGMENT_SECONDS)).padStart(5, "0")}.mp4`, "jumping"),
|
|
186
185
|
true,
|
|
187
186
|
"the segment at the seek target — the request that raced the epoch in 2026-08-18"
|
|
188
187
|
);
|
|
189
188
|
assert.equal(
|
|
190
|
-
manager.requestStillWanted(SESSION_ID, `segment-${String(staying).padStart(5, "0")}.mp4`, "staying"),
|
|
189
|
+
manager.serving.requestStillWanted(SESSION_ID, `segment-${String(staying).padStart(5, "0")}.mp4`, "staying"),
|
|
191
190
|
true,
|
|
192
191
|
"somebody else's seek does not move where this viewer is"
|
|
193
192
|
);
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file A piece is closed by one of two writers, and both must say so.
|
|
3
|
+
*
|
|
4
|
+
* The `segment` muxer writes under a working name and reports the closure on a
|
|
5
|
+
* channel of its own, which reaches `SegmentStore.publish`. The `hls` muxer
|
|
6
|
+
* writes through a temporary name of its own (`+temp_file`) and reports
|
|
7
|
+
* nothing: the file simply appears under the name it is served as. That branch
|
|
8
|
+
* is taken by every re-encoded output cut on the even grid — an ordinary
|
|
9
|
+
* quality step — and for it a wait could only end on its deadline, so a segment
|
|
10
|
+
* lying finished on disk was answered 503 after the whole hold.
|
|
11
|
+
*/
|
|
12
|
+
|
|
13
|
+
import test from "node:test";
|
|
14
|
+
import assert from "node:assert/strict";
|
|
15
|
+
import { mkdtempSync, renameSync, rmSync, writeFileSync } from "node:fs";
|
|
16
|
+
import os from "node:os";
|
|
17
|
+
import path from "node:path";
|
|
18
|
+
import { SegmentStore } from "../services/storage/segment-store/SegmentStore.js";
|
|
19
|
+
import { fmp4Format } from "../services/encode/segment-formats/fmp4.js";
|
|
20
|
+
|
|
21
|
+
const KEY = "torrent:abc:fmt=fmp4:grid=uniform@0:video-only:v=libx264/854x480";
|
|
22
|
+
|
|
23
|
+
/** A deadline is the backstop of these waits, never what they measure. */
|
|
24
|
+
const BACKSTOP_MS = 10_000;
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* @returns {{ store: SegmentStore, root: string }}
|
|
28
|
+
*/
|
|
29
|
+
function storeInATempRoot() {
|
|
30
|
+
const root = mkdtempSync(path.join(os.tmpdir(), "segment-closed-"));
|
|
31
|
+
const store = new SegmentStore({ root, logger: { info: () => {}, warn: () => {} } });
|
|
32
|
+
store.useFormat(KEY, fmp4Format);
|
|
33
|
+
return { store, root };
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
test("a piece that simply appears ends the wait that began before it", async (t) => {
|
|
37
|
+
const { store, root } = storeInATempRoot();
|
|
38
|
+
t.after(() => {
|
|
39
|
+
store.dropAll("the test is over");
|
|
40
|
+
rmSync(root, { recursive: true, force: true });
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
const dir = store.directoryFor(KEY);
|
|
44
|
+
// The wait begins on a segment nobody has written yet — the cold case, and
|
|
45
|
+
// the only one the deadline used to decide.
|
|
46
|
+
const waited = store.waitFor(KEY, 7, BACKSTOP_MS);
|
|
47
|
+
|
|
48
|
+
// What the `hls` muxer does: a temporary name of its own, renamed into place
|
|
49
|
+
// when the piece is whole. Nothing is told; the directory simply moves.
|
|
50
|
+
const temp = path.join(dir, "segment-00007.mp4.tmp");
|
|
51
|
+
writeFileSync(temp, Buffer.alloc(64));
|
|
52
|
+
renameSync(temp, path.join(dir, fmp4Format.segmentFileName(7)));
|
|
53
|
+
|
|
54
|
+
assert.equal(await waited, true, "the piece was on disk and the wait did not end");
|
|
55
|
+
assert.ok(store.pathOf(KEY, 7), "and the store must be able to hand it over");
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
test("clearing up after a run is not its pieces arriving", async (t) => {
|
|
59
|
+
const { store, root } = storeInATempRoot();
|
|
60
|
+
t.after(() => {
|
|
61
|
+
store.dropAll("the test is over");
|
|
62
|
+
rmSync(root, { recursive: true, force: true });
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
const dir = store.directoryFor(KEY);
|
|
66
|
+
const unfinished = path.join(dir, fmp4Format.makingFileNameTemplate("3").replace("%05d", "00009"));
|
|
67
|
+
writeFileSync(unfinished, Buffer.alloc(64));
|
|
68
|
+
|
|
69
|
+
let ended = false;
|
|
70
|
+
// 200 ms is a grace before asserting that something did NOT happen, which can
|
|
71
|
+
// only ever pass too easily — never a measurement.
|
|
72
|
+
const waited = store.waitFor(KEY, 9, 200).then((value) => {
|
|
73
|
+
ended = value;
|
|
74
|
+
return value;
|
|
75
|
+
});
|
|
76
|
+
rmSync(unfinished, { force: true });
|
|
77
|
+
|
|
78
|
+
assert.equal(await waited, false, "a directory that moved because a file went holds nothing new");
|
|
79
|
+
assert.equal(ended, false);
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
test("the writer that does report a closure is unaffected", async (t) => {
|
|
83
|
+
const { store, root } = storeInATempRoot();
|
|
84
|
+
t.after(() => {
|
|
85
|
+
store.dropAll("the test is over");
|
|
86
|
+
rmSync(root, { recursive: true, force: true });
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
const dir = store.directoryFor(KEY);
|
|
90
|
+
const making = fmp4Format.makingFileNameTemplate("4").replace("%05d", "00004");
|
|
91
|
+
writeFileSync(path.join(dir, making), Buffer.alloc(64));
|
|
92
|
+
|
|
93
|
+
const waited = store.waitFor(KEY, 4, BACKSTOP_MS);
|
|
94
|
+
assert.equal(store.publish(KEY, making, fmp4Format), fmp4Format.segmentFileName(4));
|
|
95
|
+
assert.equal(await waited, true);
|
|
96
|
+
});
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
|
|
13
13
|
import test from "node:test";
|
|
14
14
|
import assert from "node:assert/strict";
|
|
15
|
-
import { segmentCutTimesFrom } from "../services/
|
|
15
|
+
import { segmentCutTimesFrom } from "../services/encode/run-command.js";
|
|
16
16
|
|
|
17
17
|
test("cut times are the interior boundaries, rebased on the run start", () => {
|
|
18
18
|
// Segments 0-10, 10-20, 20-30, 30-40 (file ends at 40).
|
|
@@ -10,6 +10,13 @@
|
|
|
10
10
|
* `research/hls-seek-prior-art-2026-08-02.md` prescribed this guard from
|
|
11
11
|
* `hls-media-server` — one outstanding wait per session — and it was never
|
|
12
12
|
* built.
|
|
13
|
+
*
|
|
14
|
+
* WHAT IS LEFT HERE IS THE ROUTE'S OWN BEHAVIOUR: a segment that arrives while
|
|
15
|
+
* a request is held must still be served. The release itself moved to
|
|
16
|
+
* `test/seek-frees-the-viewers-requests.test.js`, and the check that stood here
|
|
17
|
+
* is why: it replaced `waitForSegment` with a function returning true and moved
|
|
18
|
+
* the epoch by hand, so it described the route against a stand-in and passed
|
|
19
|
+
* for months while no seek moved that epoch at all.
|
|
13
20
|
*/
|
|
14
21
|
|
|
15
22
|
import test from "node:test";
|
|
@@ -40,47 +47,33 @@ function recordingReply() {
|
|
|
40
47
|
return { reply, sent };
|
|
41
48
|
}
|
|
42
49
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
50
|
+
/**
|
|
51
|
+
* What the file route asks of the viewer operations besides the hold itself:
|
|
52
|
+
* whether the request's generation is still taken, the record of what answered
|
|
53
|
+
* it, and the hold a response keeps. Everything is taken and recorded nowhere,
|
|
54
|
+
* because these checks are about the hold.
|
|
55
|
+
*
|
|
56
|
+
* @param {object} serving
|
|
57
|
+
* @returns {object}
|
|
58
|
+
*/
|
|
59
|
+
const routeViewerRequests = (serving) => ({
|
|
60
|
+
...serving,
|
|
61
|
+
acceptsRequest: () => true,
|
|
62
|
+
noteAnsweredDirectly: () => {},
|
|
63
|
+
holdResponse: () => () => {}
|
|
46
64
|
});
|
|
47
65
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
const hlsSessionManager = {
|
|
52
|
-
nextRequestSeq: () => 1,
|
|
53
|
-
seekEpoch: () => epoch,
|
|
54
|
-
// The viewer seeked AWAY from this segment, so it is genuinely stale. A
|
|
55
|
-
// request for the segment they seeked TO is kept instead — see
|
|
56
|
-
// `test/seek-target-not-superseded.test.js`.
|
|
57
|
-
requestStillWanted: () => false,
|
|
58
|
-
viewerPositionOf: () => 0,
|
|
59
|
-
async getFileStream() {
|
|
60
|
-
polls += 1;
|
|
61
|
-
// The viewer moves while this request is being held.
|
|
62
|
-
if (polls === 2) {
|
|
63
|
-
epoch += 1;
|
|
64
|
-
}
|
|
65
|
-
return { kind: "warming-up" };
|
|
66
|
-
}
|
|
67
|
-
};
|
|
68
|
-
|
|
69
|
-
const { reply, sent } = recordingReply();
|
|
70
|
-
const startedAt = Date.now();
|
|
71
|
-
await handleTranscodeSessionFileGet(request("segment-00609.mp4"), reply, { hlsSessionManager });
|
|
72
|
-
const heldMs = Date.now() - startedAt;
|
|
73
|
-
|
|
74
|
-
assert.equal(sent.code, 503, "the player must get a retryable answer, not a stream");
|
|
75
|
-
assert.equal(sent.headers["retry-after"], "0", "nothing to wait for — this segment is not being watched");
|
|
76
|
-
assert.ok(heldMs < 5_000, `the request was held ${heldMs}ms after the seek`);
|
|
66
|
+
const request = (fileName) => ({
|
|
67
|
+
params: { sessionId: "1111111122223333", fileName },
|
|
68
|
+
raw: { on() {}, off() {} }
|
|
77
69
|
});
|
|
78
70
|
|
|
79
71
|
test("without a seek the request is still held until the segment appears", async () => {
|
|
80
72
|
let polls = 0;
|
|
81
|
-
const
|
|
82
|
-
nextRequestSeq: () => 1,
|
|
73
|
+
const serving = {
|
|
83
74
|
seekEpoch: () => 7,
|
|
75
|
+
// The segment is published between polls.
|
|
76
|
+
waitForSegment: async () => true,
|
|
84
77
|
async getFileStream() {
|
|
85
78
|
polls += 1;
|
|
86
79
|
if (polls < 3) {
|
|
@@ -91,7 +84,7 @@ test("without a seek the request is still held until the segment appears", async
|
|
|
91
84
|
};
|
|
92
85
|
|
|
93
86
|
const { reply, sent } = recordingReply();
|
|
94
|
-
await handleTranscodeSessionFileGet(request("segment-00610.mp4"), reply, {
|
|
87
|
+
await handleTranscodeSessionFileGet(request("segment-00610.mp4"), reply, { serving: serving, viewerRequests: routeViewerRequests(serving) });
|
|
95
88
|
|
|
96
89
|
assert.equal(sent.body, "bytes", "a segment that arrives late must still be served");
|
|
97
90
|
assert.equal(sent.headers["content-type"], "video/mp4");
|