@livedesk/client 0.1.67 → 0.1.69

package/bin/livedesk-client.js

@@ -2491,15 +2491,27 @@ function resolveBundledFfmpegPaths() {
         }
     };
 
-    try {
-        const ffmpeg = require('@ffmpeg-installer/ffmpeg');
-        addPath(ffmpeg?.path);
-    } catch {
-    }
+    const addFfmpegInstaller = () => {
+        try {
+            const ffmpeg = require('@ffmpeg-installer/ffmpeg');
+            addPath(ffmpeg?.path);
+        } catch {
+        }
+    };
 
-    try {
-        addPath(require('ffmpeg-static'));
-    } catch {
+    const addFfmpegStatic = () => {
+        try {
+            addPath(require('ffmpeg-static'));
+        } catch {
+        }
+    };
+
+    if (process.platform === 'darwin') {
+        addFfmpegStatic();
+        addFfmpegInstaller();
+    } else {
+        addFfmpegInstaller();
+        addFfmpegStatic();
     }
 
     return paths;
@@ -2508,20 +2520,46 @@ function resolveBundledFfmpegPaths() {
 function buildFastEnvironment() {
     const env = { ...process.env };
     const bundledFfmpegPaths = resolveBundledFfmpegPaths();
-    if (!env.LIVEDESK_FFMPEG && bundledFfmpegPaths[0]) {
-        env.LIVEDESK_FFMPEG = bundledFfmpegPaths[0];
-    }
-    if (!env.LIVEDESK_FFMPEG_PATHS && bundledFfmpegPaths.length > 0) {
-        env.LIVEDESK_FFMPEG_PATHS = bundledFfmpegPaths.join(process.platform === 'win32' ? ';' : ':');
-    } else if (env.LIVEDESK_FFMPEG && !env.LIVEDESK_FFMPEG_PATHS) {
-        env.LIVEDESK_FFMPEG_PATHS = env.LIVEDESK_FFMPEG;
-    } else if (env.LIVEDESK_FFMPEG_PATHS && env.LIVEDESK_FFMPEG) {
-        const separator = process.platform === 'win32' ? ';' : ':';
-        const paths = env.LIVEDESK_FFMPEG_PATHS.split(separator).filter(Boolean);
-        if (!paths.includes(env.LIVEDESK_FFMPEG)) {
-            paths.unshift(env.LIVEDESK_FFMPEG);
-            env.LIVEDESK_FFMPEG_PATHS = paths.join(separator);
+    const separator = process.platform === 'win32' ? ';' : ':';
+    const configuredPaths = env.LIVEDESK_FFMPEG_PATHS
+        ? env.LIVEDESK_FFMPEG_PATHS.split(separator).filter(Boolean)
+        : [];
+    const configuredSingle = env.LIVEDESK_FFMPEG ? [env.LIVEDESK_FFMPEG] : [];
+    const merged = [];
+    const addMerged = path => {
+        const value = String(path || '').trim();
+        if (value && !merged.includes(value)) {
+            merged.push(value);
+        }
+    };
+
+    if (process.platform === 'darwin') {
+        bundledFfmpegPaths.forEach(addMerged);
+        configuredPaths.forEach(addMerged);
+        configuredSingle.forEach(addMerged);
+        if (bundledFfmpegPaths[0]) {
+            env.LIVEDESK_FFMPEG = bundledFfmpegPaths[0];
         }
+    } else {
+        configuredPaths.forEach(addMerged);
+        configuredSingle.forEach(addMerged);
+        bundledFfmpegPaths.forEach(addMerged);
+        if (!env.LIVEDESK_FFMPEG && merged[0]) {
+            env.LIVEDESK_FFMPEG = merged[0];
+        }
+    }
+
+    if (merged.length > 0) {
+        env.LIVEDESK_FFMPEG_PATHS = merged.join(separator);
+    }
+
+    if (process.platform === 'darwin' || env.LIVEDESK_DEBUG_FFMPEG === '1') {
+        const describe = path => path.includes('ffmpeg-static')
+            ? 'ffmpeg-static'
+            : path.includes('@ffmpeg-installer')
+                ? '@ffmpeg-installer/ffmpeg'
+                : path;
+        console.error(`LiveDesk client ${readPackageVersion()} ffmpeg candidates: ${merged.map(describe).join(', ') || 'none'}`);
     }
     return env;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {