@tonbo/cli 0.0.1 → 0.0.2

package/dist/src/auth.d.ts

@@ -4,7 +4,8 @@ export declare class AuthClient {
     private readonly credentials;
     private readonly fetcher;
     private readonly accountOrigin;
-    constructor(credentials: CredentialStore, fetcher: typeof fetch, accountOrigin?: string);
+    private readonly browserOpener;
+    constructor(credentials: CredentialStore, fetcher: typeof fetch, accountOrigin?: string, browserOpener?: (url: string) => Promise<void>);
     accessToken(): Promise<string>;
     login(): Promise<OAuthTokenSet>;
     private config;

package/dist/src/auth.js

@@ -21,10 +21,12 @@ export class AuthClient {
     credentials;
     fetcher;
     accountOrigin;
-    constructor(credentials, fetcher, accountOrigin = "https://tonbo.dev") {
+    browserOpener;
+    constructor(credentials, fetcher, accountOrigin = "https://tonbo.dev", browserOpener = openBrowser) {
         this.credentials = credentials;
         this.fetcher = fetcher;
         this.accountOrigin = accountOrigin;
+        this.browserOpener = browserOpener;
     }
     async accessToken() {
         const injected = process.env.TONBO_ACCESS_TOKEN?.trim();
@@ -70,7 +72,7 @@ export class AuthClient {
             scope: "openid profile email",
             state,
         }).toString();
-        const code = await this.listenForCode(state, () => openBrowser(authorization.toString()));
+        const code = await this.listenForCode(state, () => this.browserOpener(authorization.toString()));
         const tokens = withAbsoluteExpiry(await this.exchange(config.token_endpoint, new URLSearchParams({
             client_id: config.client_id,
             code,
@@ -99,11 +101,20 @@ export class AuthClient {
                     return;
                 settled = true;
                 clearTimeout(timeout);
-                server.close();
-                if ("code" in result)
-                    resolve(result.code);
-                else
-                    reject(result.error);
+                const complete = (closeError) => {
+                    if (closeError)
+                        reject(closeError);
+                    else if ("code" in result)
+                        resolve(result.code);
+                    else
+                        reject(result.error);
+                };
+                if (!server.listening) {
+                    complete();
+                    return;
+                }
+                server.close(complete);
+                server.closeIdleConnections();
             };
             const timeout = setTimeout(() => {
                 finish({ error: new Error("Timed out waiting for browser login.") });
@@ -113,8 +124,7 @@ export class AuthClient {
                 const code = url.searchParams.get("code");
                 const oauthError = url.searchParams.get("error_description") ?? url.searchParams.get("error");
                 if (oauthError) {
-                    respond(response, "denied");
-                    finish({ error: new Error(oauthError) });
+                    respond(response, "denied", () => finish({ error: new Error(oauthError) }));
                     return;
                 }
                 if (url.pathname !== "/callback" ||
@@ -123,8 +133,7 @@ export class AuthClient {
                     respond(response, "invalid");
                     return;
                 }
-                respond(response, "complete");
-                finish({ code });
+                respond(response, "complete", () => finish({ code }));
             });
             server.once("error", (error) => finish({ error }));
             server.listen(17655, "localhost", () => void ready().catch((error) => finish({
@@ -133,9 +142,11 @@ export class AuthClient {
         });
     }
 }
-function respond(response, outcome) {
+function respond(response, outcome, finished) {
     const page = callbackResponse(outcome);
-    response.writeHead(page.status, page.headers);
+    if (finished)
+        response.once("finish", finished);
+    response.writeHead(page.status, { ...page.headers, connection: "close" });
     response.end(page.body);
 }
 async function openBrowser(url) {

package/dist/src/commands.js

@@ -42,11 +42,7 @@ export async function loginCommand(deps) {
     const keys = await readDefaultSshPublicKeys();
     for (const key of keys)
         await deps.api.registerSshKey(oauthToken, key);
-    deps.output({
-        message: keys.length
-            ? `Logged in to Tonbo and registered ${keys.length} SSH key${keys.length === 1 ? "" : "s"}.`
-            : "Logged in to Tonbo. No default SSH public key was found; run `tonbo ssh-key add <path.pub>` before using native SSH.",
-    });
+    deps.output({ message: "Logged in to Tonbo." });
 }
 export async function sshKeyAddCommand(deps, path) {
     const key = await readSshPublicKey(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonbo/cli",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Deploy one persistent Agent per Project from the command line.",
   "homepage": "https://tonbo.dev",
   "bugs": {