@torrent-tv/proxy 2.85.1 → 2.87.0

package/routes/api/transcode-sessions/seek/post.js

@@ -23,10 +23,10 @@
 /**
  * @param {import("fastify").FastifyRequest} req
  * @param {import("fastify").FastifyReply} reply
- * @param {{ hlsSessionManager: import("../../../../services/hls-session-manager.js").HlsSessionManager }} deps
+ * @param {{ viewerRequests: object }} deps
  * @returns {Promise<void>}
  */
-export async function handleApiTranscodeSessionSeekPost(req, reply, { hlsSessionManager }) {
+export async function handleApiTranscodeSessionSeekPost(req, reply, { viewerRequests }) {
   const sessionId = req.params?.sessionId;
   const body = req.body && typeof req.body === "object" ? req.body : {};
   const positionSeconds = Number(body.positionSeconds);
@@ -40,7 +40,16 @@ export async function handleApiTranscodeSessionSeekPost(req, reply, { hlsSession
   // has to move with them or their next request is judged against where they
   // were before the jump.
   const consumerId = typeof body.consumerId === "string" ? body.consumerId.trim() : "";
-  const applied = hlsSessionManager.requestSeek(sessionId, positionSeconds, consumerId);
+  if (!consumerId) {
+    reply.code(400);
+    return reply.send({ error: "consumerId is required." });
+  }
+  // Which viewing their requests now belong to. The page raises this before it
+  // sends anything and stamps every request with it, so a request that crosses
+  // this message is still read against the viewing it was made in. A page that
+  // states nothing leaves the generation where it is.
+  const generation = Number(body.generation);
+  const applied = viewerRequests.requestSeek(sessionId, positionSeconds, consumerId, generation);
   if (!applied) {
     // Unknown or disposed session — nothing to steer. Not an error worth
     // surfacing to the viewer: the seek will be handled by whatever session

package/routes/stream/get.js

@@ -45,7 +45,7 @@ const TORRENT_READY_TIMEOUT_MS = 10_000;
  * The underlying add is NOT cancelled: it keeps running and warms the pool, so
  * the client's next attempt is likely to find it ready.
  *
- * @param {import("../../services/torrent-pool.js").TorrentPool} torrentPool
+ * @param {import("../../services/torrent/torrent-pool.js").TorrentPool} torrentPool
  * @param {string} sourceType
  * @param {string} source
  * @returns {Promise<import("webtorrent").Torrent>}
@@ -76,7 +76,7 @@ async function waitForTorrent(torrentPool, sourceType, source) {
  *
  * @param {import("fastify").FastifyRequest} req
  * @param {import("fastify").FastifyReply} reply
- * @param {{ sourceRegistry: ReturnType<import("../../store/source-registry.js").createSourceRegistry>, torrentPool: import("../../services/torrent-pool.js").TorrentPool }} deps
+ * @param {{ sourceRegistry: ReturnType<import("../../store/source-registry.js").createSourceRegistry>, torrentPool: import("../../services/torrent/torrent-pool.js").TorrentPool }} deps
  * @returns {Promise<void>}
  */
 /**

package/routes/transcode/audio-file/get.js

@@ -12,15 +12,15 @@
  * instead of it: both encoders run, one for the rung and one for the audio.
  */
 
-import { serveSessionFile } from "../session-file/get.js";
+import { consumerOf, refusedAsStale, serveSessionFile } from "../session-file/get.js";
 
 /**
  * @param {import("fastify").FastifyRequest} req
  * @param {import("fastify").FastifyReply} reply
- * @param {{ hlsSessionManager: import("../../../services/hls-session-manager.js").HlsSessionManager }} deps
+ * @param {{ renditions: object, serving: object, viewerRequests: object }} deps
  * @returns {Promise<void>}
  */
-export async function handleTranscodeAudioFileGet(req, reply, { hlsSessionManager }) {
+export async function handleTranscodeAudioFileGet(req, reply, { renditions, serving, viewerRequests }) {
   const baseSessionId = typeof req.params.sessionId === "string" ? req.params.sessionId : "";
   const trackIndex = Number(req.params.trackIndex);
   const fileName = typeof req.params.fileName === "string" ? req.params.fileName : "";
@@ -29,8 +29,16 @@ export async function handleTranscodeAudioFileGet(req, reply, { hlsSessionManage
   // soundtrack each of them chose is their own: without this, a segment request
   // from one viewer would be read as everybody moving to that track, and the
   // other viewer's encoder would be stopped once per segment.
-  const consumerId = typeof req.query?.consumer === "string" ? req.query.consumer : "";
-  const resolved = await hlsSessionManager.resolveAudioRenditionFile(
+  const consumerId = consumerOf(req);
+  // Before resolving, for the same reason as a step's: resolving can make the
+  // soundtrack and registers this viewer on it. A soundtrack keeps no record of
+  // what answered a repeat — it is not a height — but a request for a viewing
+  // that has been left is refused here like any other, and the response that
+  // does go out holds its output while it is being sent (`serveSessionFile`).
+  if (refusedAsStale(req, reply, viewerRequests, fileName)) {
+    return reply;
+  }
+  const resolved = await renditions.resolveAudioRenditionFile(
     baseSessionId,
     trackIndex,
     fileName,
@@ -48,7 +56,8 @@ export async function handleTranscodeAudioFileGet(req, reply, { hlsSessionManage
   }
 
   return serveSessionFile(req, reply, {
-    hlsSessionManager,
+    serving,
+    viewerRequests,
     sessionId: resolved.sessionId,
     fileName
   });

package/routes/transcode/audio-warm/get.js

@@ -20,9 +20,9 @@ const WARM_WAIT_MS = 12_000;
 /**
  * @param {import("fastify").FastifyRequest} req
  * @param {import("fastify").FastifyReply} reply
- * @param {{ hlsSessionManager: import("../../../services/hls-session-manager.js").HlsSessionManager }} deps
+ * @param {{ renditions: object, serving: object, viewerRequests: object }} deps
  */
-export async function handleTranscodeAudioWarmGet(req, reply, { hlsSessionManager }) {
+export async function handleTranscodeAudioWarmGet(req, reply, { renditions, serving, viewerRequests }) {
   const baseSessionId = typeof req.params.sessionId === "string" ? req.params.sessionId : "";
   const trackIndex = Number(req.params.track);
   const positionSeconds = Number(req.query?.position);
@@ -40,10 +40,13 @@ export async function handleTranscodeAudioWarmGet(req, reply, { hlsSessionManage
   // listening to something else, and preparing a track must not be read as
   // everybody moving to it.
   const consumerId = typeof req.query?.consumer === "string" ? req.query.consumer : "";
+  if (!consumerId) {
+    return reply.code(400).send({ error: "A consumer is required." });
+  }
 
   let prepared;
   try {
-    prepared = await hlsSessionManager.prepareAudioTrack(
+    prepared = await renditions.prepareAudioTrack(
       baseSessionId,
       trackIndex,
       positionSeconds,
@@ -59,10 +62,10 @@ export async function handleTranscodeAudioWarmGet(req, reply, { hlsSessionManage
   }
 
   const result = await waitForSessionFile(
-    hlsSessionManager,
+    serving,
     prepared.sessionId,
     prepared.fileName,
-    WARM_WAIT_MS
+    { holdMs: WARM_WAIT_MS }
   );
   if (result.kind === "file") {
     // The bytes are the player's to fetch; the handle opened to reach them is