livedesk 0.1.408 → 0.1.409

package/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.173",
+  "version": "0.1.174",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -39,10 +39,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.379",
-    "@livedesk/fast-osx-arm64": "0.1.379",
-    "@livedesk/fast-osx-x64": "0.1.379",
-    "@livedesk/fast-win-x64": "0.1.379"
+    "@livedesk/fast-linux-x64": "0.1.380",
+    "@livedesk/fast-osx-arm64": "0.1.380",
+    "@livedesk/fast-osx-x64": "0.1.380",
+    "@livedesk/fast-win-x64": "0.1.380"
   },
   "publishConfig": {
     "access": "public"

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

@@ -0,0 +1,32 @@
+const TILE_PRESETS = Object.freeze([
+  Object.freeze({ width: 320, height: 180 }),
+  Object.freeze({ width: 480, height: 270 }),
+  Object.freeze({ width: 640, height: 360 })
+]);
+
+export function resolveMode4AtlasTileSize(options = {}) {
+  const deviceCount = Math.max(1, Math.floor(Number(options.deviceCount) || 1));
+  const atlasWidth = Math.max(640, Math.floor(Number(options.atlasWidth) || 1920));
+  const atlasHeight = Math.max(360, Math.floor(Number(options.atlasHeight) || 1080));
+  const requestedWidth = Number(options.requestedWidth) || 320;
+  const requestedHeight = Number(options.requestedHeight) || 180;
+  const columns = Math.max(1, Math.ceil(Math.sqrt(deviceCount)));
+  const rows = Math.max(1, Math.ceil(deviceCount / columns));
+  const requestedPresetIndex = requestedWidth >= 640 || requestedHeight >= 360
+    ? 2
+    : requestedWidth >= 480 || requestedHeight >= 270
+      ? 1
+      : 0;
+  const supportedCandidates = TILE_PRESETS.slice(0, requestedPresetIndex + 1).reverse();
+  const selected = supportedCandidates.find(candidate => (
+    candidate.width * columns <= atlasWidth
+    && candidate.height * rows <= atlasHeight
+  )) || TILE_PRESETS[0];
+
+  return {
+    width: selected.width,
+    height: selected.height,
+    columns,
+    rows
+  };
+}

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

@@ -4,6 +4,7 @@ import { spawn } from 'node:child_process';
 import { createRequire } from 'node:module';
 import { existsSync } from 'node:fs';
 import { decodeLzo1xBlock } from './lzo1x.js';
+import { resolveMode4AtlasTileSize } from './mode4-atlas-sizing.js';
 
 const require = createRequire(import.meta.url);
 const DEFAULT_WIDTH = 1920;
@@ -11,8 +12,8 @@ const DEFAULT_HEIGHT = 1080;
 const DEFAULT_FPS = 20;
 const MAX_DEVICES = 100;
 const FRAME_POOL_SIZE = 3;
-const MAX_TILE_WIDTH = 480;
-const MAX_TILE_HEIGHT = 270;
+const MAX_TILE_WIDTH = 640;
+const MAX_TILE_HEIGHT = 360;
 
 const rgb565Red = new Uint8Array(65_536);
 const rgb565Green = new Uint8Array(65_536);
@@ -59,12 +60,18 @@ 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 tileSize = resolveMode4AtlasTileSize({
+    requestedWidth: value?.tileWidth,
+    requestedHeight: value?.tileHeight,
+    deviceCount: count,
+    atlasWidth: maxWidth,
+    atlasHeight: maxHeight
+  });
+  const columns = tileSize.columns;
+  const rows = tileSize.rows;
+  const sourceTileWidth = tileSize.width;
+  const sourceTileHeight = tileSize.height;
   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 {

package/hub/src/server.js

@@ -8,8 +8,9 @@ import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import os from 'node:os';
 import { WebSocketServer } from 'ws';
-import { createRemoteHub } from './remote-hub.js';
+import { createRemoteHub } from './remote-hub.js';
 import { buildMode4AtlasSessionKey, Mode4AtlasPool, planMode4AtlasInputTransitions } from './mode4-atlas-pool.js';
+import { resolveMode4AtlasTileSize } from './mode4-atlas-sizing.js';
 import { createHubFilesystem } from './filesystem/hub-filesystem.js';
 import { createHubTransferJobs } from './filesystem/transfer-jobs.js';
 import { createHubSharedFolders } from './filesystem/shared-folders.js';
@@ -2287,13 +2288,21 @@ function sendMode4AtlasFrame(ws, output) {
 }
 
 function configureMode4Atlas(ws, payload = {}) {
-  const deviceIds = normalizeDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId).slice(0, 100);
-  const captureDeviceIds = normalizeDeviceIds(payload.captureDeviceIds ?? payload.inputDeviceIds ?? deviceIds)
-    .filter(deviceId => deviceIds.includes(deviceId));
-  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;
+  const deviceIds = normalizeDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId).slice(0, 100);
+  const captureDeviceIds = normalizeDeviceIds(payload.captureDeviceIds ?? payload.inputDeviceIds ?? deviceIds)
+    .filter(deviceId => deviceIds.includes(deviceId));
+  const monitorSelections = normalizeMonitorSelections(payload.monitorSelections);
+  const width = clampNumber(payload.width, 640, 3840, 1920);
+  const height = clampNumber(payload.height, 360, 2160, 1080);
+  const tileSize = resolveMode4AtlasTileSize({
+    requestedWidth: payload.tileWidth,
+    requestedHeight: payload.tileHeight,
+    deviceCount: deviceIds.length,
+    atlasWidth: width,
+    atlasHeight: height
+  });
+  const tileWidth = tileSize.width;
+  const tileHeight = tileSize.height;
   const previousInputDeviceIds = ws.liveDeskAtlasInputDeviceIds instanceof Set
     ? new Set(ws.liveDeskAtlasInputDeviceIds)
     : new Set();
@@ -2304,8 +2313,8 @@ function configureMode4Atlas(ws, payload = {}) {
     // every layout device ingestible lets a paused/reused input retain its
     // latest tile while only the changed device restarts capture.
     inputDeviceIds: deviceIds,
-    width: clampNumber(payload.width, 640, 3840, 1920),
-    height: clampNumber(payload.height, 360, 2160, 1080),
+    width,
+    height,
     tileWidth,
     tileHeight,
     fps: clampNumber(payload.fps, 1, 30, 20),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "livedesk",
-  "version": "0.1.408",
-  "livedeskClientVersion": "0.1.173",
+  "version": "0.1.409",
+  "livedeskClientVersion": "0.1.174",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
@@ -49,10 +49,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.379",
-    "@livedesk/fast-osx-arm64": "0.1.379",
-    "@livedesk/fast-osx-x64": "0.1.379",
-    "@livedesk/fast-win-x64": "0.1.379"
+    "@livedesk/fast-linux-x64": "0.1.380",
+    "@livedesk/fast-osx-arm64": "0.1.380",
+    "@livedesk/fast-osx-x64": "0.1.380",
+    "@livedesk/fast-win-x64": "0.1.380"
   },
   "publishConfig": {
     "access": "public"