m4k 0.2.2 → 0.2.3

package/lib/audio/audio-processor.d.ts

@@ -6,7 +6,7 @@ import { type AudioOptions } from "@m4k/common";
  * @param signal - An optional abort signal.
  * @returns An iterable of the processed videos.
  */
-export declare function processAudio(input: string | AsyncIterable<Uint8Array> | Blob, opts: AudioOptions, { signal }?: {
+export declare function processAudio(input: string | AsyncIterable<Uint8Array> | Blob, opts: AudioOptions | AudioOptions[], { signal }?: {
     signal?: AbortSignal;
 }): AsyncGenerator<import("@m4k/common").ProcessedFile | {
     progress: number;

package/lib/audio/audio-processor.js

@@ -1,7 +1,7 @@
 import {} from "@m4k/common";
 import { mkdir } from "node:fs/promises";
 import { createQueue } from "tasque";
-import { processFfmpeg } from "../util/ffmpeg-processor";
+import { getExtension, processFfmpeg } from "../util/ffmpeg-processor";
 /**
  * Process a video.
  * @param input - The input video. Can be a file path, a stream or a blob.
@@ -11,28 +11,29 @@ import { processFfmpeg } from "../util/ffmpeg-processor";
  */
 export function processAudio(input, opts, { signal } = {}) {
     return processFfmpeg(input, () => {
-        const inArgs = [];
-        if (opts.inputFormat)
-            inArgs.push("-f", opts.inputFormat);
-        if (opts.seek)
-            inArgs.push("-ss", opts.seek.toString());
-        if (opts.duration)
-            inArgs.push("-t", opts.duration.toString());
-        const outArgs = [];
-        if (opts.format)
-            outArgs.push("-f", opts.format);
-        if (opts.bitrate)
-            outArgs.push("-b:a", opts.bitrate.toString());
-        if (opts.filters)
-            outArgs.push("-af", opts.filters);
-        if (opts.complexFilters)
-            outArgs.push("-filter_complex", opts.complexFilters);
-        outArgs.push("-c:a", opts.codec ?? "copy");
-        return {
-            input: inArgs,
-            out: outArgs,
-            format: opts.format ?? "mp4",
-        };
+        let args = [];
+        for (const o of Array.isArray(opts) ? opts : [opts]) {
+            const a = [];
+            if (o.format)
+                a.push("-f", o.format);
+            if (o.seek)
+                a.push("-ss", o.seek.toString());
+            if (o.duration)
+                a.push("-t", o.duration.toString());
+            if (o.bitrate)
+                a.push("-b:a", o.bitrate.toString());
+            if (o.filters)
+                a.push("-af", o.filters);
+            if (o.complexFilters)
+                a.push("-filter_complex", o.complexFilters);
+            if (o.codec)
+                a.push("-c:a", o.codec);
+            args.push({
+                args: a,
+                ext: o.ext ?? getExtension(o.format ?? "mp3"),
+            });
+        }
+        return args;
     }, { signal, queue: audioQueue, tmpDir });
 }
 /**

package/lib/util/ffmpeg-processor.d.ts

@@ -8,10 +8,9 @@ import { type Tasque } from "tasque";
  * @returns An iterable of the processed videos.
  */
 export declare function processFfmpeg(input: string | AsyncIterable<Uint8Array> | Blob, buildArgs: () => {
-    input: string[];
-    out: string[];
-    format: string;
-}, { signal, queue, tmpDir, }: {
+    args: string[];
+    ext: string;
+}[], { signal, queue, tmpDir, }: {
     signal?: AbortSignal;
     queue: Tasque;
     tmpDir: string;

package/lib/util/ffmpeg-processor.js

@@ -17,13 +17,21 @@ export function processFfmpeg(input, buildArgs, { signal, queue, tmpDir, }) {
     const id = randomId();
     const inputPath = typeof input === "string" ? input : createTmp(tmpDir, id, input);
     const iterable = queue.iterate(async function* () {
-        const { input: inArgs, out: outArgs, format } = buildArgs();
-        const outputPath = `${tmpDir}/out-${id}.${getExtension(format)}`;
+        const outputPaths = [];
         try {
             signal?.throwIfAborted();
             const p = await inputPath;
             signal?.throwIfAborted();
-            const child = spawn(ffmpeg, ["-y", ...inArgs, "-i", p, ...outArgs, outputPath], { stdio: ["pipe", "pipe", "pipe"] });
+            const outArgs = [];
+            let i = 1;
+            for (const { args, ext } of buildArgs()) {
+                const outputPath = `${tmpDir}/out-${id}-${i++}.${ext}`;
+                outArgs.push(...args, outputPath);
+                outputPaths.push(outputPath);
+            }
+            const child = spawn(ffmpeg, ["-y", "-i", p, ...outArgs], {
+                stdio: ["pipe", "pipe", "pipe"],
+            });
             // Use manual abort handling to avoid some uncatchable error, at least in bun.
             signal?.addEventListener("abort", () => child.kill());
             const decoder = new TextDecoder();
@@ -63,14 +71,19 @@ export function processFfmpeg(input, buildArgs, { signal, queue, tmpDir, }) {
             if (code !== 0) {
                 throw new Error(`ffmpeg exited with code ${code}: ${errStr}`);
             }
-            yield new ProcessedFile(outputPath, mimeTypes[format]);
+            for (const outputPath of outputPaths) {
+                yield new ProcessedFile(outputPath, mimeTypes[outputPath.split(".").pop()]);
+            }
         }
         catch (e) {
             signal?.throwIfAborted();
             throw e;
         }
         finally {
-            await rm(outputPath, { force: true });
+            await new Promise((resolve) => setTimeout(resolve, 1));
+            for (const outputPath of outputPaths) {
+                await rm(outputPath, { force: true });
+            }
             if (typeof inputPath !== "string") {
                 await rm(await inputPath, { force: true });
             }

package/lib/videos/video-processor.d.ts

@@ -6,7 +6,7 @@ import { type VideoOptions } from "@m4k/common";
  * @param signal - An optional abort signal.
  * @returns An iterable of the processed videos.
  */
-export declare function processVideo(input: string | AsyncIterable<Uint8Array> | Blob, opts: VideoOptions, { signal }?: {
+export declare function processVideo(input: string | AsyncIterable<Uint8Array> | Blob, opts: VideoOptions | VideoOptions[], { signal }?: {
     signal?: AbortSignal;
 }): AsyncGenerator<import("@m4k/common").ProcessedFile | {
     progress: number;

package/lib/videos/video-processor.js

@@ -1,7 +1,7 @@
 import {} from "@m4k/common";
 import { mkdir } from "node:fs/promises";
 import { createQueue } from "tasque";
-import { processFfmpeg } from "../util/ffmpeg-processor";
+import { getExtension, processFfmpeg } from "../util/ffmpeg-processor";
 /**
  * Process a video.
  * @param input - The input video. Can be a file path, a stream or a blob.
@@ -11,41 +11,45 @@ import { processFfmpeg } from "../util/ffmpeg-processor";
  */
 export function processVideo(input, opts, { signal } = {}) {
     return processFfmpeg(input, () => {
-        const inArgs = [];
-        if (opts.inputFormat)
-            inArgs.push("-f", opts.inputFormat);
-        if (opts.seek)
-            inArgs.push("-ss", opts.seek.toString());
-        if (opts.duration)
-            inArgs.push("-t", opts.duration.toString());
-        const outArgs = [];
-        if (opts.format)
-            outArgs.push("-f", opts.format);
-        if (opts.audioBitrate)
-            outArgs.push("-b:a", opts.audioBitrate.toString());
-        if (opts.videoBitrate)
-            outArgs.push("-b:v", opts.videoBitrate.toString());
-        if (opts.audioFilters)
-            outArgs.push("-af", opts.audioFilters);
-        if (opts.videoFilters)
-            outArgs.push("-vf", opts.videoFilters);
-        if (opts.complexFilters)
-            outArgs.push("-filter_complex", opts.complexFilters);
-        if (opts.aspect)
-            outArgs.push("-aspect", opts.aspect.toString());
-        if (opts.pad)
-            outArgs.push("-pad", opts.pad);
-        if (opts.fps)
-            outArgs.push("-r", opts.fps.toString());
-        if (opts.size)
-            outArgs.push("-scale", opts.size);
-        outArgs.push("-c:v", opts.videoCodec ?? "copy");
-        outArgs.push("-c:a", opts.audioCodec ?? "copy");
-        return {
-            input: inArgs,
-            out: outArgs,
-            format: opts.format ?? "mp4",
-        };
+        let args = [];
+        for (const o of Array.isArray(opts) ? opts : [opts]) {
+            const a = [];
+            if (o.frames)
+                a.push("-frames:v", o.frames.toString());
+            if (o.format)
+                a.push("-f", o.format);
+            if (o.seek)
+                a.push("-ss", o.seek.toString());
+            if (o.duration)
+                a.push("-t", o.duration.toString());
+            if (o.audioBitrate)
+                a.push("-b:a", o.audioBitrate.toString());
+            if (o.videoBitrate)
+                a.push("-b:v", o.videoBitrate.toString());
+            if (o.audioFilters)
+                a.push("-af", o.audioFilters);
+            if (o.videoFilters)
+                a.push("-vf", o.videoFilters);
+            if (o.complexFilters)
+                a.push("-filter_complex", o.complexFilters);
+            if (o.aspect)
+                a.push("-aspect", o.aspect.toString());
+            if (o.pad)
+                a.push("-pad", o.pad);
+            if (o.fps)
+                a.push("-r", o.fps.toString());
+            if (o.size)
+                a.push("-scale", o.size);
+            if (o.videoCodec)
+                a.push("-c:v", o.videoCodec);
+            if (o.audioCodec)
+                a.push("-c:a", o.audioCodec);
+            args.push({
+                args: a,
+                ext: o.ext ?? getExtension(o.format ?? "mp4"),
+            });
+        }
+        return args;
     }, { signal, queue: videoQueue, tmpDir });
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "m4k",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -18,7 +18,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@m4k/common": "^0.2.0"
+    "@m4k/common": "^0.2.2"
   },
   "peerDependencies": {
     "sharp": "^0.33.5"