livedesk 0.1.152 → 0.1.153

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

@@ -33,6 +33,7 @@ let encoderCandidates = [];
 let encoderOutputSeen = false;
 let encoderRestartTimer = null;
 let encoderStartupTimer = null;
+let inputWaitTimer = null;
 let outputBuffer = Buffer.alloc(0);
 let frameSeq = 0;
 let tickTimer = null;
@@ -222,7 +223,9 @@ function emitEncodedUnit(payload) {
       hardwareEncoder: encoder?.candidate?.name || '',
       layoutVersion,
       composeMs: lastComposeMs,
-      poolStarved
+      poolStarved,
+      readyTileCount: latestTiles.size,
+      tileCount: config.deviceIds.length
     }
   });
 }
@@ -295,6 +298,10 @@ 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 (config.deviceIds.length > 0 && config.deviceIds.every(id => latestTiles.has(id))) {
+      clearTimeout(inputWaitTimer);
+      inputWaitTimer = null;
+    }
     const tileLayout = layout.find(item => item.deviceId === deviceId);
     if (tileLayout) renderTile(tileState, tileLayout);
   } catch (error) {
@@ -303,6 +310,7 @@ function ingestFrame(message) {
 }
 
 function writeAtlasFrame() {
+  if (latestTiles.size === 0) return;
   const composeStartedAt = performance.now();
   const target = framePool.pop();
   const stdin = encoder?.child?.stdin;
@@ -354,6 +362,17 @@ function configure(value) {
   const encoderChanged = next.width !== config.width || next.height !== config.height || next.fps !== config.fps;
   config = next;
   latestTiles = new Map([...latestTiles].filter(([deviceId]) => config.deviceIds.includes(deviceId)));
+  clearTimeout(inputWaitTimer);
+  inputWaitTimer = config.deviceIds.length > 0 ? setTimeout(() => {
+    const missing = config.deviceIds.filter(deviceId => !latestTiles.has(deviceId));
+    if (missing.length > 0) {
+      send({
+        type: 'log',
+        level: 'warn',
+        message: `Mode 4 waiting for Mode 2 input from ${missing.length}/${config.deviceIds.length} devices: ${missing.slice(0, 8).join(', ')}`
+      });
+    }
+  }, 3000) : null;
   rebuildLayout();
   if (encoderChanged || !encoder) {
     stopEncoder();
@@ -374,6 +393,7 @@ function shutdown() {
   if (closed) return;
   closed = true;
   clearTimeout(tickTimer);
+  clearTimeout(inputWaitTimer);
   stopEncoder();
   setTimeout(() => process.exit(0), 50).unref?.();
 }

package/hub/src/remote-hub.js

@@ -4588,6 +4588,7 @@ export function createRemoteHub(options = {}) {
         if (device.activeLiveStream?.streamId === streamId
             && options.forceRestart !== true
             && options.reuseExisting === true
+            && liveStreamMatchesOptions(device.activeLiveStream, normalized)
             && liveStreamIsReusable(device.activeLiveStream)) {
             return {
                 ok: true,

package/hub/src/server.js

@@ -775,7 +775,9 @@ function buildRemoteFrameBinaryPacket(frameEvent, diagnostics = {}) {
     sameContentStreak: Number(frame.sameContentStreak || 0) || 0,
     layoutVersion: Number(frame.layoutVersion || 0) || 0,
     atlasComposeMs: Number(frame.atlasComposeMs || 0) || 0,
-    atlasPoolStarved: Number(frame.atlasPoolStarved || 0) || 0
+    atlasPoolStarved: Number(frame.atlasPoolStarved || 0) || 0,
+    atlasReadyTiles: Number(frame.atlasReadyTiles || 0) || 0,
+    atlasTileCount: Number(frame.atlasTileCount || 0) || 0
   };
   const metaBuffer = Buffer.from(JSON.stringify(metadata), 'utf8');
   const header = Buffer.allocUnsafe(4);
@@ -917,7 +919,9 @@ function sendMode4AtlasFrame(ws, output) {
       platformProfile: 'mode4-hub-atlas-worker',
       layoutVersion: Number(metadata.layoutVersion || 0),
       atlasComposeMs: Number(metadata.composeMs || 0),
-      atlasPoolStarved: Number(metadata.poolStarved || 0)
+      atlasPoolStarved: Number(metadata.poolStarved || 0),
+      atlasReadyTiles: Number(metadata.readyTileCount || 0),
+      atlasTileCount: Number(metadata.tileCount || 0)
     }
   };
   const lane = ensureFrameClientSendLane(ws);
@@ -956,7 +960,7 @@ function configureMode4Atlas(ws, payload = {}) {
       mode: 'mode2-lzo',
       frameMode: 'mode2-lzo',
       monitorIndex: Number(monitorSelections[deviceId] || 0),
-      reuseExisting: true,
+      reuseExisting: false,
       silentReuse: true
     });
   }

package/package.json

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