@livedesk/client 0.1.44 → 0.1.45

package/bin/livedesk-client.js

@@ -781,30 +781,45 @@ function hasFastDll(runtime) {
     return !!runtime?.dll && existsSync(runtime.dll);
 }
 
-function resolveBundledFfmpegPath() {
-    try {
-        const ffmpegPath = String(require('ffmpeg-static') || '').trim();
-        if (ffmpegPath && existsSync(ffmpegPath)) {
-            return ffmpegPath;
+function resolveBundledFfmpegPaths() {
+    const paths = [];
+    const addPath = (candidate) => {
+        const ffmpegPath = String(candidate || '').trim();
+        if (ffmpegPath && existsSync(ffmpegPath) && !paths.includes(ffmpegPath)) {
+            paths.push(ffmpegPath);
         }
+    };
+
+    try {
+        const ffmpeg = require('@ffmpeg-installer/ffmpeg');
+        addPath(ffmpeg?.path);
     } catch {
     }
 
     try {
-        const ffmpeg = require('@ffmpeg-installer/ffmpeg');
-        const ffmpegPath = String(ffmpeg?.path || '').trim();
-        return ffmpegPath && existsSync(ffmpegPath) ? ffmpegPath : '';
+        addPath(require('ffmpeg-static'));
     } catch {
-        return '';
     }
+
+    return paths;
 }
 
 function buildFastEnvironment() {
     const env = { ...process.env };
-    if (!env.LIVEDESK_FFMPEG) {
-        const bundledFfmpegPath = resolveBundledFfmpegPath();
-        if (bundledFfmpegPath) {
-            env.LIVEDESK_FFMPEG = bundledFfmpegPath;
+    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);
         }
     }
     return env;

package/package.json

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