@tonbo/cli 0.7.1 → 0.7.2

package/README.md

@@ -14,7 +14,7 @@ tonbo login [--account <name>]
 tonbo logout
 ```
 
-`login` opens the browser at `https://tonbo.dev/cli/login`, where you pick the account (your personal account unless `--account` names another) and approve a personal API key named `CLI on <hostname>`. The browser returns a one-time code to a local callback on `127.0.0.1`, and the CLI redeems it with its PKCE verifier for the key. The key acts as you with your role in that account, expires after six months and replaces the key an earlier login on the same host created; there is no refresh, so an expired or revoked key asks you to run `tonbo login` again. One login holds one account: log in again to switch accounts.
+`login` prints the login URL and opens the browser at `https://tonbo.dev/cli/login`, where you pick the account (your personal account unless `--account` names another) and approve a personal API key named `CLI on <hostname>`. The browser returns a one-time code to a local callback on `127.0.0.1`, and the CLI redeems it with its PKCE verifier for the key. The key acts as you with your role in that account, expires after six months and replaces the key an earlier login on the same host created; there is no refresh, so an expired or revoked key asks you to run `tonbo login` again. One login holds one account: log in again to switch accounts. When no browser can be opened (an SSH session, a server without a desktop), the CLI keeps waiting: open the printed URL in a browser that can reach the callback's `127.0.0.1:<port>` on that machine, through `ssh -L <port>:127.0.0.1:<port>` or the VM's port forwarding.
 
 The login and the credentials file are shared with [`yield`](../yield) through `@tonbo/cli-core`: either CLI's `login` signs both in, and either `logout` signs both out. The login is saved at `${XDG_CONFIG_HOME:-$HOME/.config}/tonbo/credentials.json` as `{version, account_id, key_id, key, expires_at}`. The CLI atomically replaces that file with owner-only permissions and refuses a symlink or a file other users can read. A file written by an earlier CLI release is not migrated; run `tonbo login`.
 
@@ -132,7 +132,7 @@ tonbo database show notes
 `database create` creates a database in `--region`, or in the default region, and prints its fields with its URL. `--expires-at` and `--expires-in` give it an expiry fixed for its life, by the same rules as `stream create`'s: once it passes, Tonbo deletes the database within a minute, as `database delete` would, and its name is free again; `database show` prints it, and without either the database never expires. A Machine's database never expires. Without `--json` it then writes the next step to stderr, opening the database by name from code:
 
 ```text
-Next: npm i @tonbo/sqlite-ursula@0.11.2
+Next: npm i --save-exact @tonbo/sqlite-ursula@0.11.2
       open("notes") from "@tonbo/sqlite-ursula/tonbo"
 ```
 

package/dist/bin/tonbo.js

@@ -1025,7 +1025,7 @@ var AuthClient = class {
         hostname: this.hostname,
         ...account ? { account } : {}
       }).toString();
-      return this.browserOpener(authorization.toString());
+      return authorization.toString();
     }, progress);
     progress({ status: "started", step: "key-redemption" });
     const redeemed = await requestJson(this.fetcher, new URL("/api/cli/login/token", this.loginOrigin).toString(), {
@@ -1046,16 +1046,17 @@ var AuthClient = class {
     progress({ status: "completed", step: "credential-store" });
     return login;
   }
-  listenForCode(expectedState, ready, progress) {
+  listenForCode(expectedState, authorizationUrl, progress) {
     return new Promise((resolve, reject) => {
       let settled = false;
       const sockets = /* @__PURE__ */ new Set();
       let authorizationStarted = false;
-      const startAuthorization = () => {
+      const startAuthorization = (browserOpened = true) => {
         if (authorizationStarted)
           return;
         authorizationStarted = true;
-        progress({ status: "completed", step: "browser" });
+        if (browserOpened)
+          progress({ status: "completed", step: "browser" });
         progress({ status: "started", step: "browser-authorization" });
       };
       const finish = (result, completedResponseSocket) => {
@@ -1119,10 +1120,20 @@ var AuthClient = class {
       server.listen(0, LOOPBACK_HOST, () => {
         const { port } = server.address();
         progress({ status: "completed", step: "callback-server" });
+        const url = authorizationUrl(`http://${LOOPBACK_HOST}:${port}/callback`);
+        progress({ status: "authorization-url", step: "browser", url });
         progress({ status: "started", step: "browser" });
-        void ready(`http://${LOOPBACK_HOST}:${port}/callback`).then(startAuthorization).catch((error) => finish({
-          error: error instanceof Error ? error : new Error("Could not open the login browser.")
-        }));
+        void Promise.resolve().then(() => this.browserOpener(url)).then(() => startAuthorization(), (error) => {
+          if (settled || authorizationStarted)
+            return;
+          progress({
+            status: "failed",
+            step: "browser",
+            reason: error instanceof Error ? error.message : String(error),
+            callbackPort: port
+          });
+          startAuthorization(false);
+        });
       });
     });
   }
@@ -1134,12 +1145,27 @@ function respond(response, outcome, finished) {
   response.writeHead(page.status, { ...page.headers, connection: "close" });
   response.end(page.body);
 }
+function browserCommand(url, platform = process.platform, env = process.env) {
+  if (platform === "darwin")
+    return ["open", [url]];
+  if (platform === "win32")
+    return ["rundll32", ["url.dll,FileProtocolHandler", url]];
+  if (!env.DISPLAY && !env.WAYLAND_DISPLAY)
+    throw new Error("there is no graphical session (DISPLAY and WAYLAND_DISPLAY are unset)");
+  return ["xdg-open", [url]];
+}
 async function openBrowser(url) {
-  if (process.platform === "darwin")
-    return void await exec("open", [url]);
-  if (process.platform === "win32")
-    return void await exec("rundll32", ["url.dll,FileProtocolHandler", url]);
-  return void await exec("xdg-open", [url]);
+  const [command, args] = browserCommand(url);
+  try {
+    await exec(command, args);
+  } catch (error) {
+    const code = error.code;
+    if (code === "ENOENT")
+      throw new Error(`${command} is not installed`, { cause: error });
+    if (typeof code === "number")
+      throw new Error(`${command} exited with code ${code}`, { cause: error });
+    throw error;
+  }
 }
 
 // ../../packages/tonbo-cli-core/dist/src/api.js
@@ -1433,6 +1459,16 @@ var LOGIN_PROGRESS_MESSAGES = {
   }
 };
 function reportLoginProgress(progress, event) {
+  if (event.status === "authorization-url") {
+    progress.note(`Open this URL to approve the login: ${event.url}`);
+    return;
+  }
+  if (event.status === "failed") {
+    const port = event.callbackPort;
+    progress.fail(`Could not open a browser: ${event.reason.replace(/\.$/, "")}.`);
+    progress.note(`Open the URL above in a browser that can reach 127.0.0.1:${port} on this machine. From another computer, forward that port first: \`ssh -L ${port}:127.0.0.1:${port} <this host>\` or your VM's port forwarding both work.`);
+    return;
+  }
   const messages = LOGIN_PROGRESS_MESSAGES[event.step];
   if (event.status === "started")
     progress.start(messages.started);
@@ -1518,6 +1554,17 @@ var TerminalProgress = class {
   fail(message = this.activeMessage) {
     this.finish("!!", message);
   }
+  note(message) {
+    if (this.stream.isTTY && this.activeMessage) {
+      this.stream.write(`\r${"".padEnd(this.lastWidth)}\r${message}
+`);
+      this.lastWidth = 0;
+      this.render(`[${FRAMES[this.frame]}] ${this.activeMessage}`);
+      return;
+    }
+    this.stream.write(`${message}
+`);
+  }
   finish(marker, message) {
     if (this.timer)
       clearInterval(this.timer);
@@ -2011,7 +2058,7 @@ async function databaseCreateCommand(deps, name, options = {}) {
 }
 function databaseNextStep(name) {
   return [
-    "Next: npm i @tonbo/sqlite-ursula@0.11.2",
+    "Next: npm i --save-exact @tonbo/sqlite-ursula@0.11.2",
     `      open(${JSON.stringify(name)}) from "@tonbo/sqlite-ursula/tonbo"`
   ].join("\n");
 }
@@ -2249,7 +2296,15 @@ var MACHINE_ERROR_HINTS = {
   snapshot_would_be_discarded: "Pass --discard-snapshot to apply the change at the next boot, which then starts fresh.",
   database_limit_reached: "Each Machine counts one database: delete a Machine or a database (`tonbo database list`) first.",
   idempotency_conflict: "That idempotency key belongs to another request: leave out --idempotency-key to create a new Machine.",
-  create_rate_limited: "Too many Machines were created in the last hour; try again later."
+  create_rate_limited: "Too many Machines were created in the last hour; try again later.",
+  image_pulling: "The Machine's image is still being pulled; the request was not run. Try again shortly; `tonbo machine show` reports the image's state.",
+  image_failed: "The Machine's image could not be pulled; `tonbo machine show` says why. Fix the image, then name it again with `tonbo machine update --image`."
+};
+var MACHINE_IMAGE_FAILURE_HINTS = {
+  image_unavailable: "The registry no longer serves that image publicly, or served other bytes for it: publish it again, or use another image",
+  image_platform_unsupported: "Machines run linux/arm64: publish the image for that platform (for example `docker buildx build --platform linux/arm64`)",
+  image_too_large: "Make the image smaller (fewer or smaller layers)",
+  image_unsupported: "Rebuild the image without the entry the message names"
 };
 function explainMachineError(error) {
   if (!(error instanceof HttpError) || error.code === null) return error;
@@ -2280,8 +2335,27 @@ function machineState(machine) {
   return machine.failure ? `${machine.state}: ${machine.failure.code}: ${machine.failure.message}` : machine.state;
 }
 function imageText(machine) {
-  const { reference, digest } = machine.image;
-  return `${reference} (${digest ?? "platform image"})`;
+  const { reference, repository, digest, state } = machine.image;
+  if (digest === null) return `${reference} (platform image)`;
+  const pulled = repository === null ? digest : `${repository}@${digest}`;
+  const pulling = state === "resolved" && (machine.state === "creating" || machine.state === "active");
+  return `${reference} (${pulled}, ${pulling ? "pulling" : state})`;
+}
+function imageNextStep(machine, hint) {
+  if (machine.state === "deleting") return null;
+  if (machine.state === "failed")
+    return `${hint}. A failed Machine does not change: delete it with \`tonbo machine delete\` and create another that names the fixed image.`;
+  return `${hint}, then name it again with \`tonbo machine update --image\`.`;
+}
+function imageFailureFields(machine) {
+  const { failure } = machine.image;
+  if (!failure) return [];
+  const hint = MACHINE_IMAGE_FAILURE_HINTS[failure.code];
+  const next = hint ? imageNextStep(machine, hint) : null;
+  return [
+    ["Image failure", `${failure.code}: ${failure.message}`],
+    ...next ? [["Next step", next]] : []
+  ];
 }
 function machineFields(machine) {
   return fields([
@@ -2292,6 +2366,7 @@ function machineFields(machine) {
     ["Power", machine.status.power],
     ["Shape", machine.shape],
     ["Image", imageText(machine)],
+    ...imageFailureFields(machine),
     ["Command", machine.command ? machine.command.join(" ") : "the image's own"],
     ["Ports", machinePortsText(machine)],
     ["HTTPS", machine.hostnames.https],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonbo/cli",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "The Tonbo CLI: sign in and manage account resources from the command line.",
   "homepage": "https://tonbo.dev",
   "bugs": {