@editframe/assets 0.12.0-beta.2 → 0.12.0-beta.20

package/dist/EncodedAsset.js

@@ -13,7 +13,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   return result;
 };
 const log = debug("ef:av");
-const BUFFER_SIZE = 10;
+const BUFFER_SIZE = 30;
 class AssetNotAvailableLocally extends Error {
 }
 class FileAsset {
@@ -232,6 +232,10 @@ const _VideoAsset = class _VideoAsset2 extends ISOFileAsset {
         duration: sample.duration,
         type: sample.is_sync ? "key" : "delta"
       });
+      if (this.videoDecoder.state === "closed") {
+        console.info("Decoder closed, skipping decode");
+        continue;
+      }
       this.videoDecoder.decode(chunk);
       const nextSample = this.defaultVideoTrak?.samples?.[i + 1];
       if (nextSample === void 0) {

package/dist/MP4File.d.ts

@@ -10,7 +10,6 @@ export declare class MP4File extends MP4Box.ISOFile {
         track: number;
         segment: "init";
         data: ArrayBuffer;
-        complete: false;
         cts?: undefined;
         dts?: undefined;
         duration?: undefined;
@@ -18,7 +17,6 @@ export declare class MP4File extends MP4Box.ISOFile {
         track: number;
         segment: number;
         data: ArrayBuffer;
-        complete: boolean;
         cts: number;
         dts: number;
         duration: number;

package/dist/MP4File.js

@@ -40,13 +40,13 @@ class MP4File extends MP4Box.ISOFile {
     await this.readyPromise;
     const trackInfo = {};
     for (const videoTrack of this.getInfo().videoTracks) {
-      trackInfo[videoTrack.id] = { index: 0, complete: false };
+      trackInfo[videoTrack.id] = { index: 0 };
       this.setSegmentOptions(videoTrack.id, null, {
         rapAlignement: true
       });
     }
     for (const audioTrack of this.getInfo().audioTracks) {
-      trackInfo[audioTrack.id] = { index: 0, complete: false };
+      trackInfo[audioTrack.id] = { index: 0 };
       const sampleRate = audioTrack.audio.sample_rate;
       const probablePacketSize = 1024;
       const probableFourSecondsOfSamples = Math.ceil(
@@ -61,21 +61,12 @@ class MP4File extends MP4Box.ISOFile {
       yield {
         track: initSegment.id,
         segment: "init",
-        data: initSegment.buffer,
-        complete: false
+        data: initSegment.buffer
       };
     }
     const fragmentStartSamples = {};
     let finishedReading = false;
-    const allTracksFinished = () => {
-      for (const fragmentedTrack of this.fragmentedTracks) {
-        if (!trackInfo[fragmentedTrack.id]?.complete) {
-          return false;
-        }
-      }
-      return true;
-    };
-    while (!(finishedReading && allTracksFinished())) {
+    do {
       for (const fragTrak of this.fragmentedTracks) {
         const trak = fragTrak.trak;
         if (trak.nextSample === void 0) {
@@ -84,6 +75,8 @@ class MP4File extends MP4Box.ISOFile {
         if (trak.samples === void 0) {
           throw new Error("trak.samples is undefined");
         }
+        log("trak.nextSample", fragTrak.id, trak.nextSample);
+        log("trak.samples.length", fragTrak.id, trak.samples.length);
         while (trak.nextSample < trak.samples.length) {
           let result = void 0;
           const fragTrakNextSample = trak.samples[trak.nextSample];
@@ -120,9 +113,6 @@ class MP4File extends MP4Box.ISOFile {
             if (!trackInfoForFrag) {
               throw new Error("trackInfoForFrag is undefined");
             }
-            if (trak.nextSample >= trak.samples.length) {
-              trackInfoForFrag.complete = true;
-            }
             const startSample = fragmentStartSamples[fragTrak.id];
             const endSample = trak.samples[trak.nextSample - 1];
             if (!startSample || !endSample) {
@@ -137,7 +127,6 @@ class MP4File extends MP4Box.ISOFile {
               track: fragTrak.id,
               segment: trackInfoForFrag.index,
               data: fragTrak.segmentStream.buffer,
-              complete: trackInfoForFrag.complete,
               cts: startSample.cts,
               dts: startSample.dts,
               duration: endSample.cts - startSample.cts + endSample.duration
@@ -149,6 +138,68 @@ class MP4File extends MP4Box.ISOFile {
         }
       }
       finishedReading = await this.waitForMoreSamples();
+    } while (!finishedReading);
+    for (const fragTrak of this.fragmentedTracks) {
+      const trak = fragTrak.trak;
+      if (trak.nextSample === void 0) {
+        throw new Error("trak.nextSample is undefined");
+      }
+      if (trak.samples === void 0) {
+        throw new Error("trak.samples is undefined");
+      }
+      while (trak.nextSample < trak.samples.length) {
+        let result = void 0;
+        try {
+          result = this.createFragment(
+            fragTrak.id,
+            trak.nextSample,
+            fragTrak.segmentStream
+          );
+        } catch (error) {
+          console.error("Failed to createFragment", error);
+        }
+        if (result) {
+          fragTrak.segmentStream = result;
+          trak.nextSample++;
+        } else {
+          finishedReading = await this.waitForMoreSamples();
+          break;
+        }
+        const nextSample = trak.samples[trak.nextSample];
+        const emitSegment = (
+          // if rapAlignement is true, we emit a fragment when we have a rap sample coming up next
+          fragTrak.rapAlignement === true && nextSample?.is_sync || // if rapAlignement is false, we emit a fragment when we have the required number of samples
+          !fragTrak.rapAlignement && trak.nextSample % fragTrak.nb_samples === 0 || // if we have more samples than the number of samples requested, we emit the fragment
+          trak.nextSample >= trak.samples.length
+        );
+        if (emitSegment) {
+          const trackInfoForFrag = trackInfo[fragTrak.id];
+          if (!trackInfoForFrag) {
+            throw new Error("trackInfoForFrag is undefined");
+          }
+          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,
+            data: fragTrak.segmentStream.buffer,
+            cts: startSample.cts,
+            dts: startSample.dts,
+            duration: endSample.cts - startSample.cts + endSample.duration
+          };
+          trackInfoForFrag.index += 1;
+          fragTrak.segmentStream = null;
+          delete fragmentStartSamples[fragTrak.id];
+        }
+      }
     }
   }
   waitForMoreSamples() {

package/dist/Probe.d.ts

@@ -130,6 +130,20 @@ export declare const VideoStreamSchema: z.ZodObject<{
     bit_rate?: string | undefined;
 }>;
 export type VideoStreamSchema = z.infer<typeof VideoStreamSchema>;
+export declare const DataStreamSchema: z.ZodObject<{
+    index: z.ZodNumber;
+    codec_type: z.ZodLiteral<"data">;
+    duration: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    index: number;
+    codec_type: "data";
+    duration?: string | undefined;
+}, {
+    index: number;
+    codec_type: "data";
+    duration?: string | undefined;
+}>;
+export type DataStreamSchema = z.infer<typeof DataStreamSchema>;
 declare const StreamSchema: z.ZodDiscriminatedUnion<"codec_type", [z.ZodObject<{
     index: z.ZodNumber;
     codec_name: z.ZodString;
@@ -256,6 +270,18 @@ declare const StreamSchema: z.ZodDiscriminatedUnion<"codec_type", [z.ZodObject<{
     start_time?: number | undefined;
     duration_ts?: number | undefined;
     bit_rate?: string | undefined;
+}>, z.ZodObject<{
+    index: z.ZodNumber;
+    codec_type: z.ZodLiteral<"data">;
+    duration: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    index: number;
+    codec_type: "data";
+    duration?: string | undefined;
+}, {
+    index: number;
+    codec_type: "data";
+    duration?: string | undefined;
 }>]>;
 export type StreamSchema = z.infer<typeof StreamSchema>;
 declare const ProbeSchema: z.ZodObject<{
@@ -385,6 +411,18 @@ declare const ProbeSchema: z.ZodObject<{
         start_time?: number | undefined;
         duration_ts?: number | undefined;
         bit_rate?: string | undefined;
+    }>, z.ZodObject<{
+        index: z.ZodNumber;
+        codec_type: z.ZodLiteral<"data">;
+        duration: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        index: number;
+        codec_type: "data";
+        duration?: string | undefined;
+    }, {
+        index: number;
+        codec_type: "data";
+        duration?: string | undefined;
     }>]>, "many">;
     format: z.ZodObject<{
         filename: z.ZodString;
@@ -475,6 +513,10 @@ declare const ProbeSchema: z.ZodObject<{
         start_time?: number | undefined;
         duration_ts?: number | undefined;
         bit_rate?: string | undefined;
+    } | {
+        index: number;
+        codec_type: "data";
+        duration?: string | undefined;
     })[];
 }, {
     format: {
@@ -531,8 +573,13 @@ declare const ProbeSchema: z.ZodObject<{
         start_time?: number | undefined;
         duration_ts?: number | undefined;
         bit_rate?: string | undefined;
+    } | {
+        index: number;
+        codec_type: "data";
+        duration?: string | undefined;
     })[];
 }>;
+export type ProbeSchema = z.infer<typeof ProbeSchema>;
 export interface TrackSegment {
     cts: number;
     dts: number;
@@ -574,7 +621,7 @@ export interface VideoTrackFragmentIndex {
 export type TrackFragmentIndex = AudioTrackFragmentIndex | VideoTrackFragmentIndex;
 export declare class Probe {
     private absolutePath;
-    data: z.infer<typeof ProbeSchema>;
+    data: ProbeSchema;
     static probePath(absolutePath: string): Promise<Probe>;
     static probeStream(stream: Readable): Promise<Probe>;
     constructor(absolutePath: string, rawData: any);
@@ -622,6 +669,10 @@ export declare class Probe {
         start_time?: number | undefined;
         duration_ts?: number | undefined;
         bit_rate?: string | undefined;
+    } | {
+        index: number;
+        codec_type: "data";
+        duration?: string | undefined;
     })[];
     get format(): {
         filename: string;
@@ -638,6 +689,7 @@ export declare class Probe {
     get mustReencodeAudio(): boolean;
     get mustReencodeVideo(): boolean;
     get mustRemux(): boolean;
+    get hasNonAudioOrVideoStreams(): boolean;
     get hasAudio(): boolean;
     get hasVideo(): boolean;
     get isAudioOnly(): boolean;

package/dist/Probe.js

@@ -61,9 +61,15 @@ const ProbeFormatSchema = z.object({
   bit_rate: z.string().optional(),
   probe_score: z.number()
 });
+const DataStreamSchema = z.object({
+  index: z.number(),
+  codec_type: z.literal("data"),
+  duration: z.string().optional()
+});
 const StreamSchema = z.discriminatedUnion("codec_type", [
   AudioStreamSchema,
-  VideoStreamSchema
+  VideoStreamSchema,
+  DataStreamSchema
 ]);
 const ProbeSchema = z.object({
   streams: z.array(StreamSchema),
@@ -166,7 +172,12 @@ class Probe {
     return false;
   }
   get mustRemux() {
-    return this.format.format_name !== "mp4";
+    return this.format.format_name !== "mp4" || this.data.streams.some((stream) => stream.codec_type !== "audio" && stream.codec_type !== "video");
+  }
+  get hasNonAudioOrVideoStreams() {
+    return this.data.streams.some(
+      (stream) => stream.codec_type !== "audio" && stream.codec_type !== "video"
+    );
   }
   get hasAudio() {
     return this.audioStreams.length > 0;
@@ -266,6 +277,7 @@ class Probe {
 }
 export {
   AudioStreamSchema,
+  DataStreamSchema,
   Probe,
   VideoStreamSchema
 };

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-export { AudioStreamSchema, VideoStreamSchema, Probe } from './Probe.ts';
-export type { StreamSchema, TrackSegment, TrackFragmentIndex, AudioTrackFragmentIndex, VideoTrackFragmentIndex, } from './Probe.ts';
-export { md5FilePath, md5Directory, md5ReadStream, md5Buffer } from './md5.ts';
-export { generateTrackFragmentIndex, generateTrackFragmentIndexFromPath, } from './tasks/generateTrackFragmentIndex.ts';
-export { generateTrack, generateTrackFromPath } from './tasks/generateTrack.ts';
-export { findOrCreateCaptions, generateCaptionDataFromPath, } from './tasks/findOrCreateCaptions.ts';
-export { cacheImage } from './tasks/cacheImage.ts';
-export type { TaskResult } from './idempotentTask.ts';
-export { VideoRenderOptions } from './VideoRenderOptions.ts';
+export type { StreamSchema, AudioStreamSchema, VideoStreamSchema, TrackSegment, TrackFragmentIndex, AudioTrackFragmentIndex, VideoTrackFragmentIndex, } from './Probe.js';
+export { Probe } from './Probe.js';
+export { md5FilePath, md5Directory, md5ReadStream, md5Buffer } from './md5.js';
+export { generateTrackFragmentIndex, generateTrackFragmentIndexFromPath, } from './tasks/generateTrackFragmentIndex.js';
+export { generateTrack, generateTrackFromPath } from './tasks/generateTrack.js';
+export { findOrCreateCaptions, generateCaptionDataFromPath, } from './tasks/findOrCreateCaptions.js';
+export { cacheImage } from './tasks/cacheImage.js';
+export type { TaskResult } from './idempotentTask.js';
+export { VideoRenderOptions } from './VideoRenderOptions.js';

package/dist/index.js

@@ -1,4 +1,4 @@
-import { AudioStreamSchema, Probe, VideoStreamSchema } from "./Probe.js";
+import { Probe } from "./Probe.js";
 import { md5Buffer, md5Directory, md5FilePath, md5ReadStream } from "./md5.js";
 import { generateTrackFragmentIndex, generateTrackFragmentIndexFromPath } from "./tasks/generateTrackFragmentIndex.js";
 import { generateTrack, generateTrackFromPath } from "./tasks/generateTrack.js";
@@ -6,10 +6,8 @@ import { findOrCreateCaptions, generateCaptionDataFromPath } from "./tasks/findO
 import { cacheImage } from "./tasks/cacheImage.js";
 import { VideoRenderOptions } from "./VideoRenderOptions.js";
 export {
-  AudioStreamSchema,
   Probe,
   VideoRenderOptions,
-  VideoStreamSchema,
   cacheImage,
   findOrCreateCaptions,
   generateCaptionDataFromPath,

package/dist/mp4FileWritable.d.ts

@@ -1,3 +1,3 @@
 import { Writable } from 'node:stream';
-import { MP4File } from './MP4File.ts';
+import { MP4File } from './MP4File.js';
 export declare const mp4FileWritable: (mp4File: MP4File) => Writable;

package/dist/tasks/cacheImage.d.ts

@@ -1 +1 @@
-export declare const cacheImage: (cacheRoot: string, absolutePath: string) => Promise<import('../idempotentTask.ts').TaskResult>;
+export declare const cacheImage: (cacheRoot: string, absolutePath: string) => Promise<import('../idempotentTask.js').TaskResult>;

package/dist/tasks/findOrCreateCaptions.d.ts

@@ -1,2 +1,2 @@
 export declare const generateCaptionDataFromPath: (absolutePath: string) => Promise<string>;
-export declare const findOrCreateCaptions: (cacheRoot: string, absolutePath: string) => Promise<import('../idempotentTask.ts').TaskResult>;
+export declare const findOrCreateCaptions: (cacheRoot: string, absolutePath: string) => Promise<import('../idempotentTask.js').TaskResult>;

package/dist/tasks/generateTrack.d.ts

@@ -1,4 +1,4 @@
 import { PassThrough } from 'node:stream';
 export declare const generateTrackFromPath: (absolutePath: string, trackId: number) => Promise<PassThrough>;
-export declare const generateTrackTask: (rootDir: string, absolutePath: string, trackId: number) => Promise<import('../idempotentTask.ts').TaskResult>;
-export declare const generateTrack: (cacheRoot: string, absolutePath: string, url: string) => Promise<import('../idempotentTask.ts').TaskResult>;
+export declare const generateTrackTask: (rootDir: string, absolutePath: string, trackId: number) => Promise<import('../idempotentTask.js').TaskResult>;
+export declare const generateTrack: (cacheRoot: string, absolutePath: string, url: string) => Promise<import('../idempotentTask.js').TaskResult>;

package/dist/tasks/generateTrackFragmentIndex.d.ts

@@ -1,3 +1,3 @@
-import { TrackFragmentIndex } from '../Probe.ts';
+import { TrackFragmentIndex } from '../Probe.js';
 export declare const generateTrackFragmentIndexFromPath: (absolutePath: string) => Promise<Record<number, TrackFragmentIndex>>;
-export declare const generateTrackFragmentIndex: (cacheRoot: string, absolutePath: string) => Promise<import('../idempotentTask.ts').TaskResult>;
+export declare const generateTrackFragmentIndex: (cacheRoot: string, absolutePath: string) => Promise<import('../idempotentTask.js').TaskResult>;

package/package.json

@@ -1,26 +1,33 @@
 {
   "name": "@editframe/assets",
-  "version": "0.12.0-beta.2",
+  "version": "0.12.0-beta.20",
   "description": "",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
     },
     "./EncodedAsset.js": {
-      "types": "./dist/EncodedAsset.d.ts",
-      "import": "./dist/EncodedAsset.js"
+      "import": {
+        "types": "./dist/EncodedAsset.d.ts",
+        "default": "./dist/EncodedAsset.js"
+      }
     },
     "./MP4File.js": {
-      "types": "./dist/MP4File.d.ts",
-      "import": "./dist/MP4File.js"
+      "import": {
+        "types": "./dist/MP4File.d.ts",
+        "default": "./dist/MP4File.js"
+      }
     }
   },
   "type": "module",
   "scripts": {
     "typecheck": "tsc --noEmit --emitDeclarationOnly false",
     "build": "vite build",
-    "build:watch": "vite build --watch"
+    "build:watch": "vite build --watch",
+    "typedoc": "typedoc --json ../../docs/assets.json --plugin typedoc-plugin-zod --excludeExternals ./src"
   },
   "author": "",
   "license": "UNLICENSED",

package/src/tasks/cacheImage.ts

@@ -1,4 +1,4 @@
-import { idempotentTask } from "../idempotentTask.ts";
+import { idempotentTask } from "../idempotentTask.js";
 import { createReadStream } from "node:fs";
 
 import path from "node:path";

package/src/tasks/findOrCreateCaptions.ts

@@ -4,7 +4,7 @@ import { exec } from "node:child_process";
 
 import debug from "debug";
 
-import { idempotentTask } from "../idempotentTask.ts";
+import { idempotentTask } from "../idempotentTask.js";
 
 const execPromise = promisify(exec);
 

package/src/tasks/generateTrack.ts

@@ -1,10 +1,10 @@
-import { idempotentTask } from "../idempotentTask.ts";
-import { MP4File } from "../MP4File.ts";
+import { idempotentTask } from "../idempotentTask.js";
+import { MP4File } from "../MP4File.js";
 import debug from "debug";
-import { mp4FileWritable } from "../mp4FileWritable.ts";
+import { mp4FileWritable } from "../mp4FileWritable.js";
 import { PassThrough } from "node:stream";
 import { basename } from "node:path";
-import { Probe } from "../Probe.ts";
+import { Probe } from "../Probe.js";
 
 export const generateTrackFromPath = async (
   absolutePath: string,

package/src/tasks/generateTrackFragmentIndex.ts

@@ -1,9 +1,9 @@
-import { idempotentTask } from "../idempotentTask.ts";
-import { MP4File } from "../MP4File.ts";
+import { idempotentTask } from "../idempotentTask.js";
+import { MP4File } from "../MP4File.js";
 import debug from "debug";
-import { mp4FileWritable } from "../mp4FileWritable.ts";
+import { mp4FileWritable } from "../mp4FileWritable.js";
 import { basename } from "node:path";
-import { Probe, type TrackFragmentIndex } from "../Probe.ts";
+import { Probe, type TrackFragmentIndex } from "../Probe.js";
 
 export const generateTrackFragmentIndexFromPath = async (
   absolutePath: string,