@torrent-tv/proxy 2.13.0 → 2.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torrent-tv/proxy",
-  "version": "2.13.0",
+  "version": "2.14.1",
   "description": "Torrent proxy client that exposes webseed-like HTTP stream endpoint.",
   "license": "GPL-3.0-or-later",
   "publishConfig": {

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

@@ -73,6 +73,11 @@ export async function handleApiTranscodeSessionsPost(req, reply, { hlsSessionMan
   // (capped to source), with the realtime budget's auto-downscale + runtime
   // downswitch disabled for the session.
   const manualQuality = payload.manualQuality === true;
+  // Whether this browser will take its audio from a separate rendition group in
+  // the master playlist rather than muxed into the picture. It has to say so:
+  // publishing renditions AND muxing the same audio would play it twice, while
+  // a browser that does not know about them would get no sound at all.
+  const audioRenditions = payload.audioRenditions === true;
   const startPositionSeconds = Number(payload.startPositionSeconds);
   const audioTrackIndex = Number(payload.audioTrackIndex);
   // Which container to produce. The browser knows what its media stack will
@@ -96,6 +101,7 @@ export async function handleApiTranscodeSessionsPost(req, reply, { hlsSessionMan
       targetWidth: Number.isInteger(targetWidth) && targetWidth > 0 ? targetWidth : 0,
       targetHeight: Number.isInteger(targetHeight) && targetHeight > 0 ? targetHeight : 0,
       manualQuality,
+      audioRenditions,
       startPositionSeconds:
         Number.isFinite(startPositionSeconds) && startPositionSeconds > 0
           ? startPositionSeconds

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

@@ -0,0 +1,45 @@
+/**
+ * @file GET /transcode/:sessionId/a/:trackIndex/:fileName — one file of an audio
+ * rendition.
+ *
+ * A rendition is one audio track of the file, encoded once and shared by every
+ * quality rung, published in the master playlist as `#EXT-X-MEDIA`. It is an
+ * ordinary session underneath, living one directory level below the base
+ * session so every relative name inside its playlist resolves to it unchanged —
+ * the same arrangement quality variants use.
+ *
+ * Unlike a variant, a rendition is fetched ALONGSIDE the picture rather than
+ * instead of it: both encoders run, one for the rung and one for the audio.
+ */
+
+import { 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
+ * @returns {Promise<void>}
+ */
+export async function handleTranscodeAudioFileGet(req, reply, { hlsSessionManager }) {
+  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 : "";
+
+  const resolved = await hlsSessionManager.resolveAudioRenditionFile(baseSessionId, trackIndex, fileName);
+  if (resolved.error) {
+    // Retryable, like every other not-ready answer on this path: a 500 for a
+    // rendition playlist would end the stream over something the next attempt
+    // may well get past.
+    reply.header("Retry-After", "1");
+    return reply.code(503).send({ error: `Could not prepare the audio rendition: ${resolved.error}` });
+  }
+  if (!resolved.sessionId) {
+    return reply.code(404).send({ error: "No such audio rendition for this transcode session." });
+  }
+
+  return serveSessionFile(req, reply, {
+    hlsSessionManager,
+    sessionId: resolved.sessionId,
+    fileName
+  });
+}

package/server.js

@@ -30,6 +30,7 @@ import { handleApiTranscodeSessionSeekPost } from "./routes/api/transcode-sessio
 import { handleStreamGet } from "./routes/stream/get.js";
 import { handleTranscodeSessionFileGet } from "./routes/transcode/session-file/get.js";
 import { handleTranscodeVariantFileGet } from "./routes/transcode/variant-file/get.js";
+import { handleTranscodeAudioFileGet } from "./routes/transcode/audio-file/get.js";
 import { handleTranscodeVariantWarmGet } from "./routes/transcode/variant-warm/get.js";
 import { createSourceRegistry } from "./store/source-registry.js";
 import { WorkerTorrentPool } from "./services/torrent-worker/pool-adapter.js";
@@ -173,7 +174,10 @@ export async function startProxyServer({ host, port, transcodeAudio, ffmpegBin,
     // Reuse the media info the planner already probed for this file (same
     // ffmpeg scan) so createSession skips its own probe. Late-bound: invoked
     // only at session-create time, after playbackPlanner is initialised.
-    getCachedMediaInfo: (params) => playbackPlanner.getCachedMediaInfo(params)
+    getCachedMediaInfo: (params) => playbackPlanner.getCachedMediaInfo(params),
+    // The file's audio tracks, for the master playlist's rendition group. Already
+    // probed for the browser's audio menu; read from there rather than probed again.
+    getCachedAudioTracks: (params) => playbackPlanner.getCachedAudioTracks(params)
   });
   const playbackPlanner = createPlaybackPlanner({
     ffmpegBin,
@@ -245,6 +249,9 @@ export async function startProxyServer({ host, port, transcodeAudio, ffmpegBin,
   app.get("/transcode/:sessionId/v/:height/warm", async (req, reply) =>
     handleTranscodeVariantWarmGet(req, reply, { hlsSessionManager })
   );
+  app.get("/transcode/:sessionId/a/:trackIndex/:fileName", async (req, reply) =>
+    handleTranscodeAudioFileGet(req, reply, { hlsSessionManager })
+  );
   app.get("/transcode/:sessionId/v/:height/:fileName", async (req, reply) =>
     handleTranscodeVariantFileGet(req, reply, { hlsSessionManager })
   );