@livedesk/client 0.1.187 → 0.1.189

package/README.md

@@ -22,8 +22,9 @@ callback exchange, and saved authentication as one path. The browser only
 shows progress; it does not maintain a second session that must be transferred
 back to the Client. LiveDesk then waits for the active Hub published by the
 same account and connects locally. If the Hub is not
-ready yet, the client waits for a Hub-online event and uses adaptive registry
-retries instead of exiting. If a
+ready yet, the client waits for a Hub-online event and polls the registry at
+most every six seconds as a fallback. Missing a wake event can never leave a
+Client asleep for minutes. If a
 connected Hub is replaced, the launcher also leaves the stale endpoint and
 discovers the newly published Hub without another Google login. Omit the number
 for first-available placement, or pass `1` to `999` to pin this machine to a

package/bin/livedesk-client-node.js

@@ -58,16 +58,10 @@ function getClientUpdateNeutralCwd(operationId) {
 async function prepareClientUpdateNeutralCwd(operationId) {
     const neutralCwd = path.resolve(getClientUpdateNeutralCwd(operationId));
     await fs.mkdir(neutralCwd, { recursive: true });
-    for (let ancestor = neutralCwd; ; ancestor = path.dirname(ancestor)) {
-        const shadowPath = [
-            path.join(ancestor, 'package.json'),
-            path.join(ancestor, 'node_modules', 'livedesk', 'package.json')
-        ].find(candidate => existsSync(candidate));
-        if (shadowPath) {
-            throw new Error(`LiveDesk update neutral working directory is shadowed by ${shadowPath}: ${neutralCwd}`);
-        }
-        const parent = path.dirname(ancestor);
-        if (parent === ancestor) break;
+    const unexpectedEntry = (await fs.readdir(neutralCwd))[0];
+    if (unexpectedEntry) {
+        const shadowPath = path.join(neutralCwd, unexpectedEntry);
+        throw new Error(`LiveDesk update neutral working directory is shadowed by ${shadowPath}: ${neutralCwd}`);
     }
     return neutralCwd;
 }
@@ -89,6 +83,7 @@ function buildClientUpdateNpxEnvironment(baseEnv, neutralCwd) {
     }
     env.INIT_CWD = neutralCwd;
     env.npm_config_local_prefix = neutralCwd;
+    env.npm_config_workspaces = 'false';
     env.npm_config_include_workspace_root = 'false';
     return env;
 }
@@ -1583,13 +1578,13 @@ function buildClientUpdateBootstrapScript() {
         'const terminateTree = async child => { const pid = Number(child?.pid || 0); if (pid <= 1) return; if (process.platform === "win32") { await new Promise(resolve => { const killer = spawn("taskkill.exe", ["/PID", String(pid), "/T", "/F"], { windowsHide: true, stdio: "ignore" }); let done = false; const finish = () => { if (done) return; done = true; clearTimeout(timer); resolve(); }; const timer = setTimeout(() => { try { killer.kill("SIGKILL"); } catch {} finish(); }, 10000); killer.once("error", finish); killer.once("exit", finish); }); if (isAlive(pid)) { try { child.kill("SIGKILL"); } catch {} } return; } try { process.kill(-pid, "SIGTERM"); } catch { try { child.kill("SIGTERM"); } catch {} } const gracefulDeadline = Date.now() + 2000; while (Date.now() < gracefulDeadline && (isGroupAlive(pid) || isAlive(pid))) await sleep(100); if (isGroupAlive(pid) || isAlive(pid)) { try { process.kill(-pid, "SIGKILL"); } catch { try { child.kill("SIGKILL"); } catch {} } } };',
         'const writeHandoffStarted = () => withStateLock(() => { if (deadlineExpired()) throw new Error("The absolute LiveDesk Client update deadline expired before handoff."); const previous = readState(); if (previous.operationId !== operationId) throw new Error("LiveDesk update handoff was superseded before exact-package launch."); const now = new Date().toISOString(); const next = { ...previous, operationId, stage: "handoff-started", starterPid: process.pid, updateDeadlineEpochMs, restartVerified: false, error: "", updatedAt: now }; const temporary = statePath + "." + process.pid + ".handoff-started.tmp"; fs.writeFileSync(temporary, JSON.stringify(next, null, 2), { encoding: "utf8", mode: 0o600 }); fs.renameSync(temporary, statePath); });',
         'const monitorPreflight = child => { let settled = false; const finish = (error, preserveFailure = false) => { if (settled) return; settled = true; clearInterval(poll); clearTimeout(timeout); child.unref(); if (preserveFailure) process.exitCode = 1; else if (error) writeFailure(error); }; const inspect = () => { const state = readState(); if (state.operationId !== operationId) return; if (state.stage === "preflight-ready" || state.stage === "waiting-for-shutdown") finish(); else if (state.stage === "failed") finish(null, true); }; const cancelTimedOutHandoff = async () => { const error = new Error(deadlineExpired() ? "The absolute LiveDesk Client update deadline expired before exact-package preflight." : "Timed out waiting for exact-package update preflight."); while (!settled) { inspect(); if (settled) return; let outcome; try { outcome = writeCancellation(error); } catch (lockError) { finish(lockError); return; } if (outcome === "ready" || outcome === "failed") { inspect(); if (settled) return; } else if (outcome === "cancelled" || outcome === "superseded") { await terminateTree(child); finish(null, true); return; } await sleep(25); } }; const poll = setInterval(inspect, 100); const timeoutMs = Math.max(1, Math.min(Math.max(1000, Number(process.env.LIVEDESK_CLIENT_UPDATE_HANDOFF_TIMEOUT_MS || 140000)), updateDeadlineEpochMs - Date.now())); const timeout = setTimeout(() => { void cancelTimedOutHandoff(); }, timeoutMs); child.once("exit", (code, signal) => { inspect(); if (!settled) finish(new Error("Exact-package update supervisor exited before preflight (code=" + (code ?? "none") + ", signal=" + (signal || "none") + ").")); }); inspect(); };',
-        'const prepareNeutralCwd = () => { if (!neutralCwd) throw new Error("LiveDesk update neutral working directory is unavailable"); fs.mkdirSync(neutralCwd, { recursive: true }); for (let ancestor = neutralCwd; ; ancestor = path.dirname(ancestor)) { const shadow = [path.join(ancestor, "package.json"), path.join(ancestor, "node_modules", "livedesk", "package.json")].find(fs.existsSync); if (shadow) throw new Error("LiveDesk update neutral working directory is shadowed by " + shadow + ": " + neutralCwd); const parent = path.dirname(ancestor); if (parent === ancestor) break; } };',
+        'const prepareNeutralCwd = () => { if (!neutralCwd) throw new Error("LiveDesk update neutral working directory is unavailable"); fs.mkdirSync(neutralCwd, { recursive: true }); const unexpectedEntry = fs.readdirSync(neutralCwd)[0]; if (unexpectedEntry) { const shadow = path.join(neutralCwd, unexpectedEntry); throw new Error("LiveDesk update neutral working directory is shadowed by " + shadow + ": " + neutralCwd); } };',
         'if (!operationId || !versionPattern.test(targetProductVersion) || deadlineExpired()) { writeFailure(new Error("Invalid or expired LiveDesk exact-package update handoff."), true); } else { try { prepareNeutralCwd(); writeHandoffStarted();',
-        'const env = { ...process.env, LIVEDESK_UPDATE_STARTER_PID: String(process.pid) }; const isolated = new Set(["init_cwd", "npm_config_local_prefix", "npm_config_workspace", "npm_config_workspaces", "npm_config_include_workspace_root", "npm_package_json", "npm_lifecycle_event", "npm_lifecycle_script"]); for (const key of Object.keys(env)) if (isolated.has(key.toLowerCase())) delete env[key]; env.INIT_CWD = neutralCwd; env.npm_config_local_prefix = neutralCwd; env.npm_config_include_workspace_root = "false";',
+        'const env = { ...process.env, LIVEDESK_UPDATE_STARTER_PID: String(process.pid) }; const isolated = new Set(["init_cwd", "npm_config_local_prefix", "npm_config_workspace", "npm_config_workspaces", "npm_config_include_workspace_root", "npm_package_json", "npm_lifecycle_event", "npm_lifecycle_script"]); for (const key of Object.keys(env)) if (isolated.has(key.toLowerCase())) delete env[key]; env.INIT_CWD = neutralCwd; env.npm_config_local_prefix = neutralCwd; env.npm_config_workspaces = "false"; env.npm_config_include_workspace_root = "false";',
         'const nodeDir = path.dirname(process.execPath);',
         'const npxCli = [env.LIVEDESK_NPX_CLI_PATH, env.npm_execpath ? path.join(path.dirname(env.npm_execpath), "npx-cli.js") : "", env.LIVEDESK_NPX_EXECUTABLE ? path.join(path.dirname(env.LIVEDESK_NPX_EXECUTABLE), "node_modules", "npm", "bin", "npx-cli.js") : "", path.join(nodeDir, "node_modules", "npm", "bin", "npx-cli.js")].find(value => value && fs.existsSync(value));',
         'const npx = env.LIVEDESK_NPX_EXECUTABLE || (process.platform === "win32" ? "npx.cmd" : "npx");',
-        'const args = ["-y", "--prefer-online", "livedesk@" + targetProductVersion, "--internal-legacy-client-update"];',
+        'const args = ["-y", "--prefer-online", "--prefix", neutralCwd, "--workspaces=false", "livedesk@" + targetProductVersion, "--internal-legacy-client-update"];',
         'const quoteCmd = value => "\\"" + String(value).replaceAll("%", "%%").replaceAll("\\"", "\\"\\"") + "\\"";',
         'const invocation = npxCli ? { command: process.execPath, args: [npxCli, ...args] } : process.platform === "win32" ? { command: env.ComSpec || "cmd.exe", args: ["/d", "/s", "/c", "call " + quoteCmd(npx) + " " + args.map(quoteCmd).join(" ")] } : { command: npx, args };',
         'if (!npxCli && path.isAbsolute(npx) && !fs.existsSync(npx)) { writeFailure(new Error("LiveDesk npx executable was not found: " + npx)); } else { try { const child = spawn(invocation.command, invocation.args, { cwd: neutralCwd, env, detached: true, stdio: "ignore", windowsHide: true }); child.once("error", writeFailure); child.once("spawn", () => monitorPreflight(child)); } catch (error) { writeFailure(error); } }',

package/bin/livedesk-client.js

@@ -30,7 +30,10 @@ const DEFAULT_HUB_CLIENT_PORT = 5197;
 const DEFAULT_AUTH_CALLBACK_HOST = '127.0.0.1';
 const DEFAULT_AUTH_CALLBACK_PORT = 5179;
 const ENDPOINT_PROBE_TIMEOUT_MS = 900;
-const DISCOVERY_RETRY_SCHEDULE_MS = [1000, 2000, 5000, 10_000, 30_000, 60_000, 120_000, 300_000];
+// Hub-online delivery is an optimization, not a correctness dependency. A
+// browser, proxy, or suspended network can miss the wake event, so registry
+// polling must stay interactive instead of backing off to multi-minute waits.
+const DISCOVERY_RETRY_SCHEDULE_MS = [750, 750, 750, 750, 750, 750, 750, 750, 5000];
 const DISCOVERY_RETRY_JITTER_RATIO = 0.2;
 const HUB_WAKE_QUERY_JITTER_MAX_MS = 2000;
 const EXIT_INVALID_PAIR_TOKEN = 23;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.187",
+  "version": "0.1.189",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -41,10 +41,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.394",
-    "@livedesk/fast-osx-arm64": "0.1.394",
-    "@livedesk/fast-osx-x64": "0.1.394",
-    "@livedesk/fast-win-x64": "0.1.394"
+    "@livedesk/fast-linux-x64": "0.1.396",
+    "@livedesk/fast-osx-arm64": "0.1.396",
+    "@livedesk/fast-osx-x64": "0.1.396",
+    "@livedesk/fast-win-x64": "0.1.396"
   },
   "publishConfig": {
     "access": "public"

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

@@ -34,10 +34,84 @@ const READ_ONLY_CLIENT_API_PATHS = new Set([
   '/api/auth/status'
 ]);
 
-function normalizeString(value, maxLength = 1024) {
-  return String(value ?? '').replace(/[\r\n\t]/g, ' ').trim().slice(0, maxLength);
-}
-
+function normalizeString(value, maxLength = 1024) {
+  return String(value ?? '').replace(/[\r\n\t]/g, ' ').trim().slice(0, maxLength);
+}
+
+function normalizeAccountAvatarUrl(value) {
+  const candidate = normalizeString(value, 2048);
+  if (!candidate) return '';
+  try {
+    const url = new URL(candidate);
+    return url.protocol === 'https:' || url.protocol === 'http:' ? url.toString() : '';
+  } catch {
+    return '';
+  }
+}
+
+function readClientAccountProfile(sessionOrUser) {
+  const user = sessionOrUser?.user && typeof sessionOrUser.user === 'object'
+    ? sessionOrUser.user
+    : sessionOrUser && typeof sessionOrUser === 'object'
+      ? sessionOrUser
+      : {};
+  const metadata = user.user_metadata && typeof user.user_metadata === 'object'
+    ? user.user_metadata
+    : {};
+  const email = normalizeString(user.email, 320);
+  const name = normalizeString(
+    metadata.full_name
+      || metadata.name
+      || metadata.preferred_username
+      || user.name
+      || email
+      || user.id,
+    160
+  );
+  const avatarUrl = normalizeAccountAvatarUrl(
+    metadata.avatar_url
+      || metadata.picture
+      || user.avatar_url
+      || user.picture
+  );
+  return { email, name, avatarUrl };
+}
+
+function mergeClientAccountProfile(session, sourceUser) {
+  const profile = readClientAccountProfile(sourceUser);
+  const userMetadata = {
+    ...(profile.name ? { full_name: profile.name } : {}),
+    ...(profile.avatarUrl ? { avatar_url: profile.avatarUrl } : {})
+  };
+  return {
+    ...session,
+    user: {
+      ...(session?.user || {}),
+      ...(Object.keys(userMetadata).length > 0 ? { user_metadata: userMetadata } : {})
+    }
+  };
+}
+
+async function hydrateClientAccountProfile(session) {
+  const accessToken = normalizeString(session?.access_token, 8192);
+  if (!accessToken) return session;
+  try {
+    const response = await fetch(`${SUPABASE_URL.replace(/\/+$/, '')}/auth/v1/user`, {
+      headers: {
+        apikey: SUPABASE_PUBLISHABLE_KEY,
+        Authorization: `Bearer ${accessToken}`,
+        Accept: 'application/json'
+      },
+      signal: AbortSignal.timeout(5_000)
+    });
+    if (!response.ok) return session;
+    const verifiedUser = await response.json().catch(() => null);
+    return verifiedUser ? mergeClientAccountProfile(session, verifiedUser) : session;
+  } catch {
+    return session;
+  }
+}
+
 function normalizePort(value, fallback = DEFAULT_PORT) {
   const port = Number(value);
   return Number.isInteger(port) && port >= 1 && port <= 65535 ? port : fallback;
@@ -538,6 +612,7 @@ export function createClientRuntimeServer(options = {}) {
   const appVersion = normalizeString(options.appVersion || process.env.LIVEDESK_NPM_LAUNCHER_VERSION, 80) || 'dev';
   const savedSession = options.savedSession?.refresh_token ? options.savedSession : readSavedSession();
   const savedSessionPersisted = Boolean(savedSession?.refresh_token);
+  const savedAccountProfile = readClientAccountProfile(savedSession);
   let previousCpuTotals = readCpuTotals();
   let hardwareSnapshot = { gpus: [], disks: [], collectedAt: '', collecting: true };
   let networkSnapshot = { interfaces: activeNetworkInterfaces(), receivedBytes: 0, sentBytes: 0, receiveBytesPerSecond: 0, sendBytesPerSecond: 0, sampledAt: '' };
@@ -570,7 +645,9 @@ export function createClientRuntimeServer(options = {}) {
       lastResult: '',
       lastError: '',
       persisted: savedSessionPersisted,
-      email: normalizeString(savedSession?.user?.email, 320)
+      email: savedAccountProfile.email,
+      name: savedAccountProfile.name,
+      avatarUrl: savedAccountProfile.avatarUrl
     }
   };
   let completed = false;
@@ -586,8 +663,8 @@ export function createClientRuntimeServer(options = {}) {
   const runtime = createRuntimeManager({
     role: 'client',
     state: RuntimeState.WAITING_AUTH,
-    authenticated: Boolean(options.savedSession?.access_token),
-    userId: options.savedSession?.user?.id || '',
+    authenticated: Boolean(savedSession?.access_token),
+    userId: savedSession?.user?.id || '',
     deviceId,
     appVersion,
     startedAt: new Date().toISOString(),
@@ -673,6 +750,7 @@ export function createClientRuntimeServer(options = {}) {
     lastChoice = choice || lastChoice;
     if (completed) {
       if (choice?.session?.access_token) {
+        const accountProfile = readClientAccountProfile(choice.session);
         runtime.setAuthenticated(true, choice.session.user?.id || '');
         state.auth = {
           ...state.auth,
@@ -680,7 +758,9 @@ export function createClientRuntimeServer(options = {}) {
           lastResult: 'accepted',
           lastError: '',
           persisted: true,
-          email: normalizeString(choice.session.user?.email, 320)
+          email: accountProfile.email || state.auth.email,
+          name: accountProfile.name || state.auth.name,
+          avatarUrl: accountProfile.avatarUrl || state.auth.avatarUrl
         };
       }
       return;
@@ -695,12 +775,15 @@ export function createClientRuntimeServer(options = {}) {
       : [];
     state.message = message;
     state.lastError = '';
+    const accountProfile = readClientAccountProfile(choice?.session);
     state.auth = {
       ...state.auth,
       lastAttemptAt: state.connectedAt,
       lastResult: 'accepted',
       lastError: '',
-      email: normalizeString(choice?.session?.user?.email, 320) || state.auth.email
+      email: accountProfile.email || state.auth.email,
+      name: accountProfile.name || state.auth.name,
+      avatarUrl: accountProfile.avatarUrl || state.auth.avatarUrl
     };
     runtime.setAuthenticated(Boolean(choice?.session?.access_token), choice?.session?.user?.id || '');
     runtime.update({ state: RuntimeState.RESOLVING_ROLE }, 'credentials-accepted');
@@ -727,6 +810,8 @@ export function createClientRuntimeServer(options = {}) {
       authenticated: snapshot.authenticated,
       userId: snapshot.userId || '',
       userEmail: state.auth.email || '',
+      userName: state.auth.name || '',
+      userAvatarUrl: state.auth.avatarUrl || '',
       appVersion,
       runtimeId: `client-${snapshot.runtimePid}-${snapshot.startedAt}`,
       runtimePid: snapshot.runtimePid,
@@ -845,6 +930,8 @@ export function createClientRuntimeServer(options = {}) {
         authenticated: snapshot.authenticated,
         userId: snapshot.userId || null,
         userEmail: state.auth.email || null,
+        userName: state.auth.name || null,
+        userAvatarUrl: state.auth.avatarUrl || null,
         role: 'client'
       });
       return;
@@ -896,7 +983,10 @@ export function createClientRuntimeServer(options = {}) {
         const sessionCandidate = exchanged?.session || exchanged;
         const normalized = normalizeRuntimeAuthSession(sessionCandidate, { requireRefreshToken: true });
         if (!normalized.ok) throw new Error(normalized.error);
-        const session = { ...sessionCandidate, ...normalized.session };
+        const session = {
+          ...sessionCandidate,
+          ...mergeClientAccountProfile(normalized.session, sessionCandidate?.user)
+        };
         if (!writeSavedSession(session)) throw new Error('refresh-token-required');
         state.auth.persisted = true;
         complete({ type: 'google', session }, 'Signed in. Finding the LiveDesk Hub.');
@@ -928,11 +1018,15 @@ export function createClientRuntimeServer(options = {}) {
         respondJson(401, { ok: false, error: `supabase-user-verification-failed:${verifyResponse.status}` });
         return;
       }
-      const verifiedUser = await verifyResponse.json().catch(() => ({}));
-      const session = {
+      const verifiedUser = await verifyResponse.json().catch(() => ({}));
+      const verifiedSession = {
         ...normalized.session,
-        user: { id: normalizeString(verifiedUser?.id || body.user?.id || body.userId, 160), email: normalizeString(verifiedUser?.email || body.user?.email || body.email, 320) }
+        user: {
+          id: normalizeString(verifiedUser?.id || body.user?.id || body.userId, 160),
+          email: normalizeString(verifiedUser?.email || body.user?.email || body.email, 320)
+        }
       };
+      const session = mergeClientAccountProfile(verifiedSession, verifiedUser);
       try {
         if (!writeSavedSession(session)) throw new Error('refresh-token-required');
         state.auth.persisted = true;
@@ -954,7 +1048,15 @@ export function createClientRuntimeServer(options = {}) {
       state.manager = '';
       state.message = 'Saved sign-in was cleared. Sign in again to start the Client.';
       state.lastError = '';
-      state.auth = { lastAttemptAt: new Date().toISOString(), lastResult: 'cleared', lastError: '', persisted: false, email: '' };
+      state.auth = {
+        lastAttemptAt: new Date().toISOString(),
+        lastResult: 'cleared',
+        lastError: '',
+        persisted: false,
+        email: '',
+        name: '',
+        avatarUrl: ''
+      };
       runtime.setAuthenticated(false);
       respondJson(200, { ok: true, authenticated: false, role: 'client' });
       return;
@@ -1168,16 +1270,20 @@ export function createClientRuntimeServer(options = {}) {
           complete(initialChoice, initialChoiceMessage);
         });
       } else {
-        const saved = normalizeRuntimeAuthSession(options.savedSession, { requireRefreshToken: true });
+        const saved = normalizeRuntimeAuthSession(savedSession, { requireRefreshToken: true });
         if (saved.ok) {
           setImmediate(() => {
-            try {
-              if (!writeSavedSession(saved.session)) throw new Error('refresh-token-required');
-              state.auth.persisted = true;
-              complete({ type: 'google', session: saved.session }, 'Saved sign-in found. Finding the LiveDesk Hub.');
-            } catch (error) {
-              recordAuthAttempt('rejected', `session-persistence-failed:${normalizeString(error?.message || error, 160)}`);
-            }
+            void (async () => {
+              try {
+                const normalizedSession = mergeClientAccountProfile(saved.session, savedSession?.user);
+                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)}`);
+              }
+            })();
           });
         }
       }