livedesk 0.1.596 → 0.1.597

package/hub/src/server.js

@@ -817,16 +817,18 @@ function getLiveDeskUpdateStatus() {
   };
 }
 
-if (process.env.LIVEDESK_DESKTOP_HOST !== '1') {
-  liveDeskUpdateManager = createLiveDeskUpdateManager({
-    remoteHub,
-    currentManagerVersion: process.env.LIVEDESK_MANAGER_VERSION || packageInfo.version,
-    currentClientVersion: process.env.LIVEDESK_CLIENT_PACKAGE_VERSION || '',
-    excludedDeviceIds: [runtimeDeviceId],
-    restartSupported: !!String(process.env.LIVEDESK_HUB_UPDATE_REQUEST_PATH || '').trim(),
-    requestHubRestart
-  });
-}
+const electronDesktopOwnsSelfUpdate = process.env.LIVEDESK_DESKTOP_HOST === '1';
+liveDeskUpdateManager = createLiveDeskUpdateManager({
+  remoteHub,
+  currentManagerVersion: process.env.LIVEDESK_MANAGER_VERSION || packageInfo.version,
+  currentClientVersion: process.env.LIVEDESK_CLIENT_PACKAGE_VERSION || '',
+  excludedDeviceIds: [runtimeDeviceId],
+  // electron-updater owns replacement of the installed desktop application.
+  // The same Hub still needs the fleet manager for connected outdated Clients.
+  restartSupported: !electronDesktopOwnsSelfUpdate
+    && !!String(process.env.LIVEDESK_HUB_UPDATE_REQUEST_PATH || '').trim(),
+  requestHubRestart: electronDesktopOwnsSelfUpdate ? undefined : requestHubRestart
+});
 
 if (process.env.LIVEDESK_UPDATE_CONTINUE === '1') {
   let continueUpdateInFlight = false;
@@ -5010,31 +5012,30 @@ app.post('/api/runtime/role', async (req, res) => {
   }
 });
 
-app.get('/api/update/status', (_req, res) => {
-  noStore(res);
-  if (process.env.LIVEDESK_DESKTOP_HOST === '1') {
-    res.json({
-      updateAvailable: false,
-      state: 'electron-managed',
-      canApply: false,
-      disabled: true,
-      restartResult: readHubRestartResult()
-    });
-    return;
-  }
-  res.json(getLiveDeskUpdateStatus());
-});
-
-app.post('/api/update/apply', async (_req, res) => {
-  noStore(res);
-  if (process.env.LIVEDESK_DESKTOP_HOST === '1') {
-    res.status(409).json({ ok: false, error: 'electron-updater-managed', disabled: true });
-    return;
-  }
-  try {
-    liveDeskUpdateManager?.reconcileHubRestartResult(readHubRestartResult());
-    const result = await liveDeskUpdateManager?.startUpdate();
-    res.status(result?.ok === false ? 409 : 200).json(result || { ok: false, error: 'update-manager-unavailable' });
+app.get('/api/update/status', (_req, res) => {
+  noStore(res);
+  res.json({
+    ...getLiveDeskUpdateStatus(),
+    selfUpdateOwner: electronDesktopOwnsSelfUpdate ? 'electron-updater' : 'npm-launcher'
+  });
+});
+
+app.post('/api/update/apply', async (_req, res) => {
+  noStore(res);
+  try {
+    liveDeskUpdateManager?.reconcileHubRestartResult(readHubRestartResult());
+    const updateStatus = liveDeskUpdateManager?.getStatus();
+    if (electronDesktopOwnsSelfUpdate
+      && (updateStatus?.managerUpdateAvailable || updateStatus?.clientPackageUpdateAvailable)) {
+      res.status(409).json({
+        ok: false,
+        error: 'electron-updater-managed',
+        selfUpdateOwner: 'electron-updater'
+      });
+      return;
+    }
+    const result = await liveDeskUpdateManager?.startUpdate();
+    res.status(result?.ok === false ? 409 : 200).json(result || { ok: false, error: 'update-manager-unavailable' });
   } catch (error) {
     res.status(500).json({ ok: false, error: error instanceof Error ? error.message : String(error) });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.596",
+  "version": "0.1.597",
   "livedeskClientVersion": "0.1.253",
   "buildFlavor": "production",
   "description": "VuvoDesk Hub and client launcher",