npm - @livedesk/client - Versions diffs - 0.1.48 → 0.1.50 - Mend

@livedesk/client 0.1.48 → 0.1.50

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 (11) hide show

package/bin/livedesk-client-node.js +10 -0
package/bin/livedesk-client.js +392 -74
package/fast/linux-x64/livedesk-client-fast.dll +0 -0
package/fast/linux-x64/livedesk-client-fast.pdb +0 -0
package/fast/osx-arm64/livedesk-client-fast.dll +0 -0
package/fast/osx-arm64/livedesk-client-fast.pdb +0 -0
package/fast/osx-x64/livedesk-client-fast.dll +0 -0
package/fast/osx-x64/livedesk-client-fast.pdb +0 -0
package/fast/win-x64/livedesk-client-fast.dll +0 -0
package/fast/win-x64/livedesk-client-fast.pdb +0 -0
package/package.json +1 -1

package/bin/livedesk-client-node.js CHANGED Viewed

@@ -494,6 +494,8 @@ function createFakeThumbnailFrame(options, payload, frameSeq) {
         frameSeq,
         width,
         height,
+        sourceWidth: width,
+        sourceHeight: height,
         mimeType: 'image/svg+xml',
         data: Buffer.from(svg, 'utf8').toString('base64'),
         capturedAt: now
@@ -564,6 +566,8 @@ async function captureNativeDesktopFrame(frameSeq, monitorIndex = 0) {
         frameSeq,
         width: dimensions.width,
         height: dimensions.height,
+        sourceWidth: dimensions.width,
+        sourceHeight: dimensions.height,
         mimeType: 'image/jpeg',
         data: buffer.toString('base64'),
         monitorIndex: selectedIndex,
@@ -758,6 +762,8 @@ function startLiveStream(socket, options, message, nextFrameSeq, activeStreams)
                 frameSeq: frame.frameSeq,
                 width: frame.width,
                 height: frame.height,
+                sourceWidth: frame.sourceWidth || frame.width,
+                sourceHeight: frame.sourceHeight || frame.height,
                 mimeType: frame.mimeType,
                 capturedAt: frame.capturedAt,
                 fps,
@@ -898,6 +904,8 @@ async function handleRemoteCommand(socket, options, message, nextFrameSeq, activ
                 frameSeq: frame.frameSeq,
                 width: frame.width,
                 height: frame.height,
+                sourceWidth: frame.sourceWidth || frame.width,
+                sourceHeight: frame.sourceHeight || frame.height,
                 mimeType: frame.mimeType,
                 capturedAt: frame.capturedAt,
                 data: frame.data
@@ -910,6 +918,8 @@ async function handleRemoteCommand(socket, options, message, nextFrameSeq, activ
                     frameSeq: frame.frameSeq,
                     width: frame.width,
                     height: frame.height,
+                    sourceWidth: frame.sourceWidth || frame.width,
+                    sourceHeight: frame.sourceHeight || frame.height,
                     capturedAt: frame.capturedAt
                 }
             });

package/bin/livedesk-client.js CHANGED Viewed

@@ -35,7 +35,7 @@ Usage:
   npx @livedesk/client 3
 Default flow:
-  Opens Google sign-in, waits for the signed-in LiveDesk Hub, and connects locally.
+  Opens a LiveDesk connection page with Google sign-in or a 6-digit PIN.
   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.
@@ -428,18 +428,262 @@ function renderOAuthCallbackPage({ title, message, tone = 'neutral' }) {
 </html>`;
 }
-async function startOAuthCallbackServer(options = {}) {
+function renderConnectionChoicePage({ error = '', pin = '' } = {}) {
+    const errorBlock = error
+        ? `<div class="error">${escapeHtml(error)}</div>`
+        : '';
+    return `<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Connect LiveDesk</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 {
+      display: grid;
+      place-items: center;
+      padding: 24px;
+      background:
+        radial-gradient(circle at 50% 0%, rgba(148, 163, 184, 0.22), transparent 34%),
+        linear-gradient(180deg, #f8fafc, #eef2f7);
+      color: #111827;
+    }
+    main {
+      width: min(440px, 100%);
+      display: grid;
+      gap: 18px;
+      border: 1px solid rgba(148, 163, 184, 0.26);
+      border-radius: 18px;
+      padding: 28px;
+      background: rgba(255, 255, 255, 0.92);
+      box-shadow: 0 24px 70px rgba(15, 23, 42, 0.14);
+    }
+    .brand {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+    }
+    .mark {
+      width: 42px;
+      height: 42px;
+      display: grid;
+      place-items: center;
+      border-radius: 10px;
+      background: #111827;
+      color: #ffffff;
+      font-weight: 950;
+    }
+    h1 { margin: 0; font-size: 28px; line-height: 1.05; letter-spacing: 0; }
+    p { margin: 5px 0 0; color: #64748b; font-size: 14px; line-height: 1.45; font-weight: 650; }
+    .panel {
+      display: grid;
+      gap: 12px;
+      border: 1px solid rgba(148, 163, 184, 0.22);
+      border-radius: 14px;
+      padding: 14px;
+      background: #ffffff;
+    }
+    form {
+      display: grid;
+      gap: 12px;
+      margin: 0;
+    }
+    label {
+      display: grid;
+      gap: 8px;
+      color: #475569;
+      font-size: 12px;
+      font-weight: 900;
+      text-transform: uppercase;
+      letter-spacing: 0.04em;
+    }
+    input {
+      height: 48px;
+      border: 1px solid rgba(148, 163, 184, 0.45);
+      border-radius: 12px;
+      padding: 0 14px;
+      color: #111827;
+      font-size: 24px;
+      font-weight: 950;
+      letter-spacing: 0.18em;
+      text-align: center;
+      outline: 0;
+    }
+    input:focus {
+      border-color: #111827;
+      box-shadow: 0 0 0 3px rgba(17, 24, 39, 0.08);
+    }
+    button, .google {
+      height: 44px;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      gap: 8px;
+      border: 0;
+      border-radius: 12px;
+      background: #111827;
+      color: #ffffff;
+      font-size: 14px;
+      font-weight: 900;
+      text-decoration: none;
+      cursor: pointer;
+    }
+    .google {
+      background: #ffffff;
+      border: 1px solid rgba(148, 163, 184, 0.35);
+      color: #111827;
+    }
+    .divider {
+      display: grid;
+      grid-template-columns: 1fr auto 1fr;
+      gap: 10px;
+      align-items: center;
+      color: #94a3b8;
+      font-size: 11px;
+      font-weight: 900;
+      text-transform: uppercase;
+      letter-spacing: 0.08em;
+    }
+    .divider::before, .divider::after {
+      content: "";
+      height: 1px;
+      background: rgba(148, 163, 184, 0.3);
+    }
+    .error {
+      border: 1px solid rgba(220, 38, 38, 0.22);
+      border-radius: 12px;
+      padding: 10px 12px;
+      background: rgba(254, 226, 226, 0.75);
+      color: #991b1b;
+      font-size: 13px;
+      font-weight: 800;
+    }
+    small {
+      color: #94a3b8;
+      text-align: center;
+      font-size: 12px;
+      font-weight: 750;
+    }
+  </style>
+</head>
+<body>
+  <main>
+    <div class="brand">
+      <div class="mark">LD</div>
+      <div>
+        <h1>Connect LiveDesk</h1>
+        <p>Use Google for your own Hub, or enter the 6-digit PIN shown on the screen wall.</p>
+      </div>
+    </div>
+    ${errorBlock}
+    <section class="panel">
+      <form method="post" action="/pin">
+        <label>
+          Pairing PIN
+          <input name="pin" value="${escapeHtml(pin)}" inputmode="numeric" autocomplete="one-time-code" pattern="[0-9]{6}" maxlength="6" placeholder="000000" autofocus>
+        </label>
+        <button type="submit">Connect with PIN</button>
+      </form>
+    </section>
+    <div class="divider">or</div>
+    <a class="google" href="/google">Continue with Google</a>
+    <small>LiveDesk Client</small>
+  </main>
+</body>
+</html>`;
+}
+function normalizePairingPin(value) {
+    const pin = String(value || '').trim();
+    return /^\d{6}$/.test(pin) ? pin : '';
+}
+function readRequestBody(req, maxBytes = 4096) {
+    return new Promise((resolve, reject) => {
+        let body = '';
+        req.setEncoding('utf8');
+        req.on('data', chunk => {
+            body += chunk;
+            if (body.length > maxBytes) {
+                reject(new Error('Request body is too large.'));
+                req.destroy();
+            }
+        });
+        req.on('end', () => resolve(body));
+        req.on('error', reject);
+    });
+}
+async function resolveManagerFromPin(supabase, pin) {
+    const normalizedPin = normalizePairingPin(pin);
+    if (!normalizedPin) {
+        throw new Error('Enter a 6-digit LiveDesk PIN.');
+    }
+    const { data, error } = await supabase.rpc('resolve_livedesk_remote_host_pin', {
+        p_pairing_pin: normalizedPin
+    });
+    if (error) {
+        throw error;
+    }
+    const result = Array.isArray(data) ? data[0] : data;
+    if (!result?.ok) {
+        throw new Error(result?.reason || 'pin-not-found');
+    }
+    if (!result.pair_token) {
+        throw new Error('The PIN matched a Hub record without a private connection token.');
+    }
+    const endpointCandidates = normalizeEndpointCandidates(result);
+    if (endpointCandidates.length === 0) {
+        throw new Error('The PIN matched a Hub record without a reachable address.');
+    }
+    const manager = await chooseReachableEndpoint(endpointCandidates, { requireReachable: true });
+    if (!manager) {
+        throw new Error(`No reachable LiveDesk Hub endpoint yet. Checked ${endpointCandidates.join(', ')}.`);
+    }
+    return {
+        manager,
+        pair: result.pair_token,
+        endpointCandidates
+    };
+}
+async function startConnectionChoiceServer(supabase, options = {}) {
     const host = String(process.env.LIVEDESK_CLIENT_AUTH_HOST || DEFAULT_AUTH_CALLBACK_HOST).trim() || DEFAULT_AUTH_CALLBACK_HOST;
     const port = normalizePort(options.authPort) || DEFAULT_AUTH_CALLBACK_PORT;
     let listeningPort = port;
     let completed = false;
-    let settleCode;
-    let rejectCode;
-    const waitForCode = new Promise((resolve, reject) => {
-        settleCode = resolve;
-        rejectCode = reject;
+    let completedTitle = 'LiveDesk connection complete';
+    let completedMessage = 'You can close this tab and return to the terminal.';
+    let settleChoice;
+    let rejectChoice;
+    const waitForChoice = new Promise((resolve, reject) => {
+        settleChoice = resolve;
+        rejectChoice = reject;
     });
+    const complete = (choice, title = completedTitle, message = completedMessage) => {
+        completed = true;
+        completedTitle = title;
+        completedMessage = message;
+        settleChoice(choice);
+        setImmediate(() => server.close());
+    };
+    const handleError = (res, error, pin = '') => {
+        res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+        res.end(renderConnectionChoicePage({
+            error: error instanceof Error ? error.message : String(error),
+            pin
+        }));
+    };
     const server = createServer((req, res) => {
+        void (async () => {
             const requestUrl = new URL(req.url || '/', `http://${host}:${listeningPort}`);
             if (requestUrl.pathname === '/favicon.ico') {
                 res.writeHead(204);
@@ -449,42 +693,136 @@ async function startOAuthCallbackServer(options = {}) {
             if (completed) {
                 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.'
+                    title: completedTitle,
+                    message: completedMessage
                 }));
                 return;
             }
-            const code = requestUrl.searchParams.get('code');
-            const error = requestUrl.searchParams.get('error_description') || requestUrl.searchParams.get('error');
-            if (error) {
-                res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
-                res.end(renderOAuthCallbackPage({
-                    title: 'LiveDesk sign-in failed',
-                    message: error,
-                    tone: 'error'
-                }));
-                completed = true;
-                rejectCode(new Error(error));
-                server.close();
+            if (requestUrl.pathname === '/' || requestUrl.pathname === '/connect') {
+                res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+                res.end(renderConnectionChoicePage());
+                return;
+            }
+            if (requestUrl.pathname === '/google') {
+                const { data: existing } = await supabase.auth.getSession();
+                if (existing?.session?.access_token) {
+                    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');
+                    return;
+                }
+                const { data, error } = await supabase.auth.signInWithOAuth({
+                    provider: 'google',
+                    options: {
+                        redirectTo: `http://${host}:${listeningPort}/callback`,
+                        scopes: 'email profile'
+                    }
+                });
+                if (error) {
+                    handleError(res, error);
+                    return;
+                }
+                if (!data?.url) {
+                    handleError(res, new Error('Supabase did not return a Google sign-in URL.'));
+                    return;
+                }
+                res.writeHead(302, { Location: data.url });
+                res.end();
                 return;
             }
-            if (!code) {
-                res.writeHead(404, { 'Content-Type': 'text/html; charset=utf-8' });
+            if (requestUrl.pathname === '/pin') {
+                let pin = requestUrl.searchParams.get('pin') || '';
+                if (req.method !== 'GET') {
+                    const body = await readRequestBody(req);
+                    const params = new URLSearchParams(body);
+                    pin = params.get('pin') || pin;
+                }
+                pin = normalizePairingPin(pin);
+                try {
+                    const resolved = await resolveManagerFromPin(supabase, pin);
+                    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');
+                } catch (err) {
+                    handleError(res, err, pin);
+                }
+                return;
+            }
+            if (requestUrl.pathname === '/callback') {
+                const code = requestUrl.searchParams.get('code');
+                const error = requestUrl.searchParams.get('error_description') || requestUrl.searchParams.get('error');
+                if (error) {
+                    res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
+                    res.end(renderOAuthCallbackPage({
+                        title: 'LiveDesk sign-in failed',
+                        message: error,
+                        tone: 'error'
+                    }));
+                    completed = true;
+                    rejectChoice(new Error(error));
+                    server.close();
+                    return;
+                }
+                if (!code) {
+                    res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+                    res.end(renderConnectionChoicePage({
+                        error: 'Google did not return an auth code. Try Google sign-in again.'
+                    }));
+                    return;
+                }
+                const { data: sessionData, error: exchangeError } = await supabase.auth.exchangeCodeForSession(code);
+                if (exchangeError || !sessionData?.session) {
+                    const message = exchangeError || new Error('Google sign-in did not return a LiveDesk session.');
+                    res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
+                    res.end(renderOAuthCallbackPage({
+                        title: 'LiveDesk sign-in failed',
+                        message: message instanceof Error ? message.message : String(message),
+                        tone: 'error'
+                    }));
+                    completed = true;
+                    rejectChoice(message instanceof Error ? message : new Error(String(message)));
+                    server.close();
+                    return;
+                }
+                res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
                 res.end(renderOAuthCallbackPage({
-                    title: 'Waiting for LiveDesk sign-in',
-                    message: 'This local callback is waiting for an auth code from Google.',
-                    tone: 'waiting'
+                    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');
                 return;
             }
-            res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+            res.writeHead(404, { 'Content-Type': 'text/html; charset=utf-8' });
+            res.end(renderConnectionChoicePage({
+                error: 'Unknown LiveDesk connection route.'
+            }));
+        })().catch(err => {
+            if (!res.headersSent) {
+                res.writeHead(500, { '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.'
+                title: 'LiveDesk connection failed',
+                message: err instanceof Error ? err.message : String(err),
+                tone: 'error'
             }));
-            completed = true;
-            settleCode(code);
-            server.close();
+            if (!completed) {
+                completed = true;
+                rejectChoice(err instanceof Error ? err : new Error(String(err)));
+                server.close();
+            }
+        });
     });
     try {
         await new Promise((resolve, reject) => {
@@ -495,50 +833,23 @@ async function startOAuthCallbackServer(options = {}) {
         listeningPort = typeof address === 'object' && address ? address.port : port;
     } catch (err) {
         if (err?.code === 'EADDRINUSE') {
-            throw new Error(`LiveDesk Google sign-in callback port ${port} is already in use. Close the app using it or run with --auth-port <port> and add that callback URL in Supabase Auth redirect URLs.`);
+            throw new Error(`LiveDesk connection page port ${port} is already in use. Close the app using it or run with --auth-port <port> and add that callback URL in Supabase Auth redirect URLs.`);
         }
         throw err;
     }
     return {
-        get redirectTo() {
-            return `http://${host}:${listeningPort}/callback`;
+        get url() {
+            return `http://${host}:${listeningPort}/`;
         },
-        waitForCode
+        waitForChoice
     };
 }
-async function signInWithGoogle(supabase, options = {}) {
-    const { data: existing } = await supabase.auth.getSession();
-    if (existing?.session?.access_token) {
-        return existing.session;
-    }
-    const callback = await startOAuthCallbackServer({ authPort: options.authPort });
-    const { data, error } = await supabase.auth.signInWithOAuth({
-        provider: 'google',
-        options: {
-            redirectTo: callback.redirectTo,
-            scopes: 'email profile'
-        }
-    });
-    if (error) {
-        throw error;
-    }
-    if (!data?.url) {
-        throw new Error('Supabase did not return a Google sign-in URL.');
-    }
-    console.log('Opening Google sign-in for LiveDesk...');
-    openBrowser(data.url);
-    const code = await callback.waitForCode;
-    const { data: sessionData, error: exchangeError } = await supabase.auth.exchangeCodeForSession(code);
-    if (exchangeError) {
-        throw exchangeError;
-    }
-    if (!sessionData?.session) {
-        throw new Error('Google sign-in did not return a LiveDesk session.');
-    }
-    return sessionData.session;
+async function chooseClientConnection(supabase, options = {}) {
+    const connectionPage = await startConnectionChoiceServer(supabase, { authPort: options.authPort });
+    console.log('Opening LiveDesk connection page...');
+    openBrowser(connectionPage.url);
+    return connectionPage.waitForChoice;
 }
 function parseManagerEndpoint(value) {
@@ -665,12 +976,19 @@ async function prepareLoginConnection(parsed) {
     if (shouldLogin) {
         const supabase = await createSupabaseClient();
-        const session = await signInWithGoogle(supabase, { authPort: parsed.authPort });
-        const email = session.user?.email ? ` as ${session.user.email}` : '';
-        console.log(`Signed in to LiveDesk${email}.`);
-        const resolved = await waitForManagerFromSupabase(supabase);
-        manager = resolved.manager;
-        pair = resolved.pair;
+        const choice = await chooseClientConnection(supabase, { authPort: parsed.authPort });
+        if (choice.type === 'pin') {
+            manager = choice.manager;
+            pair = choice.pair;
+            console.log('Connected by LiveDesk PIN.');
+        } else {
+            const session = choice.session;
+            const email = session?.user?.email ? ` as ${session.user.email}` : '';
+            console.log(`Signed in to LiveDesk${email}.`);
+            const resolved = await waitForManagerFromSupabase(supabase);
+            manager = resolved.manager;
+            pair = resolved.pair;
+        }
         console.log(`Found LiveDesk Hub at ${manager}.`);
     }

package/fast/linux-x64/livedesk-client-fast.dll CHANGED Viewed

Binary file

package/fast/linux-x64/livedesk-client-fast.pdb CHANGED Viewed

Binary file

package/fast/osx-arm64/livedesk-client-fast.dll CHANGED Viewed

Binary file

package/fast/osx-arm64/livedesk-client-fast.pdb CHANGED Viewed

Binary file

package/fast/osx-x64/livedesk-client-fast.dll CHANGED Viewed

Binary file

package/fast/osx-x64/livedesk-client-fast.pdb CHANGED Viewed

Binary file

package/fast/win-x64/livedesk-client-fast.dll CHANGED Viewed

Binary file

package/fast/win-x64/livedesk-client-fast.pdb CHANGED Viewed

Binary file

package/package.json CHANGED Viewed

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