livedesk 0.1.418 → 0.1.419

package/hub/src/filesystem/transfer-jobs.js

@@ -4,6 +4,7 @@ import { setImmediate as yieldToEventLoop } from 'node:timers/promises';
 
 const CHUNK_BYTES = 512 * 1024;
 const JOB_RETENTION_MS = 10 * 60 * 1000;
+const COMMAND_RESULT_TIMEOUT_MS = 30 * 1000;
 
 function snapshot(job) {
   return {
@@ -28,13 +29,15 @@ function markUpdated(job) {
 }
 
 export class HubTransferJobs {
-  constructor({ filesystem, remoteHub, maxConcurrent = 2 } = {}) {
+  constructor({ filesystem, remoteHub, maxConcurrent = 2, commandResultTimeoutMs = COMMAND_RESULT_TIMEOUT_MS } = {}) {
     this.filesystem = filesystem;
     this.remoteHub = remoteHub;
     this.maxConcurrent = Math.max(1, Number(maxConcurrent) || 2);
+    this.commandResultTimeoutMs = Math.max(1_000, Number(commandResultTimeoutMs) || COMMAND_RESULT_TIMEOUT_MS);
     this.jobs = new Map();
     this.queue = [];
     this.running = 0;
+    this.pendingCommands = new Map();
   }
 
   create({ itemIds = [], deviceIds = [], remoteDirectory = '', files = null, onComplete = null } = {}) {
@@ -90,6 +93,7 @@ export class HubTransferJobs {
     job.state = 'cancelled';
     job.error = 'transfer-cancelled';
     if (job.currentStream) job.currentStream.destroy();
+    this.finishPendingCommands(job.jobId, 'transfer-cancelled');
     markUpdated(job);
     return snapshot(job);
   }
@@ -181,10 +185,13 @@ export class HubTransferJobs {
   }
 
   async sendChunk(job, file, offset, buffer, final, targets) {
-    for (const deviceId of targets) {
-      if (job.cancelled) return;
+    const outcomes = await Promise.all(targets.map(async deviceId => {
+      if (job.cancelled) return { deviceId, ok: false, error: 'transfer-cancelled' };
+      const commandId = crypto.randomUUID();
+      const pending = this.waitForCommandResult(job.jobId, deviceId, commandId);
       const result = this.remoteHub.sendCommand(deviceId, {
         command: 'file.transfer.chunk',
+        commandId,
         payload: {
           transferId: job.jobId,
           remoteDirectory: job.remoteDirectory,
@@ -199,9 +206,87 @@ export class HubTransferJobs {
         }
       });
       if (!result?.ok) {
-        job.failedTargets.add(deviceId);
-        job.targetErrors.set(deviceId, String(result?.error || 'device-not-connected'));
+        this.settlePendingCommand(commandId, {
+          ok: false,
+          error: String(result?.error || 'device-not-connected')
+        });
       }
+      return { deviceId, ...await pending };
+    }));
+
+    for (const outcome of outcomes) {
+      if (outcome.ok || outcome.error === 'transfer-cancelled') continue;
+      job.failedTargets.add(outcome.deviceId);
+      job.targetErrors.set(outcome.deviceId, outcome.error || 'transfer-failed');
+    }
+    if (!job.cancelled && outcomes.length > 0 && outcomes.every(outcome => !outcome.ok)) {
+      throw new Error('all-targets-failed');
+    }
+  }
+
+  waitForCommandResult(jobId, deviceId, commandId) {
+    return new Promise(resolve => {
+      const timer = setTimeout(() => {
+        this.settlePendingCommand(commandId, {
+          ok: false,
+          error: 'file-transfer-ack-timeout'
+        });
+      }, this.commandResultTimeoutMs);
+      timer.unref?.();
+      this.pendingCommands.set(commandId, {
+        jobId,
+        deviceId,
+        timer,
+        resolve
+      });
+    });
+  }
+
+  settlePendingCommand(commandId, outcome) {
+    const pending = this.pendingCommands.get(String(commandId || ''));
+    if (!pending) return false;
+    this.pendingCommands.delete(commandId);
+    clearTimeout(pending.timer);
+    pending.resolve(outcome);
+    return true;
+  }
+
+  finishPendingCommands(jobId, error) {
+    for (const [commandId, pending] of this.pendingCommands) {
+      if (pending.jobId !== jobId) continue;
+      this.settlePendingCommand(commandId, { ok: false, error });
+    }
+  }
+
+  handleRemoteEvent(type, event) {
+    if (type === 'RemoteCommandResult') {
+      const commandId = String(event?.commandId || '');
+      const pending = this.pendingCommands.get(commandId);
+      if (!pending) return;
+      const eventDeviceId = String(event?.deviceId || event?.device?.deviceId || '');
+      if (eventDeviceId && eventDeviceId !== pending.deviceId) return;
+      const result = event?.result;
+      const error = String(
+        event?.error
+        || (result?.ok === false || result?.status === 'failed' || result?.status === 'rejected'
+          ? result?.error || 'file-transfer-rejected'
+          : '')
+      );
+      this.settlePendingCommand(commandId, error
+        ? { ok: false, error }
+        : { ok: true, result });
+      return;
+    }
+
+    if (type !== 'RemoteDeviceDisconnected') return;
+    const deviceId = String(event?.deviceId || event?.device?.deviceId || '');
+    if (!deviceId) return;
+    for (const [commandId, pending] of this.pendingCommands) {
+      if (pending.deviceId !== deviceId) continue;
+      this.settlePendingCommand(commandId, {
+        ok: false,
+        error: 'device-disconnected'
+      });
     }
   }
 

package/hub/src/server.js

@@ -128,9 +128,10 @@ let verifiedLicense = {
   verifiedAt: 0
 };
 let frameClientSeq = 0;
-let inputClientSeq = 0;
-let audioClientSeq = 0;
+let inputClientSeq = 0;
+let audioClientSeq = 0;
 let liveDeskUpdateManager = null;
+let hubTransferJobs = null;
 const HUB_HOST_TARGET_LEASE_MS = Math.max(5000, readPositiveIntegerEnv('LIVEDESK_HOST_TARGET_LEASE_MS', 60_000));
 const HUB_HOST_TARGET_RENEW_MS = Math.max(1000, Math.min(
   readPositiveIntegerEnv('LIVEDESK_HOST_TARGET_RENEW_MS', 20_000),
@@ -168,6 +169,7 @@ function readPositiveIntegerEnv(name, fallback) {
 
 function handleRemoteHubEvent(type, event) {
   liveDeskUpdateManager?.handleRemoteEvent(type, event);
+  hubTransferJobs?.handleRemoteEvent(type, event);
   if (type === 'RemoteInputApplied') {
     for (const ws of inputClients) {
       sendJson(ws, {
@@ -1208,11 +1210,12 @@ async function synchronizeAgentEnablement() {
 }
 
 const hubFilesystem = createHubFilesystem();
-const hubTransferJobs = createHubTransferJobs({
-  filesystem: hubFilesystem,
-  remoteHub,
-  maxConcurrent: Number(process.env.LIVEDESK_MAX_FILE_JOBS || 2)
-});
+hubTransferJobs = createHubTransferJobs({
+  filesystem: hubFilesystem,
+  remoteHub,
+  maxConcurrent: Number(process.env.LIVEDESK_MAX_FILE_JOBS || 2),
+  commandResultTimeoutMs: readPositiveIntegerEnv('LIVEDESK_FILE_CHUNK_ACK_TIMEOUT_MS', 30_000)
+});
 const hubSharedFolders = createHubSharedFolders({
   filesystem: hubFilesystem,
   transferJobs: hubTransferJobs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.418",
+  "version": "0.1.419",
   "livedeskClientVersion": "0.1.182",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",