livedesk 0.1.152 → 0.1.154

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

@@ -10,8 +10,8 @@ const DEFAULT_HEIGHT = 1080;
 const DEFAULT_FPS = 20;
 const MAX_DEVICES = 100;
 const FRAME_POOL_SIZE = 8;
-const MAX_TILE_WIDTH = 320;
-const MAX_TILE_HEIGHT = 180;
+const MAX_TILE_WIDTH = 480;
+const MAX_TILE_HEIGHT = 270;
 
 const rgb565Red = new Uint8Array(65_536);
 const rgb565Green = new Uint8Array(65_536);
@@ -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;
@@ -51,11 +52,14 @@ function normalizeConfig(value) {
     .map(item => String(item || '').trim()).filter(Boolean))].slice(0, MAX_DEVICES);
   const maxWidth = clamp(value?.width, 640, 3840, DEFAULT_WIDTH);
   const maxHeight = clamp(value?.height, 360, 2160, DEFAULT_HEIGHT);
+  const sharpTiles = Number(value?.tileWidth) >= 480 || Number(value?.tileHeight) >= 270;
+  const sourceTileWidth = sharpTiles ? 480 : 320;
+  const sourceTileHeight = sharpTiles ? 270 : 180;
   const count = Math.max(1, deviceIds.length);
   const columns = Math.max(1, Math.ceil(Math.sqrt(count)));
   const rows = Math.max(1, Math.ceil(count / columns));
-  const tileWidth = Math.max(2, Math.min(MAX_TILE_WIDTH, Math.floor(maxWidth / columns))) & ~1;
-  const tileHeight = Math.max(2, Math.min(MAX_TILE_HEIGHT, Math.floor(maxHeight / rows))) & ~1;
+  const tileWidth = Math.max(2, Math.min(sourceTileWidth, Math.floor(maxWidth / columns))) & ~1;
+  const tileHeight = Math.max(2, Math.min(sourceTileHeight, Math.floor(maxHeight / rows))) & ~1;
   return {
     deviceIds,
     maxWidth,
@@ -66,6 +70,8 @@ function normalizeConfig(value) {
     rows,
     tileWidth,
     tileHeight,
+    sourceTileWidth,
+    sourceTileHeight,
     fps: clamp(value?.fps, 1, 30, DEFAULT_FPS)
   };
 }
@@ -222,7 +228,9 @@ function emitEncodedUnit(payload) {
       hardwareEncoder: encoder?.candidate?.name || '',
       layoutVersion,
       composeMs: lastComposeMs,
-      poolStarved
+      poolStarved,
+      readyTileCount: latestTiles.size,
+      tileCount: config.deviceIds.length
     }
   });
 }
@@ -286,8 +294,8 @@ function renderTile(tileState, tileLayout) {
 function ingestFrame(message) {
   const deviceId = String(message.deviceId || '');
   if (!deviceId || !config.deviceIds.includes(deviceId)) return;
-  const width = clamp(message.width, 1, 320, 0);
-  const height = clamp(message.height, 1, 180, 0);
+  const width = clamp(message.width, 1, config.sourceTileWidth, 0);
+  const height = clamp(message.height, 1, config.sourceTileHeight, 0);
   const expectedLength = width * height * 2;
   if (!width || !height || Number(message.uncompressedByteLength) !== expectedLength) return;
   try {
@@ -295,6 +303,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 +315,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 +367,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 +398,7 @@ function shutdown() {
   if (closed) return;
   closed = true;
   clearTimeout(tickTimer);
+  clearTimeout(inputWaitTimer);
   stopEncoder();
   setTimeout(() => process.exit(0), 50).unref?.();
 }

package/hub/src/mode4-atlas.js

@@ -65,6 +65,8 @@ export class Mode4AtlasSession {
       deviceIds: this.deviceIds,
       width: Number(options.width || 1920),
       height: Number(options.height || 1080),
+      tileWidth: Number(options.tileWidth || 320),
+      tileHeight: Number(options.tileHeight || 180),
       fps: Number(options.fps || 20)
     };
     this.worker?.send({ type: 'configure', ...this.config });

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);
@@ -940,23 +944,28 @@ function sendMode4AtlasFrame(ws, output) {
 function configureMode4Atlas(ws, payload = {}) {
   const deviceIds = normalizeDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId).slice(0, 100);
   const monitorSelections = normalizeMonitorSelections(payload.monitorSelections);
+  const sharpTiles = Number(payload.tileWidth) >= 480 || Number(payload.tileHeight) >= 270;
+  const tileWidth = sharpTiles ? 480 : 320;
+  const tileHeight = sharpTiles ? 270 : 180;
   ws.liveDeskAtlasDeviceIds = new Set(deviceIds);
   ws.liveDeskAtlasSession.configure({
     deviceIds,
     width: clampNumber(payload.width, 640, 3840, 1920),
     height: clampNumber(payload.height, 360, 2160, 1080),
+    tileWidth,
+    tileHeight,
     fps: clampNumber(payload.fps, 1, 30, 20)
   });
   for (const deviceId of deviceIds) {
     remoteHub.startLiveStream(deviceId, {
       fps: 8,
-      maxWidth: 320,
-      maxHeight: 180,
+      maxWidth: tileWidth,
+      maxHeight: tileHeight,
       quality: 60,
       mode: 'mode2-lzo',
       frameMode: 'mode2-lzo',
       monitorIndex: Number(monitorSelections[deviceId] || 0),
-      reuseExisting: true,
+      reuseExisting: false,
       silentReuse: true
     });
   }
@@ -965,6 +974,8 @@ function configureMode4Atlas(ws, payload = {}) {
     deviceIds,
     inputMode: 'mode2-lzo',
     outputMode: 'mode4-h264-atlas',
+    tileWidth,
+    tileHeight,
     timestamp: new Date().toISOString()
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.152",
+  "version": "0.1.154",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
-    "@livedesk/client": "0.1.102",
+    "@livedesk/client": "0.1.103",
     "cors": "^2.8.5",
     "express": "^4.21.2",
     "ffmpeg-static": "^5.3.0",