@livedesk/client 0.1.214 → 0.1.215

package/package.json

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

package/src/runtime/client-runtime-server.js

@@ -165,6 +165,12 @@ function readCpuTotals() {
 }
 
 function finiteNumber(value) {
+  if (value === null
+    || value === undefined
+    || typeof value === 'boolean'
+    || (typeof value === 'string' && value.trim() === '')) {
+    return null;
+  }
   const number = Number(value);
   return Number.isFinite(number) && number >= 0 ? number : null;
 }
@@ -300,6 +306,53 @@ function normalizeGpu(value) {
   };
 }
 
+export function normalizeGpuIdentityName(value) {
+  return normalizeString(value, 160)
+    .normalize('NFKC')
+    .replace(/\((?:r|tm)\)/giu, '')
+    .replace(/[®™]/gu, '')
+    .toLocaleLowerCase('en-US')
+    .replace(/[^\p{L}\p{N}]+/gu, ' ')
+    .trim();
+}
+
+export function mergeGpuSnapshots(platformGpus = [], telemetryGpus = []) {
+  const merged = [];
+  const indexesByIdentity = new Map();
+  for (const value of Array.isArray(platformGpus) ? platformGpus : []) {
+    const gpu = normalizeGpu(value);
+    const identity = normalizeGpuIdentityName(gpu?.name);
+    if (!gpu || !identity) continue;
+    const index = merged.length;
+    merged.push(gpu);
+    const indexes = indexesByIdentity.get(identity) || [];
+    indexes.push(index);
+    indexesByIdentity.set(identity, indexes);
+  }
+
+  const matchedIndexes = new Set();
+  for (const value of Array.isArray(telemetryGpus) ? telemetryGpus : []) {
+    const gpu = normalizeGpu(value);
+    const identity = normalizeGpuIdentityName(gpu?.name);
+    if (!gpu || !identity) continue;
+    const existingIndex = (indexesByIdentity.get(identity) || [])
+      .find(index => !matchedIndexes.has(index));
+    if (existingIndex === undefined) {
+      merged.push(gpu);
+      continue;
+    }
+    matchedIndexes.add(existingIndex);
+    const existing = merged[existingIndex];
+    merged[existingIndex] = {
+      ...existing,
+      usagePercent: gpu.usagePercent ?? existing.usagePercent,
+      memoryTotalBytes: gpu.memoryTotalBytes ?? existing.memoryTotalBytes,
+      memoryUsedBytes: gpu.memoryUsedBytes ?? existing.memoryUsedBytes
+    };
+  }
+  return merged;
+}
+
 function normalizeDisk(value) {
   if (!value || typeof value !== 'object') return null;
   const mount = normalizeString(value.mount, 80);
@@ -430,7 +483,10 @@ async function collectHardwareSnapshot() {
 
   const nvidiaGpus = await nvidiaPromise;
   return {
-    gpus: nvidiaGpus.length > 0 ? nvidiaGpus : platformSnapshot.gpus,
+    // Preserve the platform adapter inventory on hybrid-GPU computers. The
+    // NVIDIA sampler enriches its matching adapter instead of replacing every
+    // non-NVIDIA display adapter with the telemetry subset.
+    gpus: mergeGpuSnapshots(platformSnapshot.gpus, nvidiaGpus),
     disks: platformSnapshot.disks,
     collectedAt: new Date().toISOString()
   };
@@ -730,7 +786,11 @@ export function createClientRuntimeServer(options = {}) {
     try {
       const gpus = await collectNvidiaGpuSnapshot();
       if (gpus.length > 0) {
-        hardwareSnapshot = { ...hardwareSnapshot, gpus, collectedAt: new Date().toISOString() };
+        hardwareSnapshot = {
+          ...hardwareSnapshot,
+          gpus: mergeGpuSnapshots(hardwareSnapshot.gpus, gpus),
+          collectedAt: new Date().toISOString()
+        };
       }
     } finally {
       gpuRefreshInFlight = false;