@editframe/assets 0.11.0-beta.9 → 0.12.0-beta.2

package/dist/MP4File.js

@@ -123,14 +123,16 @@ class MP4File extends MP4Box.ISOFile {
             if (trak.nextSample >= trak.samples.length) {
               trackInfoForFrag.complete = true;
             }
-            log(
-              `Yielding fragment #${trackInfoForFrag.index} for track=${fragTrak.id}`
-            );
             const startSample = fragmentStartSamples[fragTrak.id];
             const endSample = trak.samples[trak.nextSample - 1];
             if (!startSample || !endSample) {
               throw new Error("startSample or endSample is undefined");
             }
+            log(
+              `Yielding fragment #${trackInfoForFrag.index} for track=${fragTrak.id}`,
+              `startTime=${startSample.cts}`,
+              `endTime=${endSample.cts + endSample.duration}`
+            );
             yield {
               track: fragTrak.id,
               segment: trackInfoForFrag.index,

package/dist/Probe.js

@@ -84,8 +84,6 @@ class Probe {
     return new Probe(absolutePath, json);
   }
   static async probeStream(stream) {
-    const probeCommand = "ffprobe -i pipe:0 -v error -show_format -show_streams -of json";
-    log("Probing", probeCommand);
     const probe = spawn(
       "ffprobe",
       [
@@ -98,35 +96,52 @@ class Probe {
         "-of",
         "json"
       ],
-      {
-        stdio: ["pipe", "pipe", "pipe"]
-      }
+      { stdio: ["pipe", "pipe", "pipe"] }
     );
     const chunks = [];
+    const processExit = new Promise((_, reject) => {
+      probe.on("exit", (code) => {
+        if (code !== 0) {
+          reject(new Error(`ffprobe exited with code ${code}`));
+        }
+      });
+      probe.on("error", (err) => reject(err));
+    });
     probe.stderr.on("data", (data) => {
       log(data.toString());
     });
     probe.stdout.on("data", (data) => {
       chunks.push(data);
     });
-    stream.pipe(probe.stdin);
     probe.stdin.on("error", (error) => {
+      if (error.code === "EPIPE") {
+        log("ffprobe closed input pipe");
+        return;
+      }
       log("ffprobe stdin error", error);
     });
-    const json = await new Promise((resolve, reject) => {
-      probe.stdout.on("end", () => {
-        stream.unpipe(probe.stdin);
-        stream.destroy();
-        try {
-          const buffer = Buffer.concat(chunks).toString("utf8");
-          log("Got probe from stream", buffer);
-          resolve(JSON.parse(buffer));
-        } catch (error) {
-          reject(error);
-        }
-      });
-    });
-    return new Probe("pipe:0", json);
+    stream.pipe(probe.stdin);
+    try {
+      const json = await Promise.race([
+        new Promise((resolve, reject) => {
+          probe.stdout.on("end", () => {
+            try {
+              const buffer = Buffer.concat(chunks).toString("utf8");
+              log("Got probe from stream", buffer);
+              resolve(JSON.parse(buffer));
+            } catch (error) {
+              reject(error);
+            }
+          });
+        }),
+        processExit
+      ]);
+      return new Probe("pipe:0", json);
+    } finally {
+      stream.unpipe(probe.stdin);
+      probe.stdin.end();
+      stream.destroy();
+    }
   }
   get audioStreams() {
     return this.data.streams.filter(

package/dist/tasks/generateTrack.js

@@ -10,20 +10,37 @@ const generateTrackFromPath = async (absolutePath, trackId) => {
   const probe = await Probe.probePath(absolutePath);
   const readStream = probe.createConformingReadstream();
   const mp4File = new MP4File();
+  const trackStream = new PassThrough();
   log(`Generating track for ${absolutePath}`);
   readStream.pipe(mp4FileWritable(mp4File));
-  await new Promise((resolve, reject) => {
-    readStream.on("end", resolve);
-    readStream.on("error", reject);
-  });
-  const trackStream = new PassThrough();
-  for await (const fragment of mp4File.fragmentIterator()) {
-    if (fragment.track !== trackId) {
-      continue;
+  (async () => {
+    try {
+      let bytesWritten = 0;
+      for await (const fragment of mp4File.fragmentIterator()) {
+        log("Writing fragment", fragment);
+        if (fragment.track === trackId) {
+          const written = trackStream.write(
+            Buffer.from(fragment.data),
+            "binary"
+          );
+          if (!written) {
+            log(`Waiting for drain for track ${trackId}`);
+            await new Promise((resolve) => trackStream.once("drain", resolve));
+          }
+          bytesWritten += fragment.data.byteLength;
+        }
+        if (!readStream.readableEnded) {
+          await Promise.race([
+            new Promise((resolve) => readStream.once("end", resolve)),
+            new Promise((resolve) => readStream.once("data", resolve))
+          ]);
+        }
+      }
+      trackStream.end();
+    } catch (error) {
+      trackStream.destroy(error);
     }
-    trackStream.write(Buffer.from(fragment.data), "binary");
-  }
-  trackStream.end();
+  })();
   return trackStream;
 };
 const generateTrackTask = idempotentTask({
@@ -33,9 +50,9 @@ const generateTrackTask = idempotentTask({
 });
 const generateTrack = async (cacheRoot, absolutePath, url) => {
   try {
-    const trackId = new URL(
-      `http://localhost${url}` ?? "bad-url"
-    ).searchParams.get("trackId");
+    const trackId = new URL(`http://localhost${url}`).searchParams.get(
+      "trackId"
+    );
     if (trackId === null) {
       throw new Error(
         "No trackId provided. IT must be specified in the query string: ?trackId=0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editframe/assets",
-  "version": "0.11.0-beta.9",
+  "version": "0.12.0-beta.2",
   "description": "",
   "exports": {
     ".": {

package/src/tasks/generateTrack.ts

@@ -14,24 +14,46 @@ export const generateTrackFromPath = async (
   const probe = await Probe.probePath(absolutePath);
   const readStream = probe.createConformingReadstream();
   const mp4File = new MP4File();
+  const trackStream = new PassThrough();
 
   log(`Generating track for ${absolutePath}`);
+
+  // Set up pipe and processing of fragments
   readStream.pipe(mp4FileWritable(mp4File));
 
-  await new Promise((resolve, reject) => {
-    readStream.on("end", resolve);
-    readStream.on("error", reject);
-  });
+  // Process fragments as they become available
+  (async () => {
+    try {
+      let bytesWritten = 0;
+      for await (const fragment of mp4File.fragmentIterator()) {
+        log("Writing fragment", fragment);
+        if (fragment.track === trackId) {
+          const written = trackStream.write(
+            Buffer.from(fragment.data),
+            "binary",
+          );
+          if (!written) {
+            log(`Waiting for drain for track ${trackId}`);
+            await new Promise((resolve) => trackStream.once("drain", resolve));
+          }
+          bytesWritten += fragment.data.byteLength;
+        }
+        // There is a race condition where the mp4file writable doesn't correctly wait for the whole readSTream
+        // Waiting for data/end events seems to fix it
+        // FIXME: This is a hack, we should fix the root issue in MP4File
+        if (!readStream.readableEnded) {
+          await Promise.race([
+            new Promise((resolve) => readStream.once("end", resolve)),
+            new Promise((resolve) => readStream.once("data", resolve)),
+          ]);
+        }
+      }
 
-  const trackStream = new PassThrough();
-
-  for await (const fragment of mp4File.fragmentIterator()) {
-    if (fragment.track !== trackId) {
-      continue;
+      trackStream.end();
+    } catch (error) {
+      trackStream.destroy(error as Error);
     }
-    trackStream.write(Buffer.from(fragment.data), "binary");
-  }
-  trackStream.end();
+  })();
 
   return trackStream;
 };
@@ -49,9 +71,9 @@ export const generateTrack = async (
   url: string,
 ) => {
   try {
-    const trackId = new URL(
-      `http://localhost${url}` ?? "bad-url",
-    ).searchParams.get("trackId");
+    const trackId = new URL(`http://localhost${url}`).searchParams.get(
+      "trackId",
+    );
     if (trackId === null) {
       throw new Error(
         "No trackId provided. IT must be specified in the query string: ?trackId=0",