m4k 0.2.0 → 0.2.2

package/lib/util/ffmpeg-processor.js

@@ -20,7 +20,12 @@ export function processFfmpeg(input, buildArgs, { signal, queue, tmpDir, }) {
         const { input: inArgs, out: outArgs, format } = buildArgs();
         const outputPath = `${tmpDir}/out-${id}.${getExtension(format)}`;
         try {
-            const child = spawn(ffmpeg, ["-y", ...inArgs, "-i", await inputPath, ...outArgs, outputPath], { stdio: ["pipe", "pipe", "pipe"], signal });
+            signal?.throwIfAborted();
+            const p = await inputPath;
+            signal?.throwIfAborted();
+            const child = spawn(ffmpeg, ["-y", ...inArgs, "-i", p, ...outArgs, outputPath], { 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();
             let metadataStr = "";
             let duration = null;
@@ -60,13 +65,17 @@ export function processFfmpeg(input, buildArgs, { signal, queue, tmpDir, }) {
             }
             yield new ProcessedFile(outputPath, mimeTypes[format]);
         }
+        catch (e) {
+            signal?.throwIfAborted();
+            throw e;
+        }
         finally {
             await rm(outputPath, { force: true });
             if (typeof inputPath !== "string") {
                 await rm(await inputPath, { force: true });
             }
         }
-    }, signal);
+    });
     if (!iterable)
         return null;
     return (async function* () {

package/package.json

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