npm - @livedesk/client - Versions diffs - 0.1.10 → 0.1.12 - Mend

@livedesk/client 0.1.10 → 0.1.12

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 +105 -7
package/package.json +1 -1

package/bin/livedesk-client.js CHANGED Viewed

@@ -271,16 +271,86 @@ async function createSupabaseClient() {
 function openBrowser(url) {
     if (os.platform() === 'win32') {
-        spawn('cmd', ['/c', 'start', '', url], { detached: true, stdio: 'ignore', windowsHide: true }).unref();
+        spawn('rundll32.exe', ['url.dll,FileProtocolHandler', url], { detached: true, stdio: 'ignore', windowsHide: true }).unref();
         return;
     }
     const command = os.platform() === 'darwin' ? 'open' : 'xdg-open';
     spawn(command, [url], { detached: true, stdio: 'ignore' }).unref();
 }
+function escapeHtml(value) {
+    return String(value ?? '')
+        .replaceAll('&', '&amp;')
+        .replaceAll('<', '&lt;')
+        .replaceAll('>', '&gt;')
+        .replaceAll('"', '&quot;')
+        .replaceAll("'", '&#39;');
+}
+function renderOAuthCallbackPage({ title, message, tone = 'neutral' }) {
+    const accent = tone === 'error' ? '#991b1b' : tone === 'waiting' ? '#374151' : '#111827';
+    return `<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>${escapeHtml(title)}</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: 14px;
+      padding: 28px;
+      border: 1px solid rgba(148, 163, 184, 0.34);
+      border-radius: 12px;
+      background: rgba(255, 255, 255, 0.9);
+      box-shadow: 0 24px 70px rgba(15, 23, 42, 0.14);
+      text-align: center;
+    }
+    .mark {
+      width: 42px;
+      height: 42px;
+      display: grid;
+      place-items: center;
+      justify-self: center;
+      border-radius: 10px;
+      background: ${accent};
+      color: #ffffff;
+      font-weight: 950;
+    }
+    h1 { margin: 0; font-size: 28px; line-height: 1.05; letter-spacing: 0; }
+    p { margin: 0; color: #64748b; font-size: 15px; line-height: 1.5; font-weight: 650; }
+    small { color: #94a3b8; font-size: 12px; font-weight: 750; }
+  </style>
+</head>
+<body>
+  <main>
+    <div class="mark">LD</div>
+    <h1>${escapeHtml(title)}</h1>
+    <p>${escapeHtml(message)}</p>
+    <small>LiveDesk Client</small>
+  </main>
+</body>
+</html>`;
+}
 async function startOAuthCallbackServer(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) => {
@@ -288,23 +358,49 @@ async function startOAuthCallbackServer(options = {}) {
         rejectCode = reject;
     });
     const server = createServer((req, res) => {
-            const requestUrl = new URL(req.url || '/', `http://127.0.0.1:${server.address().port}`);
+            const requestUrl = new URL(req.url || '/', `http://${host}:${listeningPort}`);
+            if (requestUrl.pathname === '/favicon.ico') {
+                res.writeHead(204);
+                res.end();
+                return;
+            }
+            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.'
+                }));
+                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('<h1>LiveDesk sign-in failed</h1><p>You can close this tab.</p>');
+                res.end(renderOAuthCallbackPage({
+                    title: 'LiveDesk sign-in failed',
+                    message: error,
+                    tone: 'error'
+                }));
+                completed = true;
                 rejectCode(new Error(error));
                 server.close();
                 return;
             }
             if (!code) {
-                res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
-                res.end('LiveDesk sign-in callback is waiting for an auth code.');
+                res.writeHead(404, { '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'
+                }));
                 return;
             }
             res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-            res.end('<h1>LiveDesk sign-in complete</h1><p>You can close this tab and return to the terminal.</p>');
+            res.end(renderOAuthCallbackPage({
+                title: 'LiveDesk sign-in complete',
+                message: 'You can close this tab and return to the terminal.'
+            }));
+            completed = true;
             settleCode(code);
             server.close();
     });
@@ -313,6 +409,8 @@ async function startOAuthCallbackServer(options = {}) {
             server.once('error', reject);
             server.listen(port, host, resolve);
         });
+        const address = server.address();
+        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.`);
@@ -321,7 +419,7 @@ async function startOAuthCallbackServer(options = {}) {
     }
     return {
         get redirectTo() {
-            return `http://${host}:${server.address().port}/callback`;
+            return `http://${host}:${listeningPort}/callback`;
         },
         waitForCode
     };

package/package.json CHANGED Viewed

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