@astris-labs/cli 0.1.3 → 0.1.4

package/README.md

@@ -97,7 +97,7 @@ Optional flags are `--build-path`, `--dockerfile`, `--port`, `--build`, `--publi
 
 `astris compose list` calls `GET /v1/compose`. Human output is one line per stack in the order the API returned: the id, the name, and the project name. An empty list prints nothing. `--json` prints one JSON object `{"compose":[...]}` of the stack rows.
 
-`astris compose deploy --id <id>` calls `POST /v1/compose/:id/deploy` and sends no body. Human output is the stack id, project id, name, git URL, branch, compose path, memory limit, created_at, and updated_at, one per line. `--json` prints one JSON object `{"compose":{...}}`.
+`astris compose deploy --id <id>` calls `POST /v1/compose/:id/deploy` and sends no body. In the private preview the API refuses every redeploy, so the command prints the API's sentence and exits 1. Otherwise human output is the stack id, project id, name, git URL, branch, compose path, memory limit, created_at, and updated_at, one per line. `--json` prints one JSON object `{"compose":{...}}`.
 
 `astris compose start --id <id>` calls `POST /v1/compose/:id/start` and sends no body. Human output is the status the API returned, then the same stack fields as deploy, one per line. `--json` prints one JSON object `{"compose":{...},"status":"<status>"}`.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astris-labs/cli",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "The Astris CLI, a command-line client of the Astris API.",
   "repository": {
     "type": "git",

package/src/client.mjs

@@ -18,6 +18,22 @@ function swallow(promise) {
   promise.catch(() => undefined);
 }
 
+function retryAfterSecondsOf(headers) {
+  if (!headers) return null;
+  let raw;
+  if (typeof headers.get === "function") {
+    raw = headers.get("retry-after");
+  } else if (typeof headers === "object") {
+    raw = headers["retry-after"] ?? headers["Retry-After"];
+  }
+  if (typeof raw !== "string") return null;
+  const trimmed = raw.trim();
+  if (!/^[0-9]+$/.test(trimmed)) return null;
+  const seconds = Number(trimmed);
+  if (seconds < 1 || seconds > 3600) return null;
+  return seconds;
+}
+
 export async function astrisFetch({ key, baseUrl, path, method, body, fetchImpl }) {
   const url = baseUrl + path;
   const headers = { Authorization: `Bearer ${key}` };
@@ -54,14 +70,15 @@ export async function astrisFetch({ key, baseUrl, path, method, body, fetchImpl
     }
     swallow(reading);
     const text = await Promise.race([reading, timeout]);
+    const retryAfterSeconds = retryAfterSecondsOf(response?.headers);
 
     if (text === "") {
-      return { status: response.status, body: null };
+      return { status: response.status, body: null, retryAfterSeconds };
     }
     try {
-      return { status: response.status, body: JSON.parse(text) };
+      return { status: response.status, body: JSON.parse(text), retryAfterSeconds };
     } catch {
-      return { status: response.status, body: null };
+      return { status: response.status, body: null, retryAfterSeconds };
     }
   } catch (err) {
     throw new Error(redact(failureMessage(err), key));

package/src/commands.mjs

@@ -62,13 +62,22 @@ const HTTP_SENTENCE = new Map([
   [502, SENTENCE.platform],
 ]);
 
-function sentenceFor(status) {
+function rateWaitSentence(seconds) {
+  if (typeof seconds === "number") {
+    return `This account asked for too many changes in a short time. Wait ${seconds} second${seconds === 1 ? "" : "s"}, then try again.`;
+  }
+  return "This account asked for too many changes in a short time. Wait a little, then try again.";
+}
+
+function sentenceFor(status, retryAfterSeconds = null) {
+  if (status === 429) return rateWaitSentence(retryAfterSeconds);
   return HTTP_SENTENCE.get(status) ?? SENTENCE.failed;
 }
 
-function errorMessage(status, body) {
+function errorMessage(status, body, retryAfterSeconds = null) {
+  if (status === 429) return rateWaitSentence(retryAfterSeconds);
   if (isRecord(body) && typeof body.message === "string") return body.message;
-  return sentenceFor(status);
+  return sentenceFor(status, retryAfterSeconds);
 }
 
 function upgradeMessage(status, body) {
@@ -78,6 +87,14 @@ function upgradeMessage(status, body) {
   return body.message;
 }
 
+// T-275: the API pauses compose redeploy in the private preview and says why.
+function composeUnavailableMessage(status, body) {
+  if (status !== 403 || !isRecord(body) || body.error !== "compose_unavailable" || typeof body.message !== "string") {
+    return null;
+  }
+  return body.message;
+}
+
 function storageCreateMessage(status, body) {
   if (!isRecord(body)) return null;
   if (status === 403 && body.error === "bucket_limit") {
@@ -333,7 +350,7 @@ async function redeploy(io, key, json, appId) {
     method: "POST",
   });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
-  if (result.status !== 202) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 202) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const application = result.body?.application ?? {};
   const id = text(application.id) || appId;
   const name = text(application.name);
@@ -445,7 +462,7 @@ async function createThenDeploy(io, key, json, flags) {
   try {
     const listed = await call(io, key, { path: "/v1/projects", method: "GET" });
     if (listed.network) return fail(io, key, json, SENTENCE.platform, created);
-    if (listed.status !== 200) return fail(io, key, json, sentenceFor(listed.status), created);
+    if (listed.status !== 200) return fail(io, key, json, sentenceFor(listed.status, listed.retryAfterSeconds), created);
     let projectId = findProjectId(listed.body, project);
     if (projectId === null) {
       const made = await call(io, key, {
@@ -456,7 +473,7 @@ async function createThenDeploy(io, key, json, flags) {
       if (made.network) return fail(io, key, json, SENTENCE.platform, created);
       const madeId = made.body?.project?.id;
       if (made.status !== 201 || typeof madeId !== "string" || madeId === "") {
-        return fail(io, key, json, made.status === 201 ? SENTENCE.failed : sentenceFor(made.status), created);
+        return fail(io, key, json, made.status === 201 ? SENTENCE.failed : sentenceFor(made.status, made.retryAfterSeconds), created);
       }
       projectId = madeId;
       created.projectId = madeId;
@@ -484,7 +501,7 @@ async function createThenDeploy(io, key, json, flags) {
         io,
         key,
         json,
-        passed ?? (madeApp.status === 201 ? SENTENCE.failed : sentenceFor(madeApp.status)),
+        passed ?? (madeApp.status === 201 ? SENTENCE.failed : sentenceFor(madeApp.status, madeApp.retryAfterSeconds)),
         created,
       );
     }
@@ -518,7 +535,7 @@ async function createThenDeploy(io, key, json, flags) {
       method: "POST",
     });
     if (deployed.network) return fail(io, key, json, SENTENCE.platform, created);
-    if (deployed.status !== 202) return fail(io, key, json, sentenceFor(deployed.status), created);
+    if (deployed.status !== 202) return fail(io, key, json, sentenceFor(deployed.status, deployed.retryAfterSeconds), created);
     const shown = deployed.body?.application ?? application;
     const id = text(shown.id) || applicationId;
     const shownName = text(shown.name) || name;
@@ -577,7 +594,7 @@ export async function status(args, io) {
     method: "GET",
   });
   if (result.network) return fail(io, opened.key, opened.json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, opened.key, opened.json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, opened.key, opened.json, sentenceFor(result.status, result.retryAfterSeconds));
   const statusText = text(result.body?.status);
   const hostnames = hostnamesOf(result.body);
   const id = text(result.body?.application?.id) || required.appId;
@@ -603,7 +620,7 @@ async function hookUrl(io, key, json, appId) {
     method: "GET",
   });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const url = result.body?.hook?.url;
   if (typeof url !== "string") return fail(io, key, json, SENTENCE.failed);
   return succeed(io, key, json, { application_id: appId, url }, `${url}\n`);
@@ -617,7 +634,7 @@ async function envNames(io, key, json, appId) {
     method: "GET",
   });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const names = result.body?.names;
   if (!Array.isArray(names) || !names.every((name) => typeof name === "string")) {
     return fail(io, key, json, SENTENCE.failed);
@@ -645,7 +662,7 @@ export async function env(args, io) {
     body,
   });
   if (result.network) return fail(io, opened.key, opened.json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, opened.key, opened.json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, opened.key, opened.json, sentenceFor(result.status, result.retryAfterSeconds));
   return succeed(
     io,
     opened.key,
@@ -741,7 +758,7 @@ async function domainsBind(args, io, key) {
   }
   const result = await call(io, key, request);
   if (result.network) return fail(io, key, json, SENTENCE.platform);
-  if (result.status !== 201) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 201) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const domain = isRecord(result.body) ? result.body.domain : undefined;
   const hostname = text(domain?.hostname);
   if (hostnameFlag === undefined) {
@@ -779,7 +796,7 @@ async function domainsVerify(args, io, key) {
     method: "POST",
   });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const body = isRecord(result.body) ? result.body : {};
   const domain = isRecord(body.domain) ? body.domain : {};
   const statusText = typeof domain.status === "string" ? domain.status : "";
@@ -812,7 +829,7 @@ export async function restart(args, io) {
     method: "POST",
   });
   if (result.network) return fail(io, opened.key, opened.json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, opened.key, opened.json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, opened.key, opened.json, sentenceFor(result.status, result.retryAfterSeconds));
   return succeed(
     io,
     opened.key,
@@ -863,7 +880,7 @@ export async function logs(args, io) {
     method: "GET",
   });
   if (result.network) return fail(io, loaded.key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status, result.retryAfterSeconds));
   if (!isRecord(result.body) || typeof result.body.lines !== "string") {
     return fail(io, loaded.key, json, SENTENCE.failed);
   }
@@ -927,7 +944,7 @@ export async function list(args, io) {
     resource === "apps" ? "/v1/apps" : resource === "databases" ? "/v1/databases" : "/v1/projects";
   const result = await call(io, loaded.key, { path, method: "GET" });
   if (result.network) return fail(io, loaded.key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status, result.retryAfterSeconds));
   if (resource !== "projects") {
     const human = listText(resource, result.body);
     if (human === null) return fail(io, loaded.key, json, SENTENCE.failed);
@@ -964,7 +981,7 @@ export async function usage(args, io) {
   const json = parsed.values.json === true;
   const result = await call(io, loaded.key, { path: "/v1/usage", method: "GET" });
   if (result.network) return fail(io, loaded.key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const human = usageText(result.body);
   if (human === null) return fail(io, loaded.key, json, SENTENCE.failed);
   return succeed(io, loaded.key, json, result.body, human);
@@ -994,7 +1011,7 @@ export async function plans(args, io) {
   const json = parsed.values.json === true;
   const result = await call(io, loaded.key, { path: "/v1/plans", method: "GET" });
   if (result.network) return fail(io, loaded.key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const human = plansText(result.body);
   if (human === null) return fail(io, loaded.key, json, SENTENCE.failed);
   return succeed(io, loaded.key, json, result.body, human);
@@ -1043,7 +1060,7 @@ export async function whoami(args, io) {
   const json = parsed.values.json === true;
   const result = await call(io, loaded.key, { path: "/v1/me", method: "GET" });
   if (result.network) return fail(io, loaded.key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const view = whoamiView(result.body);
   if (view === null) return fail(io, loaded.key, json, SENTENCE.failed);
   const plan = view.account.plan === null ? "none" : view.account.plan;
@@ -1184,7 +1201,7 @@ export async function diagnose(args, io) {
     method: "GET",
   });
   if (result.network) return fail(io, loaded.key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const human = diagnoseSentences(result.body);
   if (human === null) return fail(io, loaded.key, json, SENTENCE.failed);
   return succeed(io, loaded.key, json, result.body, human);
@@ -1212,7 +1229,7 @@ async function databaseCreate(args, io, key) {
   });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
   if (result.status !== 201) {
-    return fail(io, key, json, upgradeMessage(result.status, result.body) ?? sentenceFor(result.status));
+    return fail(io, key, json, upgradeMessage(result.status, result.body) ?? sentenceFor(result.status, result.retryAfterSeconds));
   }
   const view = databaseFields(isRecord(result.body) ? result.body.database : null);
   const password = isRecord(result.body) ? result.body.password : undefined;
@@ -1235,7 +1252,7 @@ async function databaseStatus(args, io, key) {
     method: "GET",
   });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const view = databaseFields(isRecord(result.body) ? result.body.database : null);
   const statusText = isRecord(result.body) ? result.body.status : undefined;
   if (view === null || typeof statusText !== "string") return fail(io, key, json, SENTENCE.failed);
@@ -1271,7 +1288,7 @@ async function databaseBackup(args, io, key) {
   });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
   if (result.status === 409) return fail(io, key, json, SENTENCE.noBackup);
-  if (result.status !== 202) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 202) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   return succeed(io, key, json, { database_id: id, backup: "run" }, "Backup run.\n");
 }
 
@@ -1291,7 +1308,7 @@ async function databaseDelete(args, io, key) {
     method: "DELETE",
   });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
-  if (result.status !== 204) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 204) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   return succeed(io, key, json, { database_id: id, removed: true }, "Database removed.\n");
 }
 
@@ -1398,7 +1415,7 @@ async function storageCreate(args, io, key) {
   if (refusal !== null) return fail(io, key, json, refusal);
   if (result.status === 503) return fail(io, key, json, SENTENCE.storageOff);
   if (result.status !== 201) {
-    return fail(io, key, json, upgradeMessage(result.status, result.body) ?? sentenceFor(result.status));
+    return fail(io, key, json, upgradeMessage(result.status, result.body) ?? sentenceFor(result.status, result.retryAfterSeconds));
   }
   const body = isRecord(result.body) ? result.body : null;
   const view = body === null ? null : storageFields(body.bucket);
@@ -1440,7 +1457,7 @@ async function storageList(args, io, key) {
   const result = await call(io, key, { path: "/v1/buckets", method: "GET" });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
   if (result.status === 503) return fail(io, key, json, SENTENCE.storageOff);
-  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const items = isRecord(result.body) && Array.isArray(result.body.buckets) ? result.body.buckets : null;
   if (items === null) return fail(io, key, json, SENTENCE.failed);
   const views = [];
@@ -1467,7 +1484,7 @@ async function storageShow(args, io, key) {
   });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
   if (result.status === 503) return fail(io, key, json, SENTENCE.storageOff);
-  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const view = storageFields(isRecord(result.body) ? result.body.bucket : null);
   if (view === null) return fail(io, key, json, SENTENCE.failed);
   return succeed(io, key, json, { bucket: view }, `${storageLines(view).join("\n")}\n`);
@@ -1491,7 +1508,7 @@ async function storageDelete(args, io, key) {
   if (result.network) return fail(io, key, json, SENTENCE.platform);
   if (result.status === 409) return fail(io, key, json, SENTENCE.bucketNotEmpty);
   if (result.status === 503) return fail(io, key, json, SENTENCE.storageOff);
-  if (result.status !== 204) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 204) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   return succeed(io, key, json, { bucket_id: id, removed: true }, `${SENTENCE.bucketRemoved}\n`);
 }
 
@@ -1525,7 +1542,7 @@ export async function login(args, io) {
   if (key === "") return fail(io, "", false, SENTENCE.emptyKey);
   const result = await call(io, key, { path: "/v1/me", method: "GET" });
   if (result.network) return fail(io, key, false, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, key, false, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, key, false, sentenceFor(result.status, result.retryAfterSeconds));
   saveApiKey(io.env, key);
   io.stdout.write(`${SENTENCE.loggedIn}\n`);
   return { exitCode: 0 };
@@ -1579,7 +1596,7 @@ async function appRemove(args, io, key) {
 
   const got = await call(io, key, { path: `/v1/apps/${encodeURIComponent(appId)}`, method: "GET" });
   if (got.network) return fail(io, key, json, SENTENCE.platform);
-  if (got.status !== 200) return fail(io, key, json, sentenceFor(got.status));
+  if (got.status !== 200) return fail(io, key, json, sentenceFor(got.status, got.retryAfterSeconds));
   if (!isRecord(got.body)) return fail(io, key, json, SENTENCE.failed);
   const application = isRecord(got.body.application) ? got.body.application : null;
   if (application === null) return fail(io, key, json, SENTENCE.failed);
@@ -1593,7 +1610,7 @@ async function appRemove(args, io, key) {
 
   const deleted = await call(io, key, { path: `/v1/apps/${encodeURIComponent(appId)}`, method: "DELETE" });
   if (deleted.network) return fail(io, key, json, SENTENCE.platform);
-  if (deleted.status !== 200) return fail(io, key, json, sentenceFor(deleted.status));
+  if (deleted.status !== 200) return fail(io, key, json, sentenceFor(deleted.status, deleted.retryAfterSeconds));
   return succeed(io, key, json, { app_id: appId, removed: true }, `${SENTENCE.appRemoved}\n`);
 }
 
@@ -1751,7 +1768,7 @@ export async function preflight(args, io) {
   });
   if (result.network) return fail(io, loaded.key, json, SENTENCE.platform, undefined, 2);
   if (result.status < 200 || result.status >= 300) {
-    return fail(io, loaded.key, json, errorMessage(result.status, result.body), undefined, 2);
+    return fail(io, loaded.key, json, errorMessage(result.status, result.body, result.retryAfterSeconds), undefined, 2);
   }
 
   if (
@@ -1817,7 +1834,7 @@ export async function accountExport(args, io) {
   });
   if (result.network) return fail(io, loaded.key, json, SENTENCE.platform, undefined, 2);
   if (result.status < 200 || result.status >= 300) {
-    return fail(io, loaded.key, json, errorMessage(result.status, result.body), undefined, 2);
+    return fail(io, loaded.key, json, errorMessage(result.status, result.body, result.retryAfterSeconds), undefined, 2);
   }
 
   if (json) {
@@ -1843,7 +1860,7 @@ export async function next(args, io) {
   const json = parsed.values.json === true;
   const result = await call(io, loaded.key, { path: "/v1/me/next-step", method: "GET" });
   if (result.network) return fail(io, loaded.key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, loaded.key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const body = isRecord(result.body) ? result.body : null;
   const step = body?.step;
   const sentence = body?.sentence;
@@ -1950,7 +1967,7 @@ async function composeList(args, io, key) {
   const json = parsed.values.json === true;
   const result = await call(io, key, { path: "/v1/compose", method: "GET" });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
-  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status));
+  if (result.status !== 200) return fail(io, key, json, sentenceFor(result.status, result.retryAfterSeconds));
   const items = isRecord(result.body) && Array.isArray(result.body.compose) ? result.body.compose : null;
   if (items === null) return fail(io, key, json, SENTENCE.failed);
   const views = [];
@@ -1977,7 +1994,12 @@ async function composeDeploy(args, io, key) {
   });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
   if (result.status !== 202) {
-    return fail(io, key, json, upgradeMessage(result.status, result.body) ?? sentenceFor(result.status));
+    return fail(
+      io,
+      key,
+      json,
+      upgradeMessage(result.status, result.body) ?? composeUnavailableMessage(result.status, result.body) ?? sentenceFor(result.status, result.retryAfterSeconds),
+    );
   }
   const view = composeFields(isRecord(result.body) ? result.body.compose : null);
   if (view === null) return fail(io, key, json, SENTENCE.failed);
@@ -1999,7 +2021,7 @@ async function composeStartStop(args, io, key, action) {
   });
   if (result.network) return fail(io, key, json, SENTENCE.platform);
   if (result.status !== 200) {
-    return fail(io, key, json, upgradeMessage(result.status, result.body) ?? sentenceFor(result.status));
+    return fail(io, key, json, upgradeMessage(result.status, result.body) ?? sentenceFor(result.status, result.retryAfterSeconds));
   }
   const body = isRecord(result.body) ? result.body : null;
   const view = body === null ? null : composeFields(body.compose);