@editframe/assets 0.12.0-beta.1 → 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/tasks/generateTrack.js

@@ -15,9 +15,25 @@ const generateTrackFromPath = async (absolutePath, trackId) => {
   readStream.pipe(mp4FileWritable(mp4File));
   (async () => {
     try {
+      let bytesWritten = 0;
       for await (const fragment of mp4File.fragmentIterator()) {
+        log("Writing fragment", fragment);
         if (fragment.track === trackId) {
-          trackStream.write(Buffer.from(fragment.data), "binary");
+          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();

package/package.json

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

package/src/tasks/generateTrack.ts

@@ -24,11 +24,31 @@ export const generateTrackFromPath = async (
   // 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) {
-          trackStream.write(Buffer.from(fragment.data), "binary");
+          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)),
+          ]);
         }
       }
+
       trackStream.end();
     } catch (error) {
       trackStream.destroy(error as Error);