npm - @livedesk/client - Versions diffs - 0.1.56 → 0.1.57 - Mend

@livedesk/client 0.1.56 → 0.1.57

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/bin/livedesk-client.js +438 -27
package/package.json +1 -1

package/bin/livedesk-client.js CHANGED Viewed

@@ -38,6 +38,7 @@ Usage:
 Default flow:
   Opens a LiveDesk connection page with Google sign-in or a 6-digit PIN.
+  After auth, that page stays open as this computer's client dashboard.
   Omit the number for first-available placement, or pass 1-999 to pin a slot.
   If no LiveDesk Hub is active yet, the client keeps checking every 5 seconds.
@@ -945,6 +946,318 @@ function renderConnectionChoicePage({ error = '', pin = '', slot = '', startup =
 </html>`;
 }
+function getChoiceEmail(choice) {
+    return choice?.session?.user?.email || '';
+}
+function getDashboardAuthLabel(choice, loggedOut = false) {
+    if (loggedOut) {
+        return 'Signed out';
+    }
+    if (choice?.type === 'pin') {
+        return 'PIN approved';
+    }
+    const email = getChoiceEmail(choice);
+    return email ? `Google - ${email}` : 'Google signed in';
+}
+function renderConnectionDashboardPage(state = {}) {
+    const choice = state.choice || null;
+    const connectedAt = state.connectedAt || new Date().toISOString();
+    const authLabel = getDashboardAuthLabel(choice, state.loggedOut);
+    const manager = state.manager || (choice?.manager || '');
+    const slot = normalizeSlotNumber(state.slot) ? `Slot ${String(state.slot).padStart(3, '0')}` : 'First available';
+    const statusLabel = state.loggedOut
+        ? 'Signed out for next restart'
+        : manager
+            ? 'Client starting'
+            : 'Finding Hub';
+    const message = state.message || (manager
+        ? 'The LiveDesk client is running from the terminal. Keep this tab open as the local client dashboard.'
+        : 'Sign-in is complete. The client is looking for the active LiveDesk Hub and will start automatically.');
+    const stateJson = JSON.stringify({
+        authLabel,
+        connectedAt,
+        manager,
+        message,
+        slot,
+        startup: Boolean(state.startup),
+        statusLabel
+    }).replaceAll('<', '\\u003c');
+    return `<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>LiveDesk Client Dashboard</title>
+  <style>
+    :root { color-scheme: light; font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
+    * { box-sizing: border-box; }
+    html, body { width: 100%; min-height: 100%; margin: 0; }
+    body {
+      min-height: 100vh;
+      display: grid;
+      place-items: center;
+      padding: 28px;
+      background:
+        radial-gradient(circle at 78% 10%, rgba(203, 213, 225, 0.46), transparent 24%),
+        linear-gradient(180deg, #f8fafc, #eef2f7);
+      color: #111827;
+    }
+    main {
+      width: min(920px, 100%);
+      display: grid;
+      grid-template-columns: minmax(280px, 0.88fr) minmax(320px, 1.12fr);
+      overflow: hidden;
+      border: 1px solid rgba(148, 163, 184, 0.28);
+      border-radius: 18px;
+      background: rgba(255, 255, 255, 0.92);
+      box-shadow: 0 36px 110px rgba(15, 23, 42, 0.14);
+    }
+    .hero {
+      display: grid;
+      align-content: space-between;
+      gap: 34px;
+      padding: 34px;
+      border-right: 1px solid rgba(148, 163, 184, 0.22);
+      background:
+        linear-gradient(145deg, rgba(255, 255, 255, 0.9), rgba(248, 250, 252, 0.86)),
+        #ffffff;
+    }
+    .brand {
+      display: flex;
+      align-items: center;
+      gap: 13px;
+    }
+    .mark {
+      width: 40px;
+      height: 40px;
+      display: grid;
+      place-items: center;
+      border-radius: 10px;
+      background: linear-gradient(135deg, #2dd4bf, #2563eb);
+      color: #ffffff;
+      font-size: 13px;
+      font-weight: 800;
+      box-shadow: 0 14px 30px rgba(37, 99, 235, 0.18);
+    }
+    .brand-copy { display: grid; gap: 2px; line-height: 1; }
+    .brand-copy strong { font-size: 15px; font-weight: 700; }
+    .brand-copy span { color: #64748b; font-size: 12px; font-weight: 500; }
+    .headline { display: grid; gap: 10px; }
+    .eyebrow {
+      color: #475569;
+      font-size: 11px;
+      font-weight: 800;
+      letter-spacing: 0.08em;
+      text-transform: uppercase;
+    }
+    h1 {
+      margin: 0;
+      font-size: 34px;
+      line-height: 1.06;
+      font-weight: 680;
+      letter-spacing: 0;
+    }
+    p {
+      margin: 0;
+      color: #64748b;
+      font-size: 14px;
+      line-height: 1.62;
+      font-weight: 450;
+    }
+    .panel {
+      display: grid;
+      gap: 16px;
+      padding: 34px;
+    }
+    .status-card {
+      display: grid;
+      gap: 14px;
+      padding: 18px;
+      border: 1px solid rgba(148, 163, 184, 0.24);
+      border-radius: 14px;
+      background: #ffffff;
+      box-shadow:
+        0 20px 50px rgba(15, 23, 42, 0.09),
+        0 1px 0 rgba(255, 255, 255, 0.9) inset;
+    }
+    .status-head {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 12px;
+    }
+    .status-pill {
+      min-height: 28px;
+      display: inline-flex;
+      align-items: center;
+      gap: 7px;
+      padding: 0 10px;
+      border: 1px solid rgba(20, 184, 166, 0.25);
+      border-radius: 999px;
+      background: rgba(20, 184, 166, 0.08);
+      color: #0f766e;
+      font-size: 12px;
+      font-weight: 760;
+    }
+    .status-pill::before {
+      content: "";
+      width: 8px;
+      height: 8px;
+      border-radius: 999px;
+      background: #14b8a6;
+      box-shadow: 0 0 0 4px rgba(20, 184, 166, 0.12);
+    }
+    .status-card h2 {
+      margin: 0;
+      color: #111827;
+      font-size: 20px;
+      line-height: 1.18;
+    }
+    dl {
+      display: grid;
+      grid-template-columns: 118px minmax(0, 1fr);
+      gap: 9px 14px;
+      margin: 0;
+      padding-top: 4px;
+    }
+    dt {
+      color: #64748b;
+      font-size: 12px;
+      font-weight: 650;
+    }
+    dd {
+      min-width: 0;
+      margin: 0;
+      overflow: hidden;
+      color: #111827;
+      font-size: 13px;
+      font-weight: 680;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    .actions {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      gap: 10px;
+    }
+    button, a.button {
+      min-height: 40px;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      border: 1px solid #111827;
+      border-radius: 9px;
+      background: #111827;
+      color: #ffffff;
+      font-size: 13px;
+      font-weight: 680;
+      text-decoration: none;
+      cursor: pointer;
+      box-shadow: 0 12px 26px rgba(15, 23, 42, 0.13);
+    }
+    button.secondary, a.secondary {
+      border-color: rgba(148, 163, 184, 0.36);
+      background: #ffffff;
+      color: #1f2937;
+      box-shadow: 0 8px 20px rgba(15, 23, 42, 0.08);
+    }
+    .muted-card {
+      padding: 14px 16px;
+      border: 1px dashed rgba(148, 163, 184, 0.34);
+      border-radius: 12px;
+      background: rgba(248, 250, 252, 0.8);
+      color: #64748b;
+      font-size: 13px;
+      line-height: 1.55;
+      font-weight: 500;
+    }
+    @media (max-width: 760px) {
+      body { padding: 14px; }
+      main { grid-template-columns: 1fr; }
+      .hero { border-right: 0; border-bottom: 1px solid rgba(148, 163, 184, 0.22); }
+      .hero, .panel { padding: 24px; }
+      h1 { font-size: 28px; }
+      .actions { grid-template-columns: 1fr; }
+    }
+  </style>
+</head>
+<body>
+  <main>
+    <section class="hero">
+      <div class="brand">
+        <div class="mark">LD</div>
+        <div class="brand-copy">
+          <strong>LiveDesk</strong>
+          <span>Client dashboard</span>
+        </div>
+      </div>
+      <div class="headline">
+        <span class="eyebrow">This computer</span>
+        <h1>Client is ready</h1>
+        <p id="message">${escapeHtml(message)}</p>
+      </div>
+      <p>Keep this page open if you want a local control surface for this workstation. Reboots can reconnect automatically when startup is enabled.</p>
+    </section>
+    <section class="panel">
+      <article class="status-card">
+        <div class="status-head">
+          <h2>Connection</h2>
+          <span id="status" class="status-pill">${escapeHtml(statusLabel)}</span>
+        </div>
+        <dl>
+          <dt>Auth</dt><dd id="auth">${escapeHtml(authLabel)}</dd>
+          <dt>Hub</dt><dd id="manager">${escapeHtml(manager || 'waiting')}</dd>
+          <dt>Placement</dt><dd id="slot">${escapeHtml(slot)}</dd>
+          <dt>Startup</dt><dd id="startup">${state.startup ? 'enabled' : 'manual'}</dd>
+          <dt>Started</dt><dd id="connected-at">${escapeHtml(connectedAt)}</dd>
+        </dl>
+      </article>
+      <div class="actions">
+        <a class="button secondary" href="/">Refresh dashboard</a>
+        <form method="post" action="/logout">
+          <button class="secondary" type="submit">Logout</button>
+        </form>
+      </div>
+      <div class="muted-card">The terminal process starts the screen stream automatically after auth. This dashboard stays available for logout and future workstation controls.</div>
+    </section>
+  </main>
+  <script>
+    const initialState = ${stateJson};
+    function setText(id, value) {
+      const node = document.getElementById(id);
+      if (node) node.textContent = value || '';
+    }
+    function applyState(state) {
+      setText('status', state.statusLabel || initialState.statusLabel);
+      setText('auth', state.authLabel || initialState.authLabel);
+      setText('manager', state.manager || 'waiting');
+      setText('slot', state.slot || initialState.slot);
+      setText('startup', state.startup ? 'enabled' : 'manual');
+      setText('connected-at', state.connectedAt || initialState.connectedAt);
+      setText('message', state.message || initialState.message);
+    }
+    applyState(initialState);
+    if (location.pathname === '/callback') {
+      history.replaceState(null, '', '/');
+    }
+    async function refreshState() {
+      try {
+        const response = await fetch('/api/state', { cache: 'no-store' });
+        if (!response.ok) return;
+        applyState(await response.json());
+      } catch {
+      }
+    }
+    setInterval(refreshState, 1000);
+    refreshState();
+  </script>
+</body>
+</html>`;
+}
 function normalizePairingPin(value) {
     const pin = String(value || '').trim();
     return /^\d{6}$/.test(pin) ? pin : '';
@@ -1010,7 +1323,17 @@ async function startConnectionChoiceServer(supabase, options = {}) {
     let listeningPort = port;
     let completed = false;
     let completedTitle = 'LiveDesk connection complete';
-    let completedMessage = 'You can close this tab and return to the terminal.';
+    let completedMessage = 'The LiveDesk client is starting automatically.';
+    const dashboardState = {
+        choice: null,
+        connectedAt: '',
+        endpointCandidates: [],
+        loggedOut: false,
+        manager: '',
+        message: completedMessage,
+        slot,
+        startup: pendingStartup
+    };
     let settleChoice;
     let rejectChoice;
     const waitForChoice = new Promise((resolve, reject) => {
@@ -1022,8 +1345,18 @@ async function startConnectionChoiceServer(supabase, options = {}) {
         completed = true;
         completedTitle = title;
         completedMessage = message;
-        settleChoice(choice);
-        setImmediate(() => server.close());
+        dashboardState.choice = choice;
+        dashboardState.connectedAt = new Date().toISOString();
+        dashboardState.endpointCandidates = Array.isArray(choice?.endpointCandidates) ? choice.endpointCandidates : [];
+        dashboardState.loggedOut = false;
+        dashboardState.manager = choice?.manager || '';
+        dashboardState.message = message;
+        dashboardState.startup = pendingStartup;
+        if (settleChoice) {
+            const resolveChoice = settleChoice;
+            settleChoice = null;
+            resolveChoice(choice);
+        }
     };
     const renderChoice = (props = {}) => renderConnectionChoicePage({
         slot,
@@ -1031,6 +1364,30 @@ async function startConnectionChoiceServer(supabase, options = {}) {
         startupSupported: isWindowsStartupSupported(),
         ...props
     });
+    const renderDashboard = (props = {}) => renderConnectionDashboardPage({
+        ...dashboardState,
+        slot,
+        startup: pendingStartup,
+        ...props
+    });
+    const getDashboardApiState = () => {
+        const manager = dashboardState.manager || dashboardState.choice?.manager || '';
+        return {
+            authLabel: getDashboardAuthLabel(dashboardState.choice, dashboardState.loggedOut),
+            connectedAt: dashboardState.connectedAt || '',
+            manager,
+            message: dashboardState.message || completedMessage,
+            slot: normalizeSlotNumber(slot) ? `Slot ${String(slot).padStart(3, '0')}` : 'First available',
+            startup: Boolean(pendingStartup),
+            statusLabel: dashboardState.loggedOut
+                ? 'Signed out for next restart'
+                : manager
+                    ? 'Client starting'
+                    : completed
+                        ? 'Finding Hub'
+                        : 'Waiting for auth'
+        };
+    };
     const handleError = (res, error, pin = '') => {
         res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
@@ -1048,15 +1405,44 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                 res.end();
                 return;
             }
-            if (completed) {
+            if (requestUrl.pathname === '/api/state') {
+                res.writeHead(200, {
+                    'Content-Type': 'application/json; charset=utf-8',
+                    'Cache-Control': 'no-store'
+                });
+                res.end(JSON.stringify(getDashboardApiState()));
+                return;
+            }
+            if (requestUrl.pathname === '/logout') {
+                try {
+                    await supabase.auth.signOut();
+                } catch {
+                }
+                rmSync(CLIENT_AUTH_PATH, { force: true });
+                dashboardState.choice = null;
+                dashboardState.loggedOut = true;
+                dashboardState.manager = '';
+                dashboardState.message = 'Saved Google sign-in was cleared. Restart this client to sign in again.';
+                if (req.method !== 'GET') {
+                    res.writeHead(303, { Location: completed ? '/' : '/connect' });
+                    res.end();
+                    return;
+                }
                 res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-                res.end(renderOAuthCallbackPage({
-                    title: completedTitle,
-                    message: completedMessage
+                res.end(completed ? renderDashboard() : renderChoice({
+                    error: 'Saved Google sign-in was cleared.'
                 }));
                 return;
             }
+            if (completed) {
+                res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+                res.end(renderDashboard());
+                return;
+            }
             if (requestUrl.pathname === '/' || requestUrl.pathname === '/connect') {
                 res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
                 res.end(renderChoice());
@@ -1068,12 +1454,10 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                 const { data: existing } = await supabase.auth.getSession();
                 if (existing?.session?.access_token) {
                     applyStartupPreference(pendingStartup, startupArgs);
+                    const choice = { type: 'google', session: existing.session };
+                    complete(choice, 'LiveDesk client dashboard', 'Signed in. The client is starting automatically.');
                     res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-                    res.end(renderOAuthCallbackPage({
-                        title: 'LiveDesk sign-in ready',
-                        message: 'You can close this tab and return to the terminal.'
-                    }));
-                    complete({ type: 'google', session: existing.session }, 'LiveDesk sign-in ready');
+                    res.end(renderDashboard());
                     return;
                 }
@@ -1111,12 +1495,10 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                 try {
                     const resolved = await resolveManagerFromPin(supabase, pin);
                     applyStartupPreference(pendingStartup, startupArgs);
+                    const choice = { type: 'pin', ...resolved };
+                    complete(choice, 'LiveDesk client dashboard', 'PIN accepted. The client is starting automatically.');
                     res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-                    res.end(renderOAuthCallbackPage({
-                        title: 'LiveDesk PIN accepted',
-                        message: 'You can close this tab and return to the terminal.'
-                    }));
-                    complete({ type: 'pin', ...resolved }, 'LiveDesk PIN accepted');
+                    res.end(renderDashboard());
                 } catch (err) {
                     handleError(res, err, pin);
                 }
@@ -1134,7 +1516,9 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                         tone: 'error'
                     }));
                     completed = true;
-                    rejectChoice(new Error(error));
+                    if (rejectChoice) {
+                        rejectChoice(new Error(error));
+                    }
                     server.close();
                     return;
                 }
@@ -1155,17 +1539,17 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                         tone: 'error'
                     }));
                     completed = true;
-                    rejectChoice(message instanceof Error ? message : new Error(String(message)));
+                    if (rejectChoice) {
+                        rejectChoice(message instanceof Error ? message : new Error(String(message)));
+                    }
                     server.close();
                     return;
                 }
                 applyStartupPreference(pendingStartup, startupArgs);
+                const choice = { type: 'google', session: sessionData.session };
+                complete(choice, 'LiveDesk client dashboard', 'Signed in. The client is starting automatically.');
                 res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-                res.end(renderOAuthCallbackPage({
-                    title: 'LiveDesk sign-in complete',
-                    message: 'You can close this tab and return to the terminal.'
-                }));
-                complete({ type: 'google', session: sessionData.session }, 'LiveDesk sign-in complete');
+                res.end(renderDashboard());
                 return;
             }
@@ -1184,7 +1568,9 @@ async function startConnectionChoiceServer(supabase, options = {}) {
             }));
             if (!completed) {
                 completed = true;
-                rejectChoice(err instanceof Error ? err : new Error(String(err)));
+                if (rejectChoice) {
+                    rejectChoice(err instanceof Error ? err : new Error(String(err)));
+                }
                 server.close();
             }
         });
@@ -1206,7 +1592,16 @@ async function startConnectionChoiceServer(supabase, options = {}) {
         get url() {
             return `http://${host}:${listeningPort}/`;
         },
-        waitForChoice
+        waitForChoice,
+        close() {
+            try {
+                server.close();
+            } catch {
+            }
+        },
+        update(patch = {}) {
+            Object.assign(dashboardState, patch);
+        }
     };
 }
@@ -1218,7 +1613,8 @@ async function chooseClientConnection(supabase, options = {}) {
     });
     console.log('Opening LiveDesk connection page...');
     openBrowser(connectionPage.url);
-    return connectionPage.waitForChoice;
+    const choice = await connectionPage.waitForChoice;
+    return { ...choice, connectionPage };
 }
 function parseManagerEndpoint(value) {
@@ -1342,6 +1738,7 @@ async function prepareLoginConnection(parsed) {
     let forwarded = [...parsed.forwarded];
     let manager = parsed.manager;
     let pair = parsed.pair;
+    let connectionPage = null;
     if (shouldLogin) {
         const supabase = await createSupabaseClient();
@@ -1361,9 +1758,15 @@ async function prepareLoginConnection(parsed) {
                 slot: parsed.slot,
                 startupArgs
             });
+        connectionPage = choice.connectionPage || null;
         if (choice.type === 'pin') {
             manager = choice.manager;
             pair = choice.pair;
+            connectionPage?.update({
+                endpointCandidates: choice.endpointCandidates || [],
+                manager,
+                message: `Connected to LiveDesk Hub at ${manager}.`
+            });
             console.log('Connected by LiveDesk PIN.');
         } else {
             const session = choice.session;
@@ -1372,6 +1775,11 @@ async function prepareLoginConnection(parsed) {
             const resolved = await waitForManagerFromSupabase(supabase);
             manager = resolved.manager;
             pair = resolved.pair;
+            connectionPage?.update({
+                endpointCandidates: resolved.endpointCandidates || [],
+                manager,
+                message: `Connected to LiveDesk Hub at ${manager}.`
+            });
         }
         console.log(`Found LiveDesk Hub at ${manager}.`);
     }
@@ -1394,6 +1802,7 @@ async function prepareLoginConnection(parsed) {
         manager,
         pair,
         slot,
+        connectionPage,
         forwarded,
         rediscoverOnInvalidPair: shouldLogin
     };
@@ -1674,6 +2083,7 @@ async function main() {
                 result = await spawnAgent(fastLaunch.command, [...fastLaunch.argsPrefix, ...fastArgs], buildFastEnvironment());
             } else if (prepared.engine === 'fast') {
                 console.error(`C# RemoteFast is unavailable: ${fastLaunch.reason}. Use --engine node to run the legacy Node agent.`);
+                prepared.connectionPage?.close?.();
                 process.exit(2);
             } else {
                 console.warn(`C# RemoteFast is unavailable (${fastLaunch.reason}). Falling back to the Node remote agent.`);
@@ -1682,6 +2092,7 @@ async function main() {
         } else {
             result = await spawnAgent(process.execPath, [nodeAgentPath, ...prepared.forwarded]);
         }
+        prepared.connectionPage?.close?.();
         if (result?.signal) {
             process.kill(process.pid, result.signal);
             return;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.56",
+  "version": "0.1.57",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {