@editframe/assets 0.15.0-beta.9 → 0.16.0-beta.0

package/dist/Probe.d.ts

@@ -10,14 +10,14 @@ export declare const AudioStreamSchema: z.ZodObject<{
     sample_fmt: z.ZodString;
     sample_rate: z.ZodString;
     channels: z.ZodNumber;
-    channel_layout: z.ZodString;
+    channel_layout: z.ZodOptional<z.ZodString>;
     bits_per_sample: z.ZodNumber;
     initial_padding: z.ZodOptional<z.ZodNumber>;
     r_frame_rate: z.ZodString;
     avg_frame_rate: z.ZodString;
     time_base: z.ZodString;
-    start_pts: z.ZodNumber;
-    start_time: z.ZodNumber;
+    start_pts: z.ZodOptional<z.ZodNumber>;
+    start_time: z.ZodOptional<z.ZodNumber>;
     duration_ts: z.ZodNumber;
     duration: z.ZodNumber;
     bit_rate: z.ZodString;
@@ -33,17 +33,17 @@ export declare const AudioStreamSchema: z.ZodObject<{
     sample_fmt: string;
     sample_rate: string;
     channels: number;
-    channel_layout: string;
     bits_per_sample: number;
     r_frame_rate: string;
     avg_frame_rate: string;
     time_base: string;
-    start_pts: number;
-    start_time: number;
     duration_ts: number;
     bit_rate: string;
     disposition: Record<string, unknown>;
+    channel_layout?: string | undefined;
     initial_padding?: number | undefined;
+    start_pts?: number | undefined;
+    start_time?: number | undefined;
 }, {
     duration: number;
     index: number;
@@ -55,17 +55,17 @@ export declare const AudioStreamSchema: z.ZodObject<{
     sample_fmt: string;
     sample_rate: string;
     channels: number;
-    channel_layout: string;
     bits_per_sample: number;
     r_frame_rate: string;
     avg_frame_rate: string;
     time_base: string;
-    start_pts: number;
-    start_time: number;
     duration_ts: number;
     bit_rate: string;
     disposition: Record<string, unknown>;
+    channel_layout?: string | undefined;
     initial_padding?: number | undefined;
+    start_pts?: number | undefined;
+    start_time?: number | undefined;
 }>;
 export type AudioStreamSchema = z.infer<typeof AudioStreamSchema>;
 export declare const VideoStreamSchema: z.ZodObject<{
@@ -154,14 +154,14 @@ declare const StreamSchema: z.ZodDiscriminatedUnion<"codec_type", [z.ZodObject<{
     sample_fmt: z.ZodString;
     sample_rate: z.ZodString;
     channels: z.ZodNumber;
-    channel_layout: z.ZodString;
+    channel_layout: z.ZodOptional<z.ZodString>;
     bits_per_sample: z.ZodNumber;
     initial_padding: z.ZodOptional<z.ZodNumber>;
     r_frame_rate: z.ZodString;
     avg_frame_rate: z.ZodString;
     time_base: z.ZodString;
-    start_pts: z.ZodNumber;
-    start_time: z.ZodNumber;
+    start_pts: z.ZodOptional<z.ZodNumber>;
+    start_time: z.ZodOptional<z.ZodNumber>;
     duration_ts: z.ZodNumber;
     duration: z.ZodNumber;
     bit_rate: z.ZodString;
@@ -177,17 +177,17 @@ declare const StreamSchema: z.ZodDiscriminatedUnion<"codec_type", [z.ZodObject<{
     sample_fmt: string;
     sample_rate: string;
     channels: number;
-    channel_layout: string;
     bits_per_sample: number;
     r_frame_rate: string;
     avg_frame_rate: string;
     time_base: string;
-    start_pts: number;
-    start_time: number;
     duration_ts: number;
     bit_rate: string;
     disposition: Record<string, unknown>;
+    channel_layout?: string | undefined;
     initial_padding?: number | undefined;
+    start_pts?: number | undefined;
+    start_time?: number | undefined;
 }, {
     duration: number;
     index: number;
@@ -199,17 +199,17 @@ declare const StreamSchema: z.ZodDiscriminatedUnion<"codec_type", [z.ZodObject<{
     sample_fmt: string;
     sample_rate: string;
     channels: number;
-    channel_layout: string;
     bits_per_sample: number;
     r_frame_rate: string;
     avg_frame_rate: string;
     time_base: string;
-    start_pts: number;
-    start_time: number;
     duration_ts: number;
     bit_rate: string;
     disposition: Record<string, unknown>;
+    channel_layout?: string | undefined;
     initial_padding?: number | undefined;
+    start_pts?: number | undefined;
+    start_time?: number | undefined;
 }>, z.ZodObject<{
     index: z.ZodNumber;
     codec_name: z.ZodString;
@@ -295,14 +295,14 @@ declare const ProbeSchema: z.ZodObject<{
         sample_fmt: z.ZodString;
         sample_rate: z.ZodString;
         channels: z.ZodNumber;
-        channel_layout: z.ZodString;
+        channel_layout: z.ZodOptional<z.ZodString>;
         bits_per_sample: z.ZodNumber;
         initial_padding: z.ZodOptional<z.ZodNumber>;
         r_frame_rate: z.ZodString;
         avg_frame_rate: z.ZodString;
         time_base: z.ZodString;
-        start_pts: z.ZodNumber;
-        start_time: z.ZodNumber;
+        start_pts: z.ZodOptional<z.ZodNumber>;
+        start_time: z.ZodOptional<z.ZodNumber>;
         duration_ts: z.ZodNumber;
         duration: z.ZodNumber;
         bit_rate: z.ZodString;
@@ -318,17 +318,17 @@ declare const ProbeSchema: z.ZodObject<{
         sample_fmt: string;
         sample_rate: string;
         channels: number;
-        channel_layout: string;
         bits_per_sample: number;
         r_frame_rate: string;
         avg_frame_rate: string;
         time_base: string;
-        start_pts: number;
-        start_time: number;
         duration_ts: number;
         bit_rate: string;
         disposition: Record<string, unknown>;
+        channel_layout?: string | undefined;
         initial_padding?: number | undefined;
+        start_pts?: number | undefined;
+        start_time?: number | undefined;
     }, {
         duration: number;
         index: number;
@@ -340,17 +340,17 @@ declare const ProbeSchema: z.ZodObject<{
         sample_fmt: string;
         sample_rate: string;
         channels: number;
-        channel_layout: string;
         bits_per_sample: number;
         r_frame_rate: string;
         avg_frame_rate: string;
         time_base: string;
-        start_pts: number;
-        start_time: number;
         duration_ts: number;
         bit_rate: string;
         disposition: Record<string, unknown>;
+        channel_layout?: string | undefined;
         initial_padding?: number | undefined;
+        start_pts?: number | undefined;
+        start_time?: number | undefined;
     }>, z.ZodObject<{
         index: z.ZodNumber;
         codec_name: z.ZodString;
@@ -482,17 +482,17 @@ declare const ProbeSchema: z.ZodObject<{
         sample_fmt: string;
         sample_rate: string;
         channels: number;
-        channel_layout: string;
         bits_per_sample: number;
         r_frame_rate: string;
         avg_frame_rate: string;
         time_base: string;
-        start_pts: number;
-        start_time: number;
         duration_ts: number;
         bit_rate: string;
         disposition: Record<string, unknown>;
+        channel_layout?: string | undefined;
         initial_padding?: number | undefined;
+        start_pts?: number | undefined;
+        start_time?: number | undefined;
     } | {
         index: number;
         codec_name: string;
@@ -542,17 +542,17 @@ declare const ProbeSchema: z.ZodObject<{
         sample_fmt: string;
         sample_rate: string;
         channels: number;
-        channel_layout: string;
         bits_per_sample: number;
         r_frame_rate: string;
         avg_frame_rate: string;
         time_base: string;
-        start_pts: number;
-        start_time: number;
         duration_ts: number;
         bit_rate: string;
         disposition: Record<string, unknown>;
+        channel_layout?: string | undefined;
         initial_padding?: number | undefined;
+        start_pts?: number | undefined;
+        start_time?: number | undefined;
     } | {
         index: number;
         codec_name: string;
@@ -638,17 +638,17 @@ export declare class Probe {
         sample_fmt: string;
         sample_rate: string;
         channels: number;
-        channel_layout: string;
         bits_per_sample: number;
         r_frame_rate: string;
         avg_frame_rate: string;
         time_base: string;
-        start_pts: number;
-        start_time: number;
         duration_ts: number;
         bit_rate: string;
         disposition: Record<string, unknown>;
+        channel_layout?: string | undefined;
         initial_padding?: number | undefined;
+        start_pts?: number | undefined;
+        start_time?: number | undefined;
     } | {
         index: number;
         codec_name: string;
@@ -693,10 +693,13 @@ export declare class Probe {
     get hasAudio(): boolean;
     get hasVideo(): boolean;
     get isAudioOnly(): boolean;
+    get isMp3(): boolean;
     get isVideoOnly(): boolean;
     get mustProcess(): boolean;
-    get ffmpegAudioOptions(): string[];
-    get ffmpegVideoOptions(): string[];
+    get ffmpegAudioInputOptions(): string[];
+    get ffmpegVideoInputOptions(): never[];
+    get ffmpegAudioOutputOptions(): string[];
+    get ffmpegVideoOutputOptions(): string[];
     createConformingReadstream(): Readable;
 }
 export {};

package/dist/Probe.js

@@ -15,14 +15,14 @@ const AudioStreamSchema = z.object({
   sample_fmt: z.string(),
   sample_rate: z.string(),
   channels: z.number(),
-  channel_layout: z.string(),
+  channel_layout: z.string().optional(),
   bits_per_sample: z.number(),
   initial_padding: z.number().optional(),
   r_frame_rate: z.string(),
   avg_frame_rate: z.string(),
   time_base: z.string(),
-  start_pts: z.number(),
-  start_time: z.coerce.number(),
+  start_pts: z.number().optional(),
+  start_time: z.coerce.number().optional(),
   duration_ts: z.number(),
   duration: z.coerce.number(),
   bit_rate: z.string(),
@@ -188,13 +188,30 @@ class Probe {
   get isAudioOnly() {
     return this.audioStreams.length > 0 && this.videoStreams.length === 0;
   }
+  get isMp3() {
+    return this.audioStreams.some(
+      (stream) => stream.codec_name === "mp3"
+    );
+  }
   get isVideoOnly() {
     return this.audioStreams.length === 0 && this.videoStreams.length > 0;
   }
   get mustProcess() {
     return this.mustReencodeAudio || this.mustReencodeVideo || this.mustRemux;
   }
-  get ffmpegAudioOptions() {
+  get ffmpegAudioInputOptions() {
+    if (!this.hasAudio) {
+      return [];
+    }
+    if (this.isMp3) {
+      return ["-c:a", "mp3"];
+    }
+    return [];
+  }
+  get ffmpegVideoInputOptions() {
+    return [];
+  }
+  get ffmpegAudioOutputOptions() {
     if (!this.hasAudio) {
       return [];
     }
@@ -203,12 +220,14 @@ class Probe {
         "-c:a",
         "aac",
         "-b:a",
-        "192k"
+        "192k",
+        "-ar",
+        "48000"
       ];
     }
     return ["-c:a", "copy"];
   }
-  get ffmpegVideoOptions() {
+  get ffmpegVideoOutputOptions() {
     if (!this.hasVideo) {
       return [];
     }
@@ -239,10 +258,12 @@ class Probe {
       return createReadStream(this.absolutePath);
     }
     const ffmpegConformanceArgs = [
+      ...this.ffmpegAudioInputOptions,
+      ...this.ffmpegVideoInputOptions,
       "-i",
       this.absolutePath,
-      ...this.ffmpegAudioOptions,
-      ...this.ffmpegVideoOptions,
+      ...this.ffmpegAudioOutputOptions,
+      ...this.ffmpegVideoOutputOptions,
       "-f",
       "mp4",
       "-movflags",

package/dist/idempotentTask.js

@@ -12,8 +12,34 @@ const idempotentTask = ({
   const tasks = {};
   return async (rootDir, absolutePath, ...args) => {
     const log = debug(`ef:${label}`);
+    const cacheDirRoot = path.join(rootDir, ".cache");
+    await mkdir(cacheDirRoot, { recursive: true });
+    log(`Running ef:${label} task for ${absolutePath} in ${rootDir}`);
+    if (absolutePath.includes("http")) {
+      const safePath = absolutePath.replace(/[^a-zA-Z0-9]/g, "_");
+      const cachePath2 = path.join(rootDir, ".cache", `${safePath}.file`);
+      if (existsSync(absolutePath)) {
+        log(`Already cached ${absolutePath}`);
+      } else {
+        const response = await fetch(absolutePath);
+        const stream = response.body;
+        if (response.ok && stream) {
+          const writeStream = createWriteStream(cachePath2);
+          const readable = Readable.fromWeb(stream);
+          readable.pipe(writeStream);
+          await new Promise((resolve, reject) => {
+            readable.on("error", reject);
+            writeStream.on("error", reject);
+            writeStream.on("finish", resolve);
+          });
+          absolutePath = cachePath2;
+        } else {
+          throw new Error(`Failed to fetch file from URL ${absolutePath}`);
+        }
+      }
+    }
     const md5 = await md5FilePath(absolutePath);
-    const cacheDir = path.join(rootDir, ".cache", md5);
+    const cacheDir = path.join(cacheDirRoot, md5);
     log(`Cache dir: ${cacheDir}`);
     await mkdir(cacheDir, { recursive: true });
     const cachePath = path.join(cacheDir, filename(absolutePath, ...args));

package/dist/tasks/cacheRemoteAsset.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editframe/assets",
-  "version": "0.15.0-beta.9",
+  "version": "0.16.0-beta.0",
   "description": "",
   "exports": {
     ".": {