@livedesk/hub 0.1.40 → 0.1.42

package/src/server.js

@@ -51,13 +51,13 @@ import { normalizeRuntimeAuthSession, runtimeRoleError } from '../../runtime-cor
 import { fetchAuthResponse, AUTH_REQUEST_TIMEOUT_MS } from '../../runtime-core/src/auth-http.js';
 import { PRODUCTION_SUPABASE_PUBLISHABLE_KEY, PRODUCTION_SUPABASE_URL } from '../../runtime-core/src/auth-config.js';
 import { createHubRuntime } from './runtime/hub-runtime.js';
-import { hubRuntimeStatus } from './runtime/hub-runtime-status.js';
-import { roleGuardResponse } from './http/hub-role-guard.js';
-import {
-  clearHubUiSessionCookie,
-  createHubUiSessionAuthority,
-  serializeHubUiSessionCookie
-} from './http/hub-ui-session.js';
+import { hubRuntimeStatus } from './runtime/hub-runtime-status.js';
+import { roleGuardResponse } from './http/hub-role-guard.js';
+import {
+  clearHubUiSessionCookie,
+  createHubUiSessionAuthority,
+  serializeHubUiSessionCookie
+} from './http/hub-ui-session.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const webDistCandidates = [
@@ -187,10 +187,10 @@ const persistentSessionGcToken = persistentSessionGcEnabled
   ? String(process.env.LIVEDESK_PERSISTENT_SESSION_TEST_TOKEN || '').trim()
   : '';
 let connectedDeviceCount = 0;
-let runtimeAccessToken = '';
-let runtimeRefreshToken = '';
-let runtimeAccessTokenExpiresAt = 0;
-const hubUiSessionAuthority = createHubUiSessionAuthority();
+let runtimeAccessToken = '';
+let runtimeRefreshToken = '';
+let runtimeAccessTokenExpiresAt = 0;
+const hubUiSessionAuthority = createHubUiSessionAuthority();
 let roleWatchInFlight = false;
 let verifiedLicense = {
   userId: '',
@@ -491,12 +491,12 @@ function clearPersistedRuntimeSession() {
   return writePrivateRuntimeAuthState(state);
 }
 
-function clearRuntimeSession() {
-  runtimeAccessToken = '';
-  runtimeRefreshToken = '';
-  runtimeAccessTokenExpiresAt = 0;
-  hubUiSessionAuthority.revokeAll();
-  runtimeManager.setAuthenticated(false);
+function clearRuntimeSession() {
+  runtimeAccessToken = '';
+  runtimeRefreshToken = '';
+  runtimeAccessTokenExpiresAt = 0;
+  hubUiSessionAuthority.revokeAll();
+  runtimeManager.setAuthenticated(false);
   try { clearPersistedRuntimeSession(); } catch { /* runtime auth is already invalid */ }
 }
 
@@ -796,11 +796,12 @@ 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 || '',
-    restartSupported: !!String(process.env.LIVEDESK_HUB_UPDATE_REQUEST_PATH || '').trim(),
+  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
   });
 }
@@ -1412,7 +1413,7 @@ function requestHostname(req) {
   }
 }
 
-function isTrustedBrowserRequest(req) {
+function isTrustedBrowserRequest(req) {
   const origin = String(req.headers.origin || '').trim();
   if (!origin) {
     const fetchSite = String(req.headers['sec-fetch-site'] || '').toLowerCase();
@@ -1429,59 +1430,59 @@ function isTrustedBrowserRequest(req) {
     const targetHost = requestHostname(req);
     return (originHost === targetHost && isPrivateHubHostname(targetHost))
       || (isLoopbackHostname(originHost) && isLoopbackHostname(targetHost));
-  } catch {
-    return false;
-  }
-}
-
-function isSecureHubHttpRequest(req) {
-  return req.socket?.encrypted === true
-    || String(req.headers['x-forwarded-proto'] || '').trim().toLowerCase() === 'https';
-}
-
-function currentBoundHubUserId() {
-  return String(
-    runtimeManager.getSnapshot().userId
-    || readPersistedRuntimeSession()?.user?.id
-    || ''
-  ).trim();
-}
-
-function isPublicHubApiRequest(req) {
-  const method = String(req.method || 'GET').toUpperCase();
-  const path = String(req.path || '');
-  return (method === 'GET' && (path === '/api/health' || path === '/api/runtime/status' || path === '/api/auth/status'))
-    || (method === 'POST' && path === '/api/auth/session');
-}
-
-function isTrustedNativeLoopbackRequest(req) {
-  return isLoopbackAddress(req.socket?.remoteAddress)
-    && !String(req.headers.origin || '').trim()
-    && !String(req.headers['sec-fetch-site'] || '').trim();
-}
-
-function authorizeHubUiRequest(req) {
-  if (process.env.LIVEDESK_TEST_MODE === '1') {
-    return { ok: true, explicitTestMode: true };
-  }
-  if (isTrustedNativeLoopbackRequest(req)) {
-    return { ok: true, nativeLoopback: true };
-  }
-  return hubUiSessionAuthority.authorize(req, currentBoundHubUserId());
-}
-
-app.use((req, res, next) => {
+  } catch {
+    return false;
+  }
+}
+
+function isSecureHubHttpRequest(req) {
+  return req.socket?.encrypted === true
+    || String(req.headers['x-forwarded-proto'] || '').trim().toLowerCase() === 'https';
+}
+
+function currentBoundHubUserId() {
+  return String(
+    runtimeManager.getSnapshot().userId
+    || readPersistedRuntimeSession()?.user?.id
+    || ''
+  ).trim();
+}
+
+function isPublicHubApiRequest(req) {
+  const method = String(req.method || 'GET').toUpperCase();
+  const path = String(req.path || '');
+  return (method === 'GET' && (path === '/api/health' || path === '/api/runtime/status' || path === '/api/auth/status'))
+    || (method === 'POST' && path === '/api/auth/session');
+}
+
+function isTrustedNativeLoopbackRequest(req) {
+  return isLoopbackAddress(req.socket?.remoteAddress)
+    && !String(req.headers.origin || '').trim()
+    && !String(req.headers['sec-fetch-site'] || '').trim();
+}
+
+function authorizeHubUiRequest(req) {
+  if (process.env.LIVEDESK_TEST_MODE === '1') {
+    return { ok: true, explicitTestMode: true };
+  }
+  if (isTrustedNativeLoopbackRequest(req)) {
+    return { ok: true, nativeLoopback: true };
+  }
+  return hubUiSessionAuthority.authorize(req, currentBoundHubUserId());
+}
+
+app.use((req, res, next) => {
   if (!isTrustedBrowserRequest(req)) {
     res.status(403).json({ ok: false, error: 'untrusted-hub-origin' });
     return;
   }
   const origin = String(req.headers.origin || '').trim();
   if (origin) {
-    res.setHeader('Access-Control-Allow-Origin', origin);
-    res.setHeader('Access-Control-Allow-Credentials', 'true');
-    res.setHeader('Access-Control-Allow-Private-Network', 'true');
+    res.setHeader('Access-Control-Allow-Origin', origin);
+    res.setHeader('Access-Control-Allow-Credentials', 'true');
+    res.setHeader('Access-Control-Allow-Private-Network', 'true');
     res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE, OPTIONS');
-    res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, X-LiveDesk-CSRF');
+    res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, X-LiveDesk-CSRF');
     res.setHeader('Vary', 'Origin, Access-Control-Request-Headers, Access-Control-Request-Private-Network');
   }
   if (req.method === 'OPTIONS') {
@@ -1490,21 +1491,21 @@ app.use((req, res, next) => {
   }
   next();
 });
-app.use(express.json({ limit: '32mb' }));
-app.use((req, res, next) => {
-  if (!req.path.startsWith('/api/') || isPublicHubApiRequest(req)) {
-    next();
-    return;
-  }
-  const authorization = authorizeHubUiRequest(req);
-  if (!authorization.ok) {
-    noStore(res);
-    res.status(authorization.status).json({ ok: false, error: authorization.error });
-    return;
-  }
-  next();
-});
-app.use((req, res, next) => {
+app.use(express.json({ limit: '32mb' }));
+app.use((req, res, next) => {
+  if (!req.path.startsWith('/api/') || isPublicHubApiRequest(req)) {
+    next();
+    return;
+  }
+  const authorization = authorizeHubUiRequest(req);
+  if (!authorization.ok) {
+    noStore(res);
+    res.status(authorization.status).json({ ok: false, error: authorization.error });
+    return;
+  }
+  next();
+});
+app.use((req, res, next) => {
   if (runtimeRole === 'client' && req.path.startsWith('/api/remote')) {
     res.status(403).json(roleGuardResponse(runtimeRole, 'hub'));
     return;
@@ -2767,7 +2768,7 @@ function enqueueFramePacketForClient(ws, packetOwner, meta) {
 }
 // FRAME_LANE_GENERATION_CONTRACT_END
 
-function updateFrameSubscription(ws, payload = {}) {
+function updateFrameSubscription(ws, payload = {}) {
   const previousDeviceIds = ws.liveDeskDeviceIds instanceof Set
     ? new Set(ws.liveDeskDeviceIds)
     : new Set();
@@ -2800,43 +2801,43 @@ function updateFrameSubscription(ws, payload = {}) {
   const targetIds = newlySubscribedIds.length > 0 ? newlySubscribedIds : deviceIds;
   for (const deviceId of targetIds.slice(0, 80)) {
     startFrameSubscriptionLive(ws, 'subscribe', deviceId, { reuseExisting: true });
-  }
-}
-
-function refreshFrameSubscriptionLive(ws, payload = {}) {
-  if (!ws || ws.readyState !== 1) {
-    return;
-  }
-  const requestedIds = normalizeDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId);
-  const subscribedIds = [...(ws.liveDeskDeviceIds || [])];
-  const targetIds = requestedIds.length > 0
-    ? requestedIds.filter(deviceId => ws.liveDeskDeviceIds?.has?.(deviceId))
-    : subscribedIds;
-  if (targetIds.length === 0) {
-    return;
-  }
-  ws.liveDeskAutoStart = /^(1|true|yes|on|live)$/i.test(String(
-    payload.autoStartLive ?? payload.startLive ?? ws.liveDeskAutoStart ?? ''
-  ));
-  ws.liveDeskLiveOptions = normalizeLiveOptions({
-    ...(ws.liveDeskLiveOptions || {}),
-    ...payload,
-    forceRestart: false,
-    reuseExisting: true,
-    monitorSelections: {
-      ...(ws.liveDeskLiveOptions?.monitorSelections || {}),
-      ...(payload.monitorSelections || {})
-    }
-  });
-  for (const deviceId of targetIds.slice(0, 80)) {
-    startFrameSubscriptionLive(ws, 'watchdog', deviceId, {
-      ...ws.liveDeskLiveOptions,
-      reuseExisting: true
-    });
-  }
-}
-
-function startFrameSubscriptionLive(
+  }
+}
+
+function refreshFrameSubscriptionLive(ws, payload = {}) {
+  if (!ws || ws.readyState !== 1) {
+    return;
+  }
+  const requestedIds = normalizeDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId);
+  const subscribedIds = [...(ws.liveDeskDeviceIds || [])];
+  const targetIds = requestedIds.length > 0
+    ? requestedIds.filter(deviceId => ws.liveDeskDeviceIds?.has?.(deviceId))
+    : subscribedIds;
+  if (targetIds.length === 0) {
+    return;
+  }
+  ws.liveDeskAutoStart = /^(1|true|yes|on|live)$/i.test(String(
+    payload.autoStartLive ?? payload.startLive ?? ws.liveDeskAutoStart ?? ''
+  ));
+  ws.liveDeskLiveOptions = normalizeLiveOptions({
+    ...(ws.liveDeskLiveOptions || {}),
+    ...payload,
+    forceRestart: false,
+    reuseExisting: true,
+    monitorSelections: {
+      ...(ws.liveDeskLiveOptions?.monitorSelections || {}),
+      ...(payload.monitorSelections || {})
+    }
+  });
+  for (const deviceId of targetIds.slice(0, 80)) {
+    startFrameSubscriptionLive(ws, 'watchdog', deviceId, {
+      ...ws.liveDeskLiveOptions,
+      reuseExisting: true
+    });
+  }
+}
+
+function startFrameSubscriptionLive(
   ws,
   reason = 'subscribe',
   onlyDeviceId = '',
@@ -4408,19 +4409,19 @@ app.post('/api/auth/session', async (req, res) => {
     res.status(400).json({ ok: false, error: normalized.error });
     return;
   }
-  const { access_token: accessToken, refresh_token: refreshToken, expires_at: expiresAt } = normalized.session;
-  try {
-    const user = await verifySupabaseUser(accessToken);
-    const boundUserId = currentBoundHubUserId();
-    if (boundUserId && boundUserId !== user.id) {
-      res.status(403).json({ ok: false, error: 'hub-account-mismatch' });
-      return;
-    }
-    if (!boundUserId && !isLoopbackAddress(req.socket?.remoteAddress)) {
-      res.status(403).json({ ok: false, error: 'hub-first-account-binding-must-be-local' });
-      return;
-    }
-    runtimeAccessToken = accessToken;
+  const { access_token: accessToken, refresh_token: refreshToken, expires_at: expiresAt } = normalized.session;
+  try {
+    const user = await verifySupabaseUser(accessToken);
+    const boundUserId = currentBoundHubUserId();
+    if (boundUserId && boundUserId !== user.id) {
+      res.status(403).json({ ok: false, error: 'hub-account-mismatch' });
+      return;
+    }
+    if (!boundUserId && !isLoopbackAddress(req.socket?.remoteAddress)) {
+      res.status(403).json({ ok: false, error: 'hub-first-account-binding-must-be-local' });
+      return;
+    }
+    runtimeAccessToken = accessToken;
     runtimeRefreshToken = refreshToken;
     runtimeAccessTokenExpiresAt = normalizeSessionExpiryMs(expiresAt);
     runtimeManager.setAuthenticated(true, user.id);
@@ -4431,27 +4432,31 @@ app.post('/api/auth/session', async (req, res) => {
       user
     });
     const hostTarget = runtimeRole === 'hub'
-      ? await publishHubHostTargetWithPendingRoleTakeover('session-received')
-      : { ok: true, active: false };
-    if (runtimeRole === 'hub') {
-      startHubHostTargetLeaseRenewal();
-    }
-    const uiSession = hubUiSessionAuthority.issue(user.id);
-    res.setHeader('Set-Cookie', serializeHubUiSessionCookie(uiSession.sessionId, uiSession.expiresAt, {
-      secure: isSecureHubHttpRequest(req)
-    }));
-    res.json({
-      ok: true,
-      authenticated: true,
-      persisted,
-      userId: user.id,
-      role: runtimeRole,
-      hostTarget,
-      uiSession: {
-        csrfToken: uiSession.csrfToken,
-        expiresAt: uiSession.expiresAt
-      }
-    });
+      ? {
+          ok: true,
+          pending: true,
+          active: remoteHub.getStatus({ includeSecrets: false }).hostTargetActive === true
+        }
+      : { ok: true, pending: false, active: false };
+    const uiSession = hubUiSessionAuthority.issue(user.id);
+    res.setHeader('Set-Cookie', serializeHubUiSessionCookie(uiSession.sessionId, uiSession.expiresAt, {
+      secure: isSecureHubHttpRequest(req)
+    }));
+    res.json({
+      ok: true,
+      authenticated: true,
+      persisted,
+      userId: user.id,
+      role: runtimeRole,
+      hostTarget,
+      uiSession: {
+        csrfToken: uiSession.csrfToken,
+        expiresAt: uiSession.expiresAt
+      }
+    });
+    if (runtimeRole === 'hub') {
+      scheduleAuthenticatedHubHostTargetPublication('session-received');
+    }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     const status = authVerificationHttpStatus(message);
@@ -4747,15 +4752,26 @@ function startHubHostTargetLeaseRenewal() {
   hubHostTargetRenewTimer.unref?.();
 }
 
-app.delete('/api/auth/session', async (req, res) => {
+function scheduleAuthenticatedHubHostTargetPublication(reason = 'session-received') {
+  startHubHostTargetLeaseRenewal();
+  setImmediate(() => {
+    void publishHubHostTargetWithPendingRoleTakeover(reason).catch(error => {
+      const message = error instanceof Error ? error.message : String(error);
+      updateHubHostTargetLeaseState({ state: 'error', lastError: message });
+      console.error(`[LiveDesk Hub] Host target ${reason} background publish failed: ${message}`);
+    });
+  });
+}
+
+app.delete('/api/auth/session', async (req, res) => {
   noStore(res);
   const hostTarget = runtimeRole === 'hub'
     ? await clearHubHostTarget('logout')
     : { ok: true, active: false };
-  clearRuntimeSession();
-  res.setHeader('Set-Cookie', clearHubUiSessionCookie({ secure: isSecureHubHttpRequest(req) }));
-  res.json({ ok: true, authenticated: false, role: runtimeRole, hostTarget });
-});
+  clearRuntimeSession();
+  res.setHeader('Set-Cookie', clearHubUiSessionCookie({ secure: isSecureHubHttpRequest(req) }));
+  res.json({ ok: true, authenticated: false, role: runtimeRole, hostTarget });
+});
 
 app.get('/api/hub/status', (_req, res) => {
   noStore(res);
@@ -5556,20 +5572,20 @@ if (existsSync(webIndexPath)) {
   });
 }
 
-httpServer.on('upgrade', (req, socket, head) => {
-  if (!isTrustedBrowserRequest(req)) {
-    socket.write('HTTP/1.1 403 Forbidden\r\nConnection: close\r\n\r\n');
-    socket.destroy();
-    return;
-  }
-  const authorization = authorizeHubUiRequest(req);
-  if (!authorization.ok) {
-    const label = authorization.status === 403 ? 'Forbidden' : 'Unauthorized';
-    socket.write(`HTTP/1.1 ${authorization.status} ${label}\r\nConnection: close\r\n\r\n`);
-    socket.destroy();
-    return;
-  }
-  try {
+httpServer.on('upgrade', (req, socket, head) => {
+  if (!isTrustedBrowserRequest(req)) {
+    socket.write('HTTP/1.1 403 Forbidden\r\nConnection: close\r\n\r\n');
+    socket.destroy();
+    return;
+  }
+  const authorization = authorizeHubUiRequest(req);
+  if (!authorization.ok) {
+    const label = authorization.status === 403 ? 'Forbidden' : 'Unauthorized';
+    socket.write(`HTTP/1.1 ${authorization.status} ${label}\r\nConnection: close\r\n\r\n`);
+    socket.destroy();
+    return;
+  }
+  try {
     const parsed = new URL(req.url || '/', `http://${req.headers.host || '127.0.0.1'}`);
     if (parsed.pathname === '/api/remote/frames/ws') {
       frameWss.handleUpgrade(req, socket, head, ws => frameWss.emit('connection', ws, req));
@@ -5616,11 +5632,11 @@ frameWss.on('connection', (ws, req) => {
   ws.on('message', data => {
     try {
       const payload = JSON.parse(Buffer.isBuffer(data) ? data.toString('utf8') : String(data || ''));
-      if (payload?.type === 'subscribe') {
-        updateFrameSubscription(ws, payload);
-      } else if (payload?.type === 'refresh-live') {
-        refreshFrameSubscriptionLive(ws, payload);
-      } else if (payload?.type === 'restart-live') {
+      if (payload?.type === 'subscribe') {
+        updateFrameSubscription(ws, payload);
+      } else if (payload?.type === 'refresh-live') {
+        refreshFrameSubscriptionLive(ws, payload);
+      } else if (payload?.type === 'restart-live') {
         restartFrameSubscriptionLive(ws, payload);
       }
     } catch {

package/src/settings/effective-device-policy.js

@@ -1,16 +1,16 @@
-import { effectiveDevicePolicy } from './settings-schema.js';
-
-export function buildEffectiveDevicePolicy(settings, { deviceId = '', capabilities = {} } = {}) {
-  const policy = effectiveDevicePolicy(settings);
-  return {
-    ...policy,
-    deviceId: String(deviceId || ''),
-    supported: {
-      control: capabilities.control !== false,
-      clipboardText: capabilities.clipboardText !== false,
-      fileTransfer: capabilities.fileTransfer !== false,
-      remoteAudio: capabilities.audio === true || capabilities.remoteAudio === true,
-      agent: Array.isArray(capabilities.agentTools) && capabilities.agentTools.length > 0
-    }
-  };
-}
+import { effectiveDevicePolicy } from './settings-schema.js';
+
+export function buildEffectiveDevicePolicy(settings, { deviceId = '', capabilities = {} } = {}) {
+  const policy = effectiveDevicePolicy(settings);
+  return {
+    ...policy,
+    deviceId: String(deviceId || ''),
+    supported: {
+      control: capabilities.control !== false,
+      clipboardText: capabilities.clipboardText !== false,
+      fileTransfer: capabilities.fileTransfer !== false,
+      remoteAudio: capabilities.audio === true || capabilities.remoteAudio === true,
+      agent: Array.isArray(capabilities.agentTools) && capabilities.agentTools.length > 0
+    }
+  };
+}