@grayspar/cli 0.0.2 → 0.0.3

package/dist/commands/login/login.js

@@ -41,10 +41,12 @@ async function login(options) {
                 token: session.token,
                 email: session.email,
             });
+            await listener.answerBrowser(true);
             progress.stop();
             printResult(options.format, { status: 'ok', email: session.email }, () => receipt(`Signed in as ${session.email}`));
         }
         catch (error) {
+            await listener.answerBrowser(false);
             progress.stop();
             throw error;
         }

package/dist/commands/login/sign-in-callback.js

@@ -1,23 +1,32 @@
 /* Listens on a port the machine picks, catches exactly one redirect, and closes. The browser carries
-   a code; the verifier that makes it usable never leaves this process. */
+   a code; the verifier that makes it usable never leaves this process. The browser hears nothing until
+   the CLI has traded the code, so what its page says is true. */
 import { createServer } from 'node:http';
-// The terminal trades the code for its session after this page has gone out, so the page claims nothing about it.
-const SIGNED_IN_PAGE = `<!doctype html><meta charset="utf-8"><title>Grayspar CLI</title>
-<body style="font:16px/1.5 system-ui;margin:4rem auto;max-width:28rem;text-align:center">
-<h1 style="font-size:1.25rem">Back to your terminal</h1>
-<p>It finishes signing in there. You can close this window.</p>`;
+function browserPage(mark, markColor, title, detail) {
+    return `<!doctype html><meta charset="utf-8"><meta name="color-scheme" content="light dark">
+<title>Grayspar CLI</title>
+<style>body{font:16px/1.5 system-ui;margin:0;min-height:100svh;display:grid;place-content:center;text-align:center;background:light-dark(#fff,#0f1010);color:light-dark(#111,#eee)}
+svg{display:block;width:48px;height:48px;margin:0 auto;color:${markColor}}h1{font-size:1.25rem;font-weight:600;margin:1rem 0 .25rem}p{margin:0;opacity:.7}</style>
+<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="10"/><path d="${mark}"/></svg>
+<h1>${title}</h1><p>${detail}</p>`;
+}
+const SIGNED_IN_PAGE = browserPage('m8 12 3 3 5-6', '#2f9e5b', 'Signed in successfully', 'You can close this window.');
+const NOT_SIGNED_IN_PAGE = browserPage('m9 9 6 6m0-6-6 6', '#d9534f', "The sign-in didn't complete", 'Run grayspar login again.');
 export async function waitForSignInRedirect(timeoutMs) {
     let settle = () => undefined;
     const waitForCode = new Promise((resolve) => {
         settle = resolve;
     });
+    let browser = null;
+    let redirected = false;
     const server = createServer((request, response) => {
         const url = new URL(request.url ?? '/', 'http://127.0.0.1');
-        if (url.pathname !== '/callback') {
+        if (url.pathname !== '/callback' || redirected) {
             response.writeHead(404).end();
             return;
         }
-        response.writeHead(200, { 'content-type': 'text/html; charset=utf-8' }).end(SIGNED_IN_PAGE);
+        redirected = true;
+        browser = response;
         settle({ code: url.searchParams.get('code') });
     });
     await new Promise((ready) => server.listen(0, '127.0.0.1', ready));
@@ -29,6 +38,16 @@ export async function waitForSignInRedirect(timeoutMs) {
     return {
         port: address.port,
         waitForCode,
+        answerBrowser: (signedIn) => new Promise((answered) => {
+            if (browser === null) {
+                answered();
+                return;
+            }
+            browser
+                .writeHead(signedIn ? 200 : 400, { 'content-type': 'text/html; charset=utf-8' })
+                .end(signedIn ? SIGNED_IN_PAGE : NOT_SIGNED_IN_PAGE, () => answered());
+            browser = null;
+        }),
         close: () => {
             clearTimeout(timer);
             server.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grayspar/cli",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "The cloud for small software. Deploy your applications with one command, and share them with exactly the people you choose.",
   "repository": {
     "type": "git",