@livedesk/client 0.1.28 → 0.1.30

package/README.md

@@ -37,6 +37,10 @@ By default, the launcher uses the packaged C# RemoteFast engine when supported.
 It falls back to the Node engine for AI assist or when a compatible RemoteFast
 runtime is unavailable. Windows, macOS, and Linux all try RemoteFast first so
 the Hub can request the Mode 3 hardware video path when it is available.
+The launcher also includes a prebuilt ffmpeg executable through
+`@ffmpeg-installer/ffmpeg` and passes it to RemoteFast automatically. Set
+`LIVEDESK_FFMPEG` to override that path. If you need LGPL-only distribution,
+point `LIVEDESK_FFMPEG` at a verified LGPL ffmpeg build before shipping.
 
 Useful flags:
 
@@ -56,7 +60,7 @@ Frame pipeline roadmap:
 
 - Mode 1: `mode1-jpeg` - current test path using screen capture, resize, and JPEG binary frames.
 - Mode 2: `mode2-lz4` - Windows Fast path using raw BGRA frames compressed as an LZ4 block.
-- Mode 3: `mode3-h264-hw` - OS-specific ffmpeg hardware H.264 path. Windows tries Media Foundation/NVENC/QSV/AMF, macOS tries VideoToolbox, and Linux tries NVENC/VAAPI/QSV. Set `LIVEDESK_FFMPEG` to a custom ffmpeg binary if needed.
+- Mode 3: `mode3-h264-hw` - OS-specific ffmpeg hardware H.264 path. Windows tries Media Foundation/NVENC/QSV/AMF, macOS tries VideoToolbox, and Linux tries NVENC/VAAPI/QSV. The launcher uses the bundled ffmpeg first, unless `LIVEDESK_FFMPEG` points to a custom binary. On macOS, set `LIVEDESK_FFMPEG_AVFOUNDATION_INPUT` if your screen input is not `1:none`.
 
 Legacy mode names such as `remote-fast` and `remote-quality` are treated as
 Mode 1 aliases.

package/bin/livedesk-client.js

@@ -5,10 +5,12 @@ import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { spawn, spawnSync } from 'node:child_process';
 import { createServer } from 'node:http';
+import { createRequire } from 'node:module';
 import net from 'node:net';
 import os from 'node:os';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
 const packageRoot = resolve(__dirname, '..');
 const nodeAgentPath = join(__dirname, 'livedesk-client-node.js');
 const FAST_PREFLIGHT_TIMEOUT_MS = 5000;
@@ -779,6 +781,27 @@ function hasFastDll(runtime) {
     return !!runtime?.dll && existsSync(runtime.dll);
 }
 
+function resolveBundledFfmpegPath() {
+    try {
+        const ffmpeg = require('@ffmpeg-installer/ffmpeg');
+        const ffmpegPath = String(ffmpeg?.path || '').trim();
+        return ffmpegPath && existsSync(ffmpegPath) ? ffmpegPath : '';
+    } catch {
+        return '';
+    }
+}
+
+function buildFastEnvironment() {
+    const env = { ...process.env };
+    if (!env.LIVEDESK_FFMPEG) {
+        const bundledFfmpegPath = resolveBundledFfmpegPath();
+        if (bundledFfmpegPath) {
+            env.LIVEDESK_FFMPEG = bundledFfmpegPath;
+        }
+    }
+    return env;
+}
+
 function describePreflightFailure(result) {
     if (result?.error) {
         return result.error.message || String(result.error);
@@ -868,8 +891,9 @@ function resolveFastLaunch(runtime) {
     };
 }
 
-function spawnAgent(command, args) {
+function spawnAgent(command, args, env = process.env) {
     const child = spawn(command, args, {
+        env,
         stdio: 'inherit',
         windowsHide: true
     });
@@ -922,7 +946,7 @@ async function main() {
             const fastArgs = buildFastArgs(prepared.forwarded, prepared.fakeThumbnail);
             const fastLaunch = resolveFastLaunch(fastRuntime);
             if (fastLaunch.ok) {
-                result = await spawnAgent(fastLaunch.command, [...fastLaunch.argsPrefix, ...fastArgs]);
+                result = await spawnAgent(fastLaunch.command, [...fastLaunch.argsPrefix, ...fastArgs], buildFastEnvironment());
             } else if (prepared.engine === 'fast') {
                 console.error(`C# RemoteFast is unavailable: ${fastLaunch.reason}. Use --engine node to run the legacy Node agent.`);
                 process.exit(2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -30,6 +30,7 @@
     "node": ">=20"
   },
   "dependencies": {
+    "@ffmpeg-installer/ffmpeg": "^1.1.0",
     "@supabase/supabase-js": "^2.110.0",
     "node-screenshots": "^0.2.8",
     "openai": "^6.42.0"