@tonbo/cli 0.10.1 → 0.11.1

package/dist/bin/tonbo.js

@@ -3507,6 +3507,7 @@ var MACHINE_WAKE_BLOCKED_HINTS = {
   capacity: "No host had room for its shape; the next request tries again.",
   region_closed: "Machines are closed in its region for now; the next request after they reopen wakes it."
 };
+var MACHINE_ACCOUNT_EGRESS_BLOCKED_HINT = "If this is the free egress cap: 10 GiB a month without purchased credit; buy credit at <billing> to lift it.";
 function conditionText(name, condition, billing) {
   switch (condition.type) {
     case "wake_blocked": {
@@ -3518,8 +3519,10 @@ function conditionText(name, condition, billing) {
       return `still creating since ${condition.since}, longer than usual; Tonbo's operators are alerted, and creation goes on until it is active or failed.`;
     case "node_unreachable":
       return `its host is unreachable since ${condition.since}`;
-    case "egress_blocked":
-      return `outbound access blocked for the ${condition.scope} since ${condition.since}${condition.until ? ` until ${condition.until}` : ""}`;
+    case "egress_blocked": {
+      const blocked = `outbound access blocked for the ${condition.scope} since ${condition.since}${condition.until ? ` until ${condition.until}` : ""}`;
+      return condition.scope === "account" && condition.until ? `${blocked}. ${MACHINE_ACCOUNT_EGRESS_BLOCKED_HINT.replaceAll("<billing>", billing)}` : blocked;
+    }
     case "volume_purged":
       return `its Volume ${condition.volume} was purged (${condition.reason.replaceAll("_", " ")}) since ${condition.since}; its data is gone and it boots without it. Bind another with \`tonbo machine update ${name} --volume <volume>:<path>\`, or none with \`--no-volume\`.`;
     default:
@@ -3592,6 +3595,7 @@ function machineFields(machine, billing, etag = null, lastEnd = null) {
     ["Env", Object.keys(machine.env).sort().join(", ") || "none"],
     ["Stop grace", `${machine.stop_grace_seconds} s`],
     ["Volume", volumeText(machine)],
+    ...deleteFields(machine),
     ["Database", `${machine.database.name} (${machine.database.url})`],
     ["Logs", machine.logs.url],
     ["Durability", DURABILITY_LINK],
@@ -3602,6 +3606,17 @@ function machineFields(machine, billing, etag = null, lastEnd = null) {
     ["Updated", machine.updated_at]
   ]);
 }
+function deleteFields(machine) {
+  const seconds = machine.delete_after_seconds;
+  if (seconds === void 0 || seconds === null) return [];
+  const at = machine.status.delete_at;
+  return [
+    [
+      "Deletes",
+      at ? `at ${at}, after ${seconds} s asleep` : `${seconds} s after this activation ends`
+    ]
+  ];
+}
 function volumeText(machine) {
   const binding = machine.volumes?.[0];
   return binding ? `${binding.volume} at ${binding.path}` : "none";
@@ -3702,6 +3717,10 @@ async function waitForMachine(deps, key, name, firstWait, every, timeout, settle
     wait = every;
   }
 }
+function deleteAfterSeconds(option) {
+  if (typeof option === "number") return option;
+  return option === false ? null : void 0;
+}
 async function machineListCommand(deps, options = {}) {
   await machineCommand(async () => {
     const page = await deps.api.listMachines(await deps.auth.apiKey(), {
@@ -3852,7 +3871,8 @@ async function machineCreateCommand(deps, name, command, options = {}) {
           sleep_after_seconds: options.sleepAfter,
           idle_action: options.idleAction,
           stop_grace_seconds: options.stopGrace,
-          ...bound ? { volumes: [bound.binding] } : {}
+          ...bound ? { volumes: [bound.binding] } : {},
+          delete_after_seconds: deleteAfterSeconds(options.deleteAfter)
         },
         options.idempotencyKey ?? randomUUID4()
       );
@@ -3942,6 +3962,10 @@ function appliesText(name, change) {
   const lines = [];
   if (change.ports !== void 0 || change.sleep_after_seconds !== void 0)
     lines.push("Ports and sleep-after apply now.");
+  if (change.delete_after_seconds !== void 0)
+    lines.push(
+      change.delete_after_seconds === null ? "The Machine is no longer deleted for being asleep." : "Delete-after applies now; `tonbo machine show` says when."
+    );
   const later = [change.image, change.command, change.shape, change.env, change.volumes].some(
     (field) => field !== void 0
   );
@@ -3974,7 +3998,8 @@ async function machineUpdateCommand(deps, name, command, options = {}) {
       command: options.imageCommand ? null : command.length ? command : void 0,
       sleep_after_seconds: options.sleepAfter,
       idle_action: options.idleAction,
-      stop_grace_seconds: options.stopGrace
+      stop_grace_seconds: options.stopGrace,
+      delete_after_seconds: deleteAfterSeconds(options.deleteAfter)
     };
     if (options.clearPorts) change.ports = [];
     else if (options.port?.length) {
@@ -4471,7 +4496,8 @@ var COMMAND_HELP = {
       "--default-port": "the first --port",
       "--region": "the --volume's region, else the account's default region",
       "--idempotency-key": "a new UUID",
-      "--timeout": String(DEFAULT_WAIT_SECONDS)
+      "--timeout": String(DEFAULT_WAIT_SECONDS),
+      "--delete-after": "never"
     }
   },
   "tonbo machine show": {
@@ -4485,7 +4511,8 @@ var COMMAND_HELP = {
   "tonbo machine update": {
     about: [
       "Changes only what its options name. It reads the Machine and sends the ETag it read, or `--if-match`'s, so a change someone made in between is refused with `precondition_failed` rather than overwritten; a Machine whose creation failed is refused with `machine_failed`. `--env` and `--unset-env` change single variables; `--port` replaces every port, and the current default port stays the default while it is still listed.",
-      "Ports and `--sleep-after` apply at once. The image, command, shape and env apply at the next boot, and the command says how to apply them now: `tonbo machine sleep`, after which the next request boots the new spec. Naming the same tag again resolves its digest again."
+      "Ports and `--sleep-after` apply at once. The image, command, shape and env apply at the next boot, and the command says how to apply them now: `tonbo machine sleep`, after which the next request boots the new spec. Naming the same tag again resolves its digest again.",
+      "`--delete-after` applies at once and keeps the clock, which counts from the end of the Machine's last activation (or its creation), so a lower value can delete a Machine that has already slept that long; `--no-delete-after` turns it off. `tonbo machine show` prints when it will be deleted."
     ],
     examples: ["tonbo machine update web --env MODE=staging --sleep-after 300"],
     arguments: {
@@ -4739,6 +4766,10 @@ function machineSpecOptions(command, update) {
   ).option(
     "--volume <name:path>",
     `mount the Volume <name> (see tonbo volume list) at <path>; a Machine has at most one, of its own region${update ? "; applies at the next boot" : ""}`
+  ).option(
+    "--delete-after <seconds>",
+    `delete the Machine once it has been asleep, never woken or failed this long (3600 to 7776000)${update ? "; applies at once, from its last activation's end" : ""}`,
+    parseWhole
   );
 }
 function parseExpiresIn(value) {
@@ -5031,7 +5062,7 @@ function createProgram(dependencies = createDependencies) {
     machineSpecOptions(
       machine.command("update <name> [command...]").description(
         "change a Machine; [command...] after -- replaces its command at the next boot"
-      ).option("--image <reference>", "a new image, named as for create; applies at the next boot").option("--image-command", "run the image's own CMD again at the next boot").option("--unset-env <KEY>", "remove an environment variable; repeat for several", repeated).option("--clear-ports", "remove every port").option("--if-match <etag>", ifMatchHelp("change")).option("--discard-snapshot", "apply a change that discards the Machine's snapshot").option("--no-volume", "remove the Machine's Volume at the next boot; the Volume is kept"),
+      ).option("--image <reference>", "a new image, named as for create; applies at the next boot").option("--image-command", "run the image's own CMD again at the next boot").option("--unset-env <KEY>", "remove an environment variable; repeat for several", repeated).option("--clear-ports", "remove every port").option("--if-match <etag>", ifMatchHelp("change")).option("--discard-snapshot", "apply a change that discards the Machine's snapshot").option("--no-volume", "remove the Machine's Volume at the next boot; the Volume is kept").option("--no-delete-after", "never delete the Machine for being asleep"),
       true
     ),
     "updateMachine"

package/package.json

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