@torrent-tv/proxy 2.104.2 → 2.105.1

package/package.json

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

package/services/media/ContainerOrchestrator.js

@@ -155,7 +155,11 @@ export class ContainerOrchestrator {
     // picture's first input of an AVI waited about 4 s behind the sound's
     // table of the whole film it does not use (r38, torrent-tv/meta#178).
     const aside = this.#answersWithoutReading(key, statement);
-    const previous = aside ? Promise.resolve() : this.#reads.get(key) ?? Promise.resolve();
+    // Chapter discovery can walk a whole file when the format has no chapter
+    // index. Keep it serial with other chapter reads, but out of the queue used
+    // to prepare playback inputs for this file.
+    const queueKey = statement === "chapters" ? `${key}:chapters` : key;
+    const previous = aside ? Promise.resolve() : this.#reads.get(queueKey) ?? Promise.resolve();
     const askedAt = performance.now();
     const reading = previous.catch(() => undefined).then(async () => {
       if (!isCurrent()) return { result: { kind: "terminal", reason: "request-obsolete", requestId: params.requestId } };
@@ -168,7 +172,7 @@ export class ContainerOrchestrator {
         readMs: endedAt - startedAt, cached: aside, result: result.kind, reason: result.reason, ranges: result.ranges });
       return { result, revision };
     });
-    if (!aside) this.#reads.set(key, reading);
+    if (!aside) this.#reads.set(queueKey, reading);
     try {
       const { result, revision } = await reading;
       if (!isCurrent()) return { kind: "terminal", reason: "request-obsolete", requestId: params.requestId };
@@ -177,7 +181,7 @@ export class ContainerOrchestrator {
       await params.onReadResult?.(statement, result, revision);
       return result;
     } finally {
-      if (this.#reads.get(key) === reading) this.#reads.delete(key);
+      if (this.#reads.get(queueKey) === reading) this.#reads.delete(queueKey);
     }
   }
 

package/services/media/container/matroska-chapters.js

@@ -11,11 +11,12 @@ const TOP_LEVEL = new Set([SEEK_HEAD, CHAPTERS, CLUSTER, 0x1549a966, 0x1654ae6b,
 async function header(reader, at, limit) {
   reader.step();
   const vint = async (position, marker) => {
-    const first = (await reader.bytes(position, 1))[0];
+    const firstBytes = await reader.bytes(position, 1);
+    const first = firstBytes[0];
     let n = 1;
     while (n <= 8 && !(first & (0x80 >> (n - 1)))) n++;
     if (n > (marker ? 4 : 8) || position + n > limit) throw new Error("Invalid chapter EBML header");
-    const bytes = await reader.bytes(position, n);
+    const bytes = n === 1 ? firstBytes : Buffer.concat([firstBytes, await reader.bytes(position + 1, n - 1)]);
     const value = readVint(bytes, 0, marker);
     const mask = 2 ** (8 - n) - 1;
     return { ...value, unknown: !marker && (bytes[0] & mask) === mask && bytes.subarray(1).every((byte) => byte === 255) };

package/services/torrent/naming.js

@@ -608,12 +608,30 @@ export function sidecarNaming({ folders, fileName, videoName = "" }) {
     stripExtension(String(videoName ?? ""))
   );
   const language = fromName.language ?? languageFromFolderNames(folders);
+  const title = titleOf(fromName.title);
+  const team = teamFrom({ folders, fileName, videoName });
   return {
     code: language?.code ?? null,
     name: language?.name ?? null,
-    releaser: titleOf(fromName.title) ?? releaserFrom({ folders, fileName, videoName }),
+    // Keep releaser unchanged: subtitle identity uses this value across episodes.
+    releaser: title ?? releaserFrom({ folders, fileName, videoName }),
+    team,
+    title,
     isForced: fromName.isForced,
     isHearingImpaired: fromName.isHearingImpaired,
     isDefault: fromName.isDefault
   };
 }
+
+/**
+ * A team is only a distinct bracketed name. Generic track titles are not teams.
+ * @param {{ folders: string[], fileName: string, videoName?: string }} params
+ * @returns {string | null}
+ */
+function teamFrom({ folders, fileName, videoName = "" }) {
+  const team = releaserFrom({ folders, fileName, videoName });
+  if (!team || /^(?:full|signs?|commentary)$/iu.test(team.trim())) {
+    return null;
+  }
+  return team;
+}