Changeset 79f00c5 in Klonkt

Timestamp:

07/30/2026 08:02:16 AM (6 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

15f1cb5

Parents:

9ed940e

Message:

De posters gebruiken de ffmpeg die Klonkt al meebrengt

Robins opmerking: Klonkt shipt al een static build. Klopt, en ik keek erlangs:
ffmpeg-static staat in package.json en VideoCoverService en AudioTranscoder
gebruiken hem al. De poster-spawn was de enige plek die een kale ffmpeg van
PATH verwachtte, en daarmee was de hele installeer-discussie overbodig.

Nu doet de gebundelde binary het werk, als soft dependency zoals de
transcoder: afwezig blijft stil, FFMPEG_PATH blijft als override voor wie een
nieuwere wil. Posters werken dus overal zodra de vloot deze code draait,
zonder ook maar iets te installeren.

Changed files:
src/routes/activitypub.js

• de poster-spawn importeert ffmpeg-static en valt terug op FFMPEG_PATH

remarks: 338 tests groen.

-robo
Co-Authored-By: Claude Opus 5 <noreply@…>

File:

• src/routes/activitypub.js (modified) (1 diff)

src/routes/activitypub.js

@@ -317 +317 @@
     // fall back to extracting a frame natively.
     if (mime.startsWith('video/')) {
-      import('child_process').then(({ execFile }) => {
+      // The bundled static build (ffmpeg-static) does the work, exactly like
+      // VideoCoverService and AudioTranscoder already do: Klonkt SHIPS its
+      // ffmpeg (Robins opmerking, 30-7), so nothing needs installing on any
+      // machine. Soft dependency + best-effort: absent stays silent, and
+      // FFMPEG_PATH can still override for an operator who wants a newer one.
+      Promise.all([import('child_process'), import('ffmpeg-static')]).then(([{ execFile }, ff]) => {
+        const bin = process.env.FFMPEG_PATH || ff.default;
+        if (!bin) return;
         const poster = req.file.path + '.poster.jpg';
-        // FFMPEG_PATH lets a static build in ~/bin do the work without a
-        // system install; unset means "whatever is on PATH", and neither is
-        // an error when absent.
-        execFile(process.env.FFMPEG_PATH || 'ffmpeg', ['-y', '-ss', '1', '-i', req.file.path, '-frames:v', '1', '-vf', "scale='min(640,iw)':-2", poster],
+        execFile(bin, ['-hide_banner', '-loglevel', 'error', '-y', '-ss', '1', '-i', req.file.path, '-frames:v', '1', '-vf', "scale='min(640,iw)':-2", poster],
           { timeout: 30000 }, (e) => { if (e && e.code !== 'ENOENT') console.warn('[media] poster failed:', e.message); });
       }).catch(() => { /* never blocks the upload */ });