Merge pull request #304 from mifi/dependabot/npm_and_yarn/execa-9.5.2

Bump execa from 6.1.0 to 9.5.2

Author: bkeepers

package.json

@@ -22,7 +22,7 @@
     "@types/ndarray": "^1.0.14",
     "canvas": "^2.11.2",
     "compare-versions": "^6.1.0",
-    "execa": "^8.0.1",
+    "execa": "^9.5.2",
     "fabric": "^6.5.4",
     "file-type": "^20.0.0",
     "file-url": "^4.0.0",

src/configuration.ts

@@ -250,7 +250,6 @@ export class Configuration {
     this.keepTmp = input.keepTmp ?? false;
     this.fast = input.fast ?? false;
 
-    this.defaults = input.defaults ?? {};
     this.ffmpegPath = input.ffmpegPath ?? "ffmpeg";
     this.ffprobePath = input.ffprobePath ?? "ffprobe";
 

src/ffmpeg.ts

@@ -74,7 +74,7 @@ export async function configureFf(params: Partial<FfmpegConfig>) {
   await testFf(config.ffprobePath, "ffprobe");
 }
 
-export function ffmpeg(args: string[], options?: Options<null>) {
+export function ffmpeg(args: string[], options?: Options) {
   if (config.enableFfmpegLog) console.log(`$ ${config.ffmpegPath} ${args.join(" ")}`);
   return execa(config.ffmpegPath, [...getFfmpegCommonArgs(), ...args], options);
 }

src/index.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { ExecaChildProcess } from "execa";
+import { Options, ResultPromise } from "execa";
 import fsExtra from "fs-extra";
 import JSON5 from "json5";
 
@@ -247,15 +247,15 @@ async function Editly(input: ConfigurationOptions): Promise<void> {
       outPath,
     ];
     return ffmpeg(args, {
-      encoding: null,
+      encoding: "buffer",
       buffer: false,
       stdin: "pipe",
       stdout: process.stdout,
       stderr: process.stderr,
     });
   }
 
-  let outProcess: ExecaChildProcess<Buffer<ArrayBufferLike>> | undefined = undefined;
+  let outProcess: ResultPromise<Options> | undefined;
   let outProcessExitCode;
 
   let frameSource1;
@@ -465,7 +465,7 @@ async function Editly(input: ConfigurationOptions): Promise<void> {
       await outProcess;
     } catch (err) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      if (outProcessExitCode !== 0 && !(err as any).killed) throw err;
+      if (outProcessExitCode !== 0 && !(err as any).isTerminated) throw err;
     }
   } finally {
     if (!keepTmp) await fsExtra.remove(tmpDir);

src/sources/video.ts

@@ -1,4 +1,5 @@
 import assert from "assert";
+import { ExecaError } from "execa";
 import * as fabric from "fabric/node";
 import { defineFrameSource } from "../api/index.js";
 import { ffmpeg, readFileStreams } from "../ffmpeg.js";
@@ -129,15 +130,27 @@ export default defineFrameSource<VideoLayer>("video", async (options) => {
     "-",
   ];
 
+  const controller = new AbortController();
+
   const ps = ffmpeg(args, {
-    encoding: null,
+    encoding: "buffer",
     buffer: false,
     stdin: "ignore",
     stdout: "pipe",
     stderr: process.stderr,
+    // ffmpeg doesn't like to stop, force it
+    killSignal: "SIGKILL",
+    cancelSignal: controller.signal,
+  });
+
+  // Ignore errors if the process is aborted
+  ps.catch((err: ExecaError) => {
+    if (!err.isCanceled) throw err;
+    if (verbose) console.log("ffmpeg process aborted", path);
   });
 
   const stream = ps.stdout!;
+  stream.pause();
 
   let timeout: NodeJS.Timeout;
   let ended = false;
@@ -272,7 +285,7 @@ export default defineFrameSource<VideoLayer>("video", async (options) => {
 
   const close = () => {
     if (verbose) console.log("Close", path);
-    ps.cancel();
+    controller.abort();
   };
 
   return {