livedesk 0.1.177 → 0.1.178

package/bin/livedesk.js

@@ -306,6 +306,7 @@ async function runManager(args) {
     ...process.env,
     LIVEDESK_HUB_HTTP_HOST: options.host || process.env.LIVEDESK_HUB_HTTP_HOST || '127.0.0.1',
     LIVEDESK_HUB_HTTP_PORT: String(httpPort),
+    LIVEDESK_MANAGER_VERSION: readVersion(),
     REMOTE_HUB_PORT: String(remotePort),
     REMOTE_HUB_PAIR_TOKEN: pairToken,
     LIVEDESK_WEB_DIST: existsSync(resolve(packagedWebDist, 'index.html')) ? packagedWebDist : (process.env.LIVEDESK_WEB_DIST || '')

package/hub/src/mode4-atlas-worker.js

@@ -2,6 +2,7 @@
 
 import { spawn } from 'node:child_process';
 import { createRequire } from 'node:module';
+import { existsSync } from 'node:fs';
 import { decodeLzo1xBlock } from './lzo1x.js';
 
 const require = createRequire(import.meta.url);
@@ -42,6 +43,7 @@ let nextTickAt = 0;
 let closed = false;
 let lastComposeMs = 0;
 let poolStarved = 0;
+const ENCODER_STARTUP_OUTPUT_TIMEOUT_MS = 8_000;
 
 function clamp(value, min, max, fallback) {
   const number = Number(value);
@@ -85,7 +87,8 @@ function resolveFfmpegPaths() {
   const paths = [];
   const add = value => {
     const path = String(value || '').trim();
-    if (path && !paths.includes(path)) paths.push(path);
+    if (!path || paths.includes(path)) return;
+    if (path === 'ffmpeg' || existsSync(path)) paths.push(path);
   };
   add(process.env.LIVEDESK_FFMPEG);
   try { add(require('@ffmpeg-installer/ffmpeg')?.path); } catch {}
@@ -130,12 +133,14 @@ function startEncoder() {
     '-bsf:v', 'h264_metadata=aud=insert', '-f', 'h264', 'pipe:1'
   ];
   const child = spawn(candidate.path, args, { stdio: ['pipe', 'pipe', 'pipe'], windowsHide: true });
-  encoder = { child, candidate };
+  encoder = { child, candidate, inputSeen: false };
   encoderOutputSeen = false;
   outputBuffer = Buffer.alloc(0);
   child.stdout.on('data', appendEncodedBytes);
   child.stdin.on('error', error => {
-    send({ type: 'log', level: 'warn', message: `Mode 4 ${candidate.name} input: ${error.message}` });
+    if (encoder?.child === child && !isClosedPipeError(error)) {
+      send({ type: 'log', level: 'warn', message: `Mode 4 ${candidate.name} input: ${error.message}` });
+    }
   });
   child.stderr.on('data', chunk => {
     const message = String(chunk || '').trim();
@@ -153,14 +158,24 @@ function startEncoder() {
     clearTimeout(encoderRestartTimer);
     encoderRestartTimer = setTimeout(startEncoder, encoderOutputSeen ? 800 : 120);
   });
+  send({ type: 'status', state: 'encoder-starting', encoder: candidate.name });
+}
+
+function isClosedPipeError(error) {
+  const code = String(error?.code || '').toUpperCase();
+  const message = String(error?.message || '').toLowerCase();
+  return code === 'EPIPE' || code === 'EOF' || code === 'ERR_STREAM_DESTROYED'
+    || message.includes('write eof') || message.includes('broken pipe');
+}
+
+function armEncoderStartupTimer(child, candidate) {
   clearTimeout(encoderStartupTimer);
   encoderStartupTimer = setTimeout(() => {
-    if (encoder?.child === child && !encoderOutputSeen) {
-      send({ type: 'log', level: 'warn', message: `Mode 4 ${candidate.name}: no output during startup; trying the next encoder.` });
+    if (encoder?.child === child && encoder.inputSeen && !encoderOutputSeen) {
+      send({ type: 'log', level: 'warn', message: `Mode 4 ${candidate.name}: no output after receiving input; trying the next encoder.` });
       try { child.kill(); } catch {}
     }
-  }, 3500);
-  send({ type: 'status', state: 'encoder-starting', encoder: candidate.name });
+  }, ENCODER_STARTUP_OUTPUT_TIMEOUT_MS);
 }
 
 function stopEncoder() {
@@ -306,6 +321,7 @@ function ingestFrame(message) {
     const rgb565 = decodeLzo1xBlock(new Uint8Array(compressed), expectedLength);
     const tileState = { width, height, rgb565, rendered: null, frameSeq: Number(message.frameSeq || 0) };
     latestTiles.set(deviceId, tileState);
+    if (!encoder && encoderCandidates.length > 0) startEncoder();
     if (config.deviceIds.length > 0 && config.deviceIds.every(id => latestTiles.has(id))) {
       clearTimeout(inputWaitTimer);
       inputWaitTimer = null;
@@ -319,6 +335,10 @@ function ingestFrame(message) {
 
 function writeAtlasFrame() {
   if (latestTiles.size === 0) return;
+  if (!encoder) {
+    startEncoder();
+    return;
+  }
   const composeStartedAt = performance.now();
   const target = framePool.pop();
   const stdin = encoder?.child?.stdin;
@@ -340,13 +360,20 @@ function writeAtlasFrame() {
   }
   lastComposeMs = Math.max(0, performance.now() - composeStartedAt);
   try {
+    const encoderEntry = encoder;
+    if (!encoderEntry.inputSeen) {
+      encoderEntry.inputSeen = true;
+      armEncoderStartupTimer(encoderEntry.child, encoderEntry.candidate);
+    }
     stdin.write(target, error => {
       framePool.push(target);
-      if (error) send({ type: 'log', level: 'warn', message: `Mode 4 encoder write: ${error.message}` });
+      if (error && encoder?.child === encoderEntry.child && !isClosedPipeError(error)) {
+        send({ type: 'log', level: 'warn', message: `Mode 4 encoder write: ${error.message}` });
+      }
     });
   } catch (error) {
     framePool.push(target);
-    send({ type: 'log', level: 'warn', message: `Mode 4 encoder write: ${error.message}` });
+    if (!isClosedPipeError(error)) send({ type: 'log', level: 'warn', message: `Mode 4 encoder write: ${error.message}` });
   }
 }
 
@@ -386,7 +413,7 @@ function configure(value) {
     stopEncoder();
     encoderCandidates = buildEncoderCandidates();
     encoderCandidateIndex = 0;
-    startEncoder();
+    if (latestTiles.size > 0) startEncoder();
   }
   startComposeClock();
 }

package/hub/src/server.js

@@ -78,6 +78,11 @@ function handleRemoteHubEvent(type, event) {
   if (!deviceId) {
     return;
   }
+  for (const ws of atlasClients.keys()) {
+    if (ws.readyState === 1 && ws.liveDeskAtlasDeviceIds?.has(deviceId)) {
+      startMode4AtlasInput(ws, deviceId, 'device-connected');
+    }
+  }
   const clients = new Set([
     ...(frameClientsByDeviceId.get(deviceId) || []),
     ...frameWildcardClients
@@ -1012,6 +1017,7 @@ function configureMode4Atlas(ws, payload = {}) {
   const tileWidth = sharpTiles ? 480 : 320;
   const tileHeight = sharpTiles ? 270 : 180;
   ws.liveDeskAtlasDeviceIds = new Set(deviceIds);
+  ws.liveDeskAtlasInputOptions = { tileWidth, tileHeight, monitorSelections };
   ws.liveDeskAtlasSession.configure({
     deviceIds,
     width: clampNumber(payload.width, 640, 3840, 1920),
@@ -1021,18 +1027,7 @@ function configureMode4Atlas(ws, payload = {}) {
     fps: clampNumber(payload.fps, 1, 30, 20)
   });
   for (const deviceId of deviceIds) {
-    remoteHub.startLiveStream(deviceId, {
-      fps: 8,
-      maxWidth: tileWidth,
-      maxHeight: tileHeight,
-      quality: 60,
-      mode: 'mode2-lzo',
-      frameMode: 'mode2-lzo',
-      streamPurpose: 'atlas',
-      monitorIndex: Number(monitorSelections[deviceId] || 0),
-      reuseExisting: false,
-      silentReuse: true
-    });
+    startMode4AtlasInput(ws, deviceId, 'atlas-configure');
   }
   sendJson(ws, {
     type: 'Mode4AtlasSubscription',
@@ -1045,6 +1040,24 @@ function configureMode4Atlas(ws, payload = {}) {
   });
 }
 
+function startMode4AtlasInput(ws, deviceId, reason = 'atlas-configure') {
+  const options = ws?.liveDeskAtlasInputOptions;
+  if (!options || !ws.liveDeskAtlasDeviceIds?.has(deviceId)) return { ok: false, error: 'atlas-device-not-configured' };
+  return remoteHub.startLiveStream(deviceId, {
+    fps: 8,
+    maxWidth: options.tileWidth,
+    maxHeight: options.tileHeight,
+    quality: 60,
+    mode: 'mode2-lzo',
+    frameMode: 'mode2-lzo',
+    streamPurpose: 'atlas',
+    monitorIndex: Number(options.monitorSelections?.[deviceId] || 0),
+    reuseExisting: false,
+    silentReuse: true,
+    restartReason: reason
+  });
+}
+
 function wantsBinaryFrame(req) {
   return /^(1|true|yes|on|binary|raw)$/i.test(String(req.query?.binary ?? req.query?.raw ?? ''))
     || /image\//i.test(String(req.headers.accept || ''));
@@ -1619,6 +1632,8 @@ await remoteHub.start();
 connectedDeviceCount = Number(remoteHub.getStatus({ includeSecrets: false }).connectedDeviceCount || 0);
 httpServer.listen(httpPort, httpHost, () => {
   const status = remoteHub.getStatus({ includeSecrets: true });
+  const managerVersion = String(process.env.LIVEDESK_MANAGER_VERSION || packageInfo.version || 'dev');
+  console.log(`[LiveDesk Hub] Version ${managerVersion}`);
   console.log(`[LiveDesk Hub] HTTP API http://${httpHost}:${httpPort}`);
   console.log(`[LiveDesk Hub] Client endpoint ${status.agentEndpoint} pair=${status.pairTokenPreview}`);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.177",
+  "version": "0.1.178",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {