@livedesk/client 0.1.235 → 0.1.237

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.235",
+  "version": "0.1.237",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -36,16 +36,16 @@
   "dependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
     "ffmpeg-static": "^5.3.0",
-    "@livedesk/runtime-core": "0.1.4",
+    "@livedesk/runtime-core": "0.1.5",
     "@supabase/supabase-js": "^2.110.0",
     "node-screenshots": "^0.2.8",
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.433",
-    "@livedesk/fast-osx-arm64": "0.1.433",
-    "@livedesk/fast-osx-x64": "0.1.433",
-    "@livedesk/fast-win-x64": "0.1.433"
+    "@livedesk/fast-linux-x64": "0.1.435",
+    "@livedesk/fast-osx-arm64": "0.1.435",
+    "@livedesk/fast-osx-x64": "0.1.435",
+    "@livedesk/fast-win-x64": "0.1.435"
   },
   "publishConfig": {
     "access": "public"

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

@@ -5,7 +5,6 @@ import { accessSync, chmodSync, constants as fsConstants, existsSync, mkdirSync,
 import { delimiter, dirname, join, parse, posix, resolve } from 'node:path';
 import os from 'node:os';
 import { createRuntimeManager, normalizeRuntimeAuthSession, runtimeRoleError, RuntimeState } from '../../../runtime-core/src/index.js';
-import { createOsSecretStore, OS_SECRET_REFERENCE } from '../../../runtime-core/src/os-secret-store.js';
 
 const DEFAULT_HOST = '127.0.0.1';
 const DEFAULT_PORT = 5179;
@@ -21,11 +20,6 @@ const SUPABASE_URL = process.env.LIVEDESK_SUPABASE_URL || 'https://otbyfkjxrkngv
 const SUPABASE_PUBLISHABLE_KEY = process.env.LIVEDESK_SUPABASE_PUBLISHABLE_KEY || 'sb_publishable_NpUs0RDJH2YnllsqTKO6TQ_1jTdSsNQ';
 const CLIENT_STATE_DIR = process.env.LIVEDESK_STATE_DIR || (process.env.LIVEDESK_UNIFIED_RUNTIME === '1' ? join(os.homedir(), '.livedesk') : join(os.homedir(), '.livedesk-client'));
 const CLIENT_AUTH_PATH = join(CLIENT_STATE_DIR, 'auth.json');
-const CLIENT_REFRESH_SECRET_STORE = createOsSecretStore({
-  service: 'LiveDesk',
-  account: 'client-refresh-token',
-  dataDir: CLIENT_STATE_DIR
-});
 const DEFAULT_TRUSTED_WEB_ORIGINS = Object.freeze([
   'https://livedesk.pages.dev',
   'http://127.0.0.1:5173',
@@ -957,34 +951,12 @@ function readSavedSession() {
   try {
     const raw = JSON.parse(readFileSync(CLIENT_AUTH_PATH, 'utf8'))?.[CLIENT_AUTH_STORAGE_KEY];
     const session = typeof raw === 'string' ? JSON.parse(raw) : null;
-    if (!session?.access_token) return null;
-    const plaintextRefreshToken = normalizeString(session.refresh_token, 8192);
-    const refreshToken = plaintextRefreshToken || (session.refresh_token_ref === OS_SECRET_REFERENCE
-      ? CLIENT_REFRESH_SECRET_STORE.read()
-      : '');
-    if (!refreshToken) return null;
-    if (plaintextRefreshToken) {
-      if (!CLIENT_REFRESH_SECRET_STORE.write(plaintextRefreshToken)) {
-        writePrivateJsonAtomic(CLIENT_AUTH_PATH, {});
-        return null;
-      }
-      const migrated = { ...session, refresh_token_ref: OS_SECRET_REFERENCE };
-      delete migrated.refresh_token;
-      writePrivateJsonAtomic(CLIENT_AUTH_PATH, { [CLIENT_AUTH_STORAGE_KEY]: JSON.stringify(migrated) });
-    }
-    return { ...session, refresh_token: refreshToken };
+    return session?.access_token ? session : null;
   } catch {
     return null;
   }
 }
 
-function resolveSavedSessionSecret(session) {
-  if (!session || typeof session !== 'object') return null;
-  const refreshToken = normalizeString(session.refresh_token, 8192)
-    || (session.refresh_token_ref === OS_SECRET_REFERENCE ? CLIENT_REFRESH_SECRET_STORE.read() : '');
-  return session.access_token && refreshToken ? { ...session, refresh_token: refreshToken } : null;
-}
-
 function writePrivateJsonAtomic(path, value) {
   mkdirSync(dirname(path), { recursive: true });
   const temporaryPath = `${path}.${process.pid}.${randomBytes(6).toString('hex')}.tmp`;
@@ -1002,46 +974,14 @@ function writePrivateJsonAtomic(path, value) {
 function writeSavedSession(session) {
   if (!session?.access_token || !session?.refresh_token) return false;
   if (process.env.LIVEDESK_DESKTOP_HOST === '1') return true;
-  if (!CLIENT_REFRESH_SECRET_STORE.write(session.refresh_token)) return false;
-  const persisted = { ...session, refresh_token_ref: OS_SECRET_REFERENCE };
-  delete persisted.refresh_token;
-  writePrivateJsonAtomic(CLIENT_AUTH_PATH, { [CLIENT_AUTH_STORAGE_KEY]: JSON.stringify(persisted) });
+  writePrivateJsonAtomic(CLIENT_AUTH_PATH, { [CLIENT_AUTH_STORAGE_KEY]: JSON.stringify(session) });
   return true;
 }
 
 function clearSavedSession() {
-  CLIENT_REFRESH_SECRET_STORE.clear();
   writePrivateJsonAtomic(CLIENT_AUTH_PATH, {});
 }
 
-export async function revokeClientProviderSession(session, options = {}) {
-  const accessToken = normalizeString(session?.access_token, 8192);
-  if (!accessToken) return { ok: true, skipped: true, reason: 'no-access-token' };
-  try {
-    if (typeof options.revokeProviderSession === 'function') {
-      const result = await options.revokeProviderSession(session);
-      return result && typeof result === 'object' ? result : { ok: result !== false };
-    }
-    const fetchImpl = typeof options.fetchImpl === 'function' ? options.fetchImpl : fetch;
-    const response = await fetchImpl(`${SUPABASE_URL.replace(/\/+$/, '')}/auth/v1/logout?scope=local`, {
-      method: 'POST',
-      headers: {
-        apikey: SUPABASE_PUBLISHABLE_KEY,
-        Authorization: `Bearer ${accessToken}`,
-        Accept: 'application/json'
-      },
-      signal: AbortSignal.timeout(10_000)
-    });
-    if (response.ok) return { ok: true, revoked: true };
-    if ([401, 403, 404].includes(response.status)) {
-      return { ok: true, alreadyInvalid: true, status: response.status };
-    }
-    return { ok: false, error: `provider-session-revoke-failed:${response.status}` };
-  } catch (error) {
-    return { ok: false, error: normalizeString(error?.message || error, 240) || 'provider-session-revoke-failed' };
-  }
-}
-
 function readBody(req) {
   return new Promise((resolveBody, reject) => {
     let body = '';
@@ -1176,17 +1116,13 @@ export function createClientRuntimeServer(options = {}) {
   const deviceId = normalizeString(options.deviceId || process.env.LIVEDESK_DEVICE_ID, 160);
   const deviceName = normalizeString(options.deviceName || os.hostname(), 160) || os.hostname();
   const appVersion = normalizeString(options.appVersion || process.env.LIVEDESK_NPM_LAUNCHER_VERSION, 80) || 'dev';
-  const providedSavedSession = resolveSavedSessionSecret(options.savedSession);
   const savedSession = options.loadSavedSession === false
     ? null
-    : providedSavedSession
-      ? providedSavedSession
+    : options.savedSession?.refresh_token
+      ? options.savedSession
       : readSavedSession();
   const savedSessionPersisted = Boolean(savedSession?.refresh_token);
   const savedAccountProfile = readClientAccountProfile(savedSession);
-  const hydrateAccountProfile = typeof options.hydrateAccountProfile === 'function'
-    ? options.hydrateAccountProfile
-    : hydrateClientAccountProfile;
   const diagnosticPlatform = normalizeString(options.diagnosticPlatform || process.platform, 20);
   const diagnosticMonotonicNow = typeof options.diagnosticMonotonicNow === 'function'
     ? options.diagnosticMonotonicNow
@@ -1701,11 +1637,6 @@ export function createClientRuntimeServer(options = {}) {
       return;
     }
     if (pathname === '/api/auth/session' && req.method === 'DELETE') {
-      const activeSession = lastChoice?.session || savedSession || readSavedSession();
-      const providerLogout = await revokeClientProviderSession(activeSession, {
-        revokeProviderSession: options.revokeProviderSession,
-        fetchImpl: options.fetchImpl
-      });
       clearSavedSession();
       loggedOut = true;
       completed = false;
@@ -1723,13 +1654,7 @@ export function createClientRuntimeServer(options = {}) {
         avatarUrl: ''
       };
       runtime.setAuthenticated(false);
-      respondJson(providerLogout.ok ? 200 : 502, {
-        ok: providerLogout.ok,
-        authenticated: false,
-        localCleared: true,
-        role: 'client',
-        providerLogout
-      });
+      respondJson(200, { ok: true, authenticated: false, role: 'client' });
       return;
     }
     if (pathname === '/api/runtime/restart' && req.method === 'POST') {
@@ -1859,11 +1784,7 @@ export function createClientRuntimeServer(options = {}) {
         return;
       }
       try {
-        const result = await options.changeRole?.(
-          'hub',
-          runtime.getSnapshot(),
-          lastChoice?.session || savedSession || null
-        );
+        const result = await options.changeRole?.('hub', runtime.getSnapshot());
         respondJson(result?.ok === false ? 409 : 200, result || { ok: false, error: 'role-change-unavailable' });
       } catch (error) {
         respondJson(409, { ok: false, error: normalizeString(error?.message || error) });
@@ -1877,11 +1798,7 @@ export function createClientRuntimeServer(options = {}) {
         return;
       }
       try {
-        const result = await options.changeRole?.(
-          'hub',
-          runtime.getSnapshot(),
-          lastChoice?.session || savedSession || null
-        );
+        const result = await options.changeRole?.('hub', runtime.getSnapshot());
         respondJson(result?.ok === false ? 409 : 200, result || { ok: false, error: 'role-change-unavailable' });
       } catch (error) {
         respondJson(409, { ok: false, error: normalizeString(error?.message || error) });
@@ -1971,32 +1888,21 @@ export function createClientRuntimeServer(options = {}) {
         const saved = normalizeRuntimeAuthSession(savedSession, { requireRefreshToken: true });
         if (saved.ok) {
           setImmediate(() => {
-            // Hub discovery must not wait for a display-only user-profile
-            // request. The launcher already refreshed and installed this
-            // DPAPI/keychain-backed session before starting the runtime.
-            const normalizedSession = mergeClientAccountProfile(saved.session, savedSession);
-            complete(
-              { type: 'google', session: normalizedSession },
-              'Saved sign-in restored. Finding the LiveDesk Hub.'
-            );
-            void trackDiagnosticTask(async () => {
+            void (async () => {
               try {
-                const hydratedSession = await hydrateAccountProfile(normalizedSession);
-                if (closed || !hydratedSession?.access_token) return;
-                if (writeSavedSession(hydratedSession)) {
-                  state.auth.persisted = true;
-                }
-                // complete() updates profile fields after startup without
-                // restarting discovery or opening another OAuth flow.
-                complete(
-                  { type: 'google', session: hydratedSession },
-                  'Saved sign-in restored. Finding the LiveDesk Hub.'
-                );
-              } catch {
-                // Name/avatar hydration is optional. A provider timeout must
-                // never invalidate the local session or interrupt remote work.
+                // Older persisted sessions kept only id/email on `user`, while
+                // Supabase still carries Google name/avatar claims in the
+                // access-token payload. Recover those display-only claims
+                // locally before any best-effort network hydration.
+                const normalizedSession = mergeClientAccountProfile(saved.session, savedSession);
+                const hydratedSession = await hydrateClientAccountProfile(normalizedSession);
+                if (!writeSavedSession(hydratedSession)) throw new Error('refresh-token-required');
+                state.auth.persisted = true;
+                complete({ type: 'google', session: hydratedSession }, 'Saved sign-in found. Finding the LiveDesk Hub.');
+              } catch (error) {
+                recordAuthAttempt('rejected', `session-persistence-failed:${normalizeString(error?.message || error, 160)}`);
               }
-            });
+            })();
           });
         }
       }

package/src/runtime/fast-runtime-repair.js

@@ -1,300 +0,0 @@
-import { randomBytes } from 'node:crypto';
-import { spawn } from 'node:child_process';
-import {
-  existsSync,
-  mkdirSync,
-  readFileSync,
-  renameSync,
-  rmSync,
-  statSync,
-  writeFileSync
-} from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
-
-const DEFAULT_TIMEOUT_MS = 120_000;
-const LOCK_POLL_MS = 200;
-const LOCK_STALE_MS = 10 * 60_000;
-const MAX_OUTPUT_CHARS = 64 * 1024;
-
-const PLATFORM_SPECS = Object.freeze({
-  'win32:x64': Object.freeze({
-    packageName: '@livedesk/fast-win-x64',
-    rid: 'win-x64',
-    executableName: 'livedesk-client-fast.exe'
-  }),
-  'linux:x64': Object.freeze({
-    packageName: '@livedesk/fast-linux-x64',
-    rid: 'linux-x64',
-    executableName: 'livedesk-client-fast'
-  }),
-  'darwin:x64': Object.freeze({
-    packageName: '@livedesk/fast-osx-x64',
-    rid: 'osx-x64',
-    executableName: 'livedesk-client-fast'
-  }),
-  'darwin:arm64': Object.freeze({
-    packageName: '@livedesk/fast-osx-arm64',
-    rid: 'osx-arm64',
-    executableName: 'livedesk-client-fast'
-  })
-});
-
-function exactVersion(value) {
-  const version = String(value || '').trim();
-  return /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/.test(version)
-    ? version
-    : '';
-}
-
-function boundedText(previous, chunk) {
-  const next = `${previous}${String(chunk || '')}`;
-  return next.length <= MAX_OUTPUT_CHARS ? next : next.slice(next.length - MAX_OUTPUT_CHARS);
-}
-
-function delay(milliseconds) {
-  return new Promise(resolveDelay => setTimeout(resolveDelay, milliseconds));
-}
-
-function packageDirectory(installRoot, packageName) {
-  return join(installRoot, 'node_modules', ...String(packageName).split('/'));
-}
-
-function safeSegment(value) {
-  return String(value || '').replace(/[^A-Za-z0-9._-]/g, '_').slice(0, 160) || 'unknown';
-}
-
-function readJson(filePath) {
-  try {
-    return JSON.parse(readFileSync(filePath, 'utf8'));
-  } catch {
-    return null;
-  }
-}
-
-function isPidAlive(value) {
-  const pid = Number(value);
-  if (!Number.isInteger(pid) || pid <= 1) return false;
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (error) {
-    return error?.code === 'EPERM';
-  }
-}
-
-function reclaimStaleLock(lockPath) {
-  try {
-    const owner = readJson(join(lockPath, 'owner.json'));
-    const ageMs = Math.max(0, Date.now() - Number(statSync(lockPath).mtimeMs || 0));
-    const ownerAlive = isPidAlive(owner?.pid);
-    if ((owner?.pid && !ownerAlive && ageMs >= 1_000) || ageMs >= LOCK_STALE_MS) {
-      rmSync(lockPath, { recursive: true, force: true });
-      return true;
-    }
-  } catch {
-    // A concurrent owner may be creating or removing the lock.
-  }
-  return false;
-}
-
-export function resolveFastPlatformSpec({
-  platform = process.platform,
-  arch = process.arch,
-  manifest = null
-} = {}) {
-  const base = PLATFORM_SPECS[`${platform}:${arch}`];
-  if (!base) return null;
-  const version = exactVersion(manifest?.optionalDependencies?.[base.packageName]);
-  if (!version) return null;
-  return Object.freeze({ ...base, version });
-}
-
-export function inspectFastRuntimePackage(packageRoot, spec) {
-  if (!packageRoot || !spec) return null;
-  const manifest = readJson(join(packageRoot, 'package.json'));
-  if (manifest?.name !== spec.packageName || manifest?.version !== spec.version) return null;
-  if (Array.isArray(manifest.os) && !manifest.os.includes(process.platform)) return null;
-  if (Array.isArray(manifest.cpu) && !manifest.cpu.includes(process.arch)) return null;
-  const fastRoot = join(packageRoot, 'fast');
-  const executable = join(fastRoot, spec.executableName);
-  const dll = join(fastRoot, 'livedesk-client-fast.dll');
-  if (!existsSync(executable) && !existsSync(dll)) return null;
-  return Object.freeze({
-    rid: spec.rid,
-    packageName: spec.packageName,
-    packageVersion: spec.version,
-    packageRoot,
-    executable,
-    dll
-  });
-}
-
-export function repairedFastInstallRoot(stateDir, spec) {
-  return join(
-    resolve(stateDir),
-    'runtime-packages',
-    `${safeSegment(spec.packageName)}-${safeSegment(spec.version)}`
-  );
-}
-
-export function inspectRepairedFastRuntime(stateDir, spec) {
-  const installRoot = repairedFastInstallRoot(stateDir, spec);
-  return inspectFastRuntimePackage(packageDirectory(installRoot, spec.packageName), spec);
-}
-
-function resolveNpmInvocation({ nodeExecutable, npmExecPath, npmExecutable }) {
-  const exactNode = resolve(String(nodeExecutable || process.execPath));
-  const cli = String(npmExecPath || '').trim();
-  const cliCandidates = cli
-    ? (/npx-cli\.js$/i.test(cli) ? [join(dirname(cli), 'npm-cli.js')] : [cli])
-    : [];
-  const npmCli = cliCandidates.find(candidate => existsSync(candidate));
-  if (npmCli) {
-    return { command: exactNode, argsPrefix: [resolve(npmCli)] };
-  }
-  const executable = String(npmExecutable || '').trim();
-  if (executable) return { command: executable, argsPrefix: [] };
-  const nodeDir = dirname(exactNode);
-  const candidates = process.platform === 'win32'
-    ? [join(nodeDir, 'npm.cmd'), join(nodeDir, 'npm.exe')]
-    : [join(nodeDir, 'npm')];
-  const fallback = candidates.find(existsSync);
-  return fallback ? { command: fallback, argsPrefix: [] } : null;
-}
-
-function runInstall({ invocation, installRoot, spec, timeoutMs, env }) {
-  return new Promise((resolveInstall, rejectInstall) => {
-    const args = [
-      ...invocation.argsPrefix,
-      'install',
-      '--ignore-scripts',
-      '--no-audit',
-      '--no-fund',
-      '--package-lock=false',
-      '--save=false',
-      '--omit=dev',
-      '--prefix', installRoot,
-      `${spec.packageName}@${spec.version}`
-    ];
-    const child = spawn(invocation.command, args, {
-      env: {
-        ...env,
-        npm_config_audit: 'false',
-        npm_config_fund: 'false',
-        npm_config_ignore_scripts: 'true',
-        npm_config_package_lock: 'false'
-      },
-      windowsHide: true,
-      stdio: ['ignore', 'pipe', 'pipe']
-    });
-    let stdout = '';
-    let stderr = '';
-    let settled = false;
-    let timer = null;
-    const finish = (error, result = null) => {
-      if (settled) return;
-      settled = true;
-      if (timer) clearTimeout(timer);
-      if (error) rejectInstall(error);
-      else resolveInstall(result);
-    };
-    child.stdout?.on('data', chunk => { stdout = boundedText(stdout, chunk); });
-    child.stderr?.on('data', chunk => { stderr = boundedText(stderr, chunk); });
-    child.once('error', error => finish(error));
-    child.once('exit', (code, signal) => finish(null, {
-      code: Number.isInteger(code) ? code : 1,
-      signal: String(signal || ''),
-      stdout,
-      stderr
-    }));
-    timer = setTimeout(() => {
-      try { child.kill('SIGKILL'); } catch { }
-      finish(new Error(`remote-fast-repair-timeout:${timeoutMs}`));
-    }, timeoutMs);
-    timer.unref?.();
-  });
-}
-
-export async function ensureRepairedFastRuntime({
-  stateDir,
-  spec,
-  nodeExecutable = process.execPath,
-  npmExecPath = process.env.npm_execpath || process.env.NPM_EXECPATH,
-  npmExecutable = process.env.LIVEDESK_NPM_EXECUTABLE,
-  timeoutMs = DEFAULT_TIMEOUT_MS,
-  env = process.env,
-  installRunner = runInstall
-} = {}) {
-  if (!stateDir || !spec) throw new Error('remote-fast-repair-plan-required');
-  const alreadyRepaired = inspectRepairedFastRuntime(stateDir, spec);
-  if (alreadyRepaired) return alreadyRepaired;
-
-  const installRoot = repairedFastInstallRoot(stateDir, spec);
-  mkdirSync(dirname(installRoot), { recursive: true });
-  const lockPath = `${installRoot}.lock`;
-  const deadline = Date.now() + Math.max(10_000, Math.min(300_000, Number(timeoutMs) || DEFAULT_TIMEOUT_MS));
-  let ownsLock = false;
-  while (!ownsLock && Date.now() < deadline) {
-    try {
-      mkdirSync(lockPath, { recursive: false });
-      writeFileSync(join(lockPath, 'owner.json'), JSON.stringify({
-        pid: process.pid,
-        createdAt: new Date().toISOString(),
-        packageName: spec.packageName,
-        version: spec.version
-      }), { encoding: 'utf8', mode: 0o600 });
-      ownsLock = true;
-    } catch {
-      const concurrent = inspectRepairedFastRuntime(stateDir, spec);
-      if (concurrent) return concurrent;
-      if (!reclaimStaleLock(lockPath)) await delay(LOCK_POLL_MS);
-    }
-  }
-  if (!ownsLock) throw new Error('remote-fast-repair-lock-timeout');
-
-  const temporaryRoot = `${installRoot}.tmp-${process.pid}-${randomBytes(6).toString('hex')}`;
-  try {
-    const afterLock = inspectRepairedFastRuntime(stateDir, spec);
-    if (afterLock) return afterLock;
-    rmSync(temporaryRoot, { recursive: true, force: true });
-    mkdirSync(temporaryRoot, { recursive: true });
-    writeFileSync(join(temporaryRoot, 'package.json'), JSON.stringify({
-      private: true,
-      name: 'livedesk-fast-runtime-repair',
-      version: '0.0.0'
-    }), { encoding: 'utf8', mode: 0o600 });
-
-    const invocation = resolveNpmInvocation({ nodeExecutable, npmExecPath, npmExecutable });
-    if (!invocation && installRunner === runInstall) throw new Error('remote-fast-repair-npm-unavailable');
-    const remainingMs = Math.max(1_000, deadline - Date.now());
-    const result = await installRunner({
-      invocation,
-      installRoot: temporaryRoot,
-      spec,
-      timeoutMs: remainingMs,
-      env
-    });
-    if (result?.code !== 0) {
-      const detail = String(result?.stderr || result?.stdout || `exit-${result?.code ?? 'unknown'}`)
-        .replace(/\s+/g, ' ')
-        .trim()
-        .slice(0, 600);
-      throw new Error(`remote-fast-repair-install-failed:${detail || 'unknown'}`);
-    }
-    const temporaryRuntime = inspectFastRuntimePackage(
-      packageDirectory(temporaryRoot, spec.packageName),
-      spec
-    );
-    if (!temporaryRuntime) throw new Error('remote-fast-repair-package-invalid');
-
-    rmSync(installRoot, { recursive: true, force: true });
-    mkdirSync(dirname(installRoot), { recursive: true });
-    renameSync(temporaryRoot, installRoot);
-    const committed = inspectRepairedFastRuntime(stateDir, spec);
-    if (!committed) throw new Error('remote-fast-repair-commit-invalid');
-    return committed;
-  } finally {
-    rmSync(temporaryRoot, { recursive: true, force: true });
-    rmSync(lockPath, { recursive: true, force: true });
-  }
-}