@livedesk/hub 0.1.64 → 0.1.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/hub",
-  "version": "0.1.64",
+  "version": "0.1.66",
   "description": "VuvoDesk local Hub API and browser frame bridge",
   "type": "module",
   "main": "src/server.js",

package/src/live-desk-update.js

@@ -66,9 +66,27 @@ export function isVersionAtLeast(candidate, required) {
   return !!cleanVersion(candidate) && !!cleanVersion(required) && compareVersions(candidate, required) >= 0;
 }
 
-function isDedicatedBootstrapFailure(value) {
-  return /^Update worker exited before terminal proof\b/i.test(String(value || '').trim());
-}
+function isDedicatedBootstrapFailure(value) {
+  const failure = String(value || '').trim();
+  return /^Update worker exited before terminal proof\b/i.test(failure)
+    || failure === 'invalid-update-host-environment-entry';
+}
+
+function describeCommandResultEvidence(result) {
+  const data = result?.data;
+  if (!data || typeof data !== 'object') return '';
+  const evidence = [];
+  const shell = String(data.shell || '').trim().toLowerCase();
+  if (/^[a-z0-9._-]{1,32}$/.test(shell)) evidence.push(`shell=${shell}`);
+  const exitCode = Number(data.exitCode);
+  if (Number.isInteger(exitCode) && Math.abs(exitCode) <= 0x7fffffff) evidence.push(`exit=${exitCode}`);
+  if (typeof data.timedOut === 'boolean') evidence.push(`timedOut=${data.timedOut}`);
+  const durationMs = Number(data.durationMs);
+  if (Number.isFinite(durationMs) && durationMs >= 0 && durationMs <= 24 * 60 * 60_000) {
+    evidence.push(`durationMs=${Math.round(durationMs)}`);
+  }
+  return evidence.length > 0 ? ` [${evidence.join(' ')}]` : '';
+}
 
 function encodePowerShell(value) {
   return Buffer.from(String(value || ''), 'utf16le').toString('base64');
@@ -451,16 +469,29 @@ export function createLiveDeskUpdateManager({
     return true;
   };
 
-  const dispatchTarget = (target, device, options = {}) => {
-    const dispatchedAtEpochMs = now();
-    const requestedTimeoutMs = Math.max(
-      10_000,
-      Math.min(
-        effectiveTargetTimeoutMs,
-        Number(options.updateTimeoutMs) || effectiveTargetTimeoutMs
-      )
-    );
-    const updateDeadlineEpochMs = dispatchedAtEpochMs + requestedTimeoutMs;
+  const dispatchTarget = (target, device, options = {}) => {
+    const dispatchedAtEpochMs = now();
+    const requestedDeadlineEpochMs = Date.parse(String(options.deadlineAt || ''));
+    const usesExistingDeadline = Number.isFinite(requestedDeadlineEpochMs)
+      && requestedDeadlineEpochMs > 0;
+    const remainingExistingDeadlineMs = requestedDeadlineEpochMs - dispatchedAtEpochMs;
+    if (usesExistingDeadline && remainingExistingDeadlineMs < 10_000) {
+      target.state = 'failed';
+      target.error = 'client-update-deadline-insufficient';
+      return false;
+    }
+    const requestedTimeoutMs = usesExistingDeadline
+      ? Math.min(effectiveTargetTimeoutMs, remainingExistingDeadlineMs)
+      : Math.max(
+        10_000,
+        Math.min(
+          effectiveTargetTimeoutMs,
+          Number(options.updateTimeoutMs) || effectiveTargetTimeoutMs
+        )
+      );
+    const updateDeadlineEpochMs = usesExistingDeadline
+      ? requestedDeadlineEpochMs
+      : dispatchedAtEpochMs + requestedTimeoutMs;
     const dispatchedSessionId = String(device?.sessionId || '').trim();
     if (!dispatchedSessionId) {
       target.state = 'failed';
@@ -784,12 +815,18 @@ export function createLiveDeskUpdateManager({
     if (!target
       || target.state !== 'waiting'
       || !['dedicated', 'legacy-command-run'].includes(target.method)) return;
-    const result = event?.result;
-    if (event?.error || result?.ok === false || result?.status === 'failed' || result?.status === 'rejected') {
-      const failure = String(event.error || result?.error || result?.message || 'client-update-command-failed').slice(0, 500);
-      if (target.method === 'dedicated'
-        && target.bootstrapRetryCount === 0
-        && isDedicatedBootstrapFailure(failure)) {
+    const result = event?.result;
+    if (event?.error || result?.ok === false || result?.status === 'failed' || result?.status === 'rejected') {
+      const failureReason = String(
+        event.error || result?.error || result?.message || 'client-update-command-failed'
+      ).slice(0, 500);
+      const failure = (
+        failureReason
+        + describeCommandResultEvidence(result)
+      ).slice(0, 500);
+      if (target.method === 'dedicated'
+        && target.bootstrapRetryCount === 0
+        && isDedicatedBootstrapFailure(failureReason)) {
         const retryDevice = connectedClientDevices()
           .find(device => String(device.deviceId || '') === target.deviceId);
         const remainingMs = Date.parse(target.deadlineAt || '') - now();
@@ -800,10 +837,10 @@ export function createLiveDeskUpdateManager({
           target.error = '';
           let retryResult;
           try {
-            retryResult = dispatchTarget(target, retryDevice, {
-              forceLegacy: true,
-              updateTimeoutMs: remainingMs
-            });
+            retryResult = dispatchTarget(target, retryDevice, {
+              forceLegacy: true,
+              deadlineAt: target.deadlineAt
+            });
           } catch (error) {
             target.error = String(error?.message || error || 'client-update-bootstrap-retry-failed').slice(0, 500);
             retryResult = false;

package/src/remote-hub.js

@@ -9784,25 +9784,31 @@ export function createRemoteHub(options = {}) {
             return { ok: false, error: 'device-not-connected' };
         }
 
-        const command = safeString(options.command, 20000);
-        if (!command) return { ok: false, error: 'client-update-command-missing' };
-        const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
-        const timeoutMs = clampNumber(options.timeoutMs, 1000, 120000, 30000);
-        const sent = writeJsonLine(device.socket, {
+        const command = safeString(options.command, 20000);
+        if (!command) return { ok: false, error: 'client-update-command-missing' };
+        const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
+        const timeoutMs = clampNumber(options.timeoutMs, 1000, 120000, 30000);
+        const legacyCommandShell = ['win32', 'windows']
+            .includes(safeString(device.platform, 32).toLowerCase())
+            ? 'cmd'
+            : 'auto';
+        const sent = writeJsonLine(device.socket, {
             type: 'command',
             commandId,
-            command: 'command.run',
-            payload: {
-                command,
-                timeoutMs,
-                permissionMode: 'full-access',
+            command: 'command.run',
+            payload: {
+                command,
+                shell: legacyCommandShell,
+                timeoutMs,
+                permissionMode: 'full-access',
                 // RemoteFast releases before 0.1.170 read command.run inputs
                 // from toolArguments, while Node and current Agents accept the
                 // direct payload fields. Carry both during the update bridge.
-                toolArguments: {
-                    command,
-                    timeoutMs
-                }
+                toolArguments: {
+                    command,
+                    shell: legacyCommandShell,
+                    timeoutMs
+                }
             },
             issuedAt: new Date().toISOString()
         });