run402 1.38.0 → 1.40.0

package/lib/sdk-errors.mjs

@@ -0,0 +1,45 @@
+/**
+ * CLI-side SDK error translator.
+ *
+ * Maps SDK `Run402Error` subclasses into the CLI's existing error output
+ * format: `{status: "error", http: ?, ...bodyFields}` on stderr, `process.exit(1)`.
+ * Preserves specific behaviors:
+ *   - `ProjectNotFound` → plain-text "Project <id> not found in local registry"
+ *     with the "Hint: project IDs start with prj_" guidance when the id
+ *     doesn't start with `prj_`.
+ *   - HTML / non-JSON error bodies → `body_preview` field (first 500 chars),
+ *     matching GH-84 behavior.
+ *   - Network errors → `{status: "error", message: "..."}`.
+ */
+
+export function reportSdkError(err) {
+  if (err?.name === "ProjectNotFound") {
+    const id = err.projectId || "";
+    const hint = id && !String(id).startsWith("prj_")
+      ? ` Hint: project IDs start with "prj_". Check that the argument order is <project_id> <name>.`
+      : "";
+    console.error(`Project ${id} not found in local registry.${hint}`);
+    process.exit(1);
+  }
+
+  const payload = { status: "error" };
+
+  if (err?.status !== undefined && err?.status !== null) {
+    payload.http = err.status;
+    if (err.body && typeof err.body === "object") {
+      Object.assign(payload, err.body);
+    } else if (typeof err.body === "string") {
+      payload.body_preview = err.body.slice(0, 500);
+    }
+  } else {
+    payload.message = err?.message || String(err);
+  }
+
+  // Keep `status: "error"` as the outer envelope even if the response body
+  // happened to contain its own `status` field (e.g. `{"status":"degraded"}`
+  // from /health 503 responses). Downstream scripts match on this sentinel.
+  payload.status = "error";
+
+  console.error(JSON.stringify(payload));
+  process.exit(1);
+}

package/lib/sdk.mjs

@@ -0,0 +1,14 @@
+/**
+ * CLI-side SDK getter.
+ *
+ * Constructs a fresh Node-flavored SDK on each call. Each CLI invocation is
+ * typically a single process, so a fresh instance per subcommand is cheap
+ * and sidesteps stale-env issues in tests that mutate RUN402_CONFIG_DIR /
+ * RUN402_API_BASE between runs.
+ */
+
+import { run402 } from "../../sdk/dist/node/index.js";
+
+export function getSdk() {
+  return run402();
+}

package/lib/secrets.mjs

@@ -1,5 +1,6 @@
 import { readFileSync } from "fs";
-import { findProject, API } from "./config.mjs";
+import { getSdk } from "./sdk.mjs";
+import { reportSdkError } from "./sdk-errors.mjs";
 
 const HELP = `run402 secrets — Manage project secrets
 
@@ -48,7 +49,6 @@ Examples:
 };
 
 async function set(projectId, key, args = []) {
-  const p = findProject(projectId);
   let file = null;
   let value = null;
   for (let i = 0; i < args.length; i++) {
@@ -57,37 +57,29 @@ async function set(projectId, key, args = []) {
   }
   const val = file ? readFileSync(file, "utf-8") : value;
   if (!val) { console.error(JSON.stringify({ status: "error", message: "Missing secret value. Provide inline or use --file <path>" })); process.exit(1); }
-  const res = await fetch(`${API}/projects/v1/admin/${projectId}/secrets`, {
-    method: "POST",
-    headers: { "Authorization": `Bearer ${p.service_key}`, "Content-Type": "application/json" },
-    body: JSON.stringify({ key, value: val }),
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify({ status: "ok", message: `Secret '${key}' set for project ${projectId}.` }));
+  try {
+    await getSdk().secrets.set(projectId, key, val);
+    console.log(JSON.stringify({ status: "ok", message: `Secret '${key}' set for project ${projectId}.` }));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 async function list(projectId) {
-  const p = findProject(projectId);
-  const res = await fetch(`${API}/projects/v1/admin/${projectId}/secrets`, {
-    headers: { "Authorization": `Bearer ${p.service_key}` },
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
+  try {
+    const data = await getSdk().secrets.list(projectId);
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 async function deleteSecret(projectId, key) {
-  const p = findProject(projectId);
-  const res = await fetch(`${API}/projects/v1/admin/${projectId}/secrets/${encodeURIComponent(key)}`, {
-    method: "DELETE",
-    headers: { "Authorization": `Bearer ${p.service_key}` },
-  });
-  if (res.status === 204 || res.ok) {
+  try {
+    await getSdk().secrets.delete(projectId, key);
     console.log(JSON.stringify({ status: "ok", message: `Secret '${key}' deleted.` }));
-  } else {
-    const data = await res.json().catch(() => ({}));
-    console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1);
+  } catch (err) {
+    reportSdkError(err);
   }
 }
 

package/lib/sender-domain.mjs

@@ -1,4 +1,6 @@
-import { findProject, resolveProjectId, API } from "./config.mjs";
+import { resolveProjectId } from "./config.mjs";
+import { getSdk } from "./sdk.mjs";
+import { reportSdkError } from "./sdk-errors.mjs";
 
 const HELP = `run402 sender-domain — Manage custom email sender domain
 
@@ -35,55 +37,38 @@ async function register(args) {
     else if (!args[i].startsWith("--") && !domain) { domain = args[i]; }
   }
   const projectId = resolveProjectId(projectOpt);
-  const p = findProject(projectId);
 
   if (!domain) {
     console.error(JSON.stringify({ status: "error", message: "Missing domain. Usage: run402 sender-domain register <domain>" }));
     process.exit(1);
   }
 
-  const res = await fetch(`${API}/email/v1/domains`, {
-    method: "POST",
-    headers: { Authorization: `Bearer ${p.service_key}`, "Content-Type": "application/json" },
-    body: JSON.stringify({ domain }),
-  });
-  const data = await res.json();
-  if (!res.ok) {
-    console.error(JSON.stringify({ status: "error", http: res.status, ...data }));
-    process.exit(1);
+  try {
+    const data = await getSdk().senderDomain.register(projectId, domain);
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify(data, null, 2));
 }
 
 async function status(args) {
   const projectId = resolveProjectId(parseFlag(args, "--project"));
-  const p = findProject(projectId);
-
-  const res = await fetch(`${API}/email/v1/domains`, {
-    headers: { Authorization: `Bearer ${p.service_key}` },
-  });
-  const data = await res.json();
-  if (!res.ok) {
-    console.error(JSON.stringify({ status: "error", http: res.status, ...data }));
-    process.exit(1);
+  try {
+    const data = await getSdk().senderDomain.status(projectId);
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify(data, null, 2));
 }
 
 async function remove(args) {
   const projectId = resolveProjectId(parseFlag(args, "--project"));
-  const p = findProject(projectId);
-
-  const res = await fetch(`${API}/email/v1/domains`, {
-    method: "DELETE",
-    headers: { Authorization: `Bearer ${p.service_key}` },
-  });
-  const data = await res.json();
-  if (!res.ok) {
-    console.error(JSON.stringify({ status: "error", http: res.status, ...data }));
-    process.exit(1);
+  try {
+    await getSdk().senderDomain.remove(projectId);
+    console.log(JSON.stringify({ status: "ok" }));
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify(data));
 }
 
 async function inboundToggle(action, args) {
@@ -94,25 +79,23 @@ async function inboundToggle(action, args) {
     else if (!args[i].startsWith("--") && !domain) { domain = args[i]; }
   }
   const projectId = resolveProjectId(projectOpt);
-  const p = findProject(projectId);
 
   if (!domain) {
     console.error(JSON.stringify({ status: "error", message: `Missing domain. Usage: run402 sender-domain inbound-${action} <domain>` }));
     process.exit(1);
   }
 
-  const method = action === "enable" ? "POST" : "DELETE";
-  const res = await fetch(`${API}/email/v1/domains/inbound`, {
-    method,
-    headers: { Authorization: `Bearer ${p.service_key}`, "Content-Type": "application/json" },
-    body: JSON.stringify({ domain }),
-  });
-  const data = await res.json();
-  if (!res.ok) {
-    console.error(JSON.stringify({ status: "error", http: res.status, ...data }));
-    process.exit(1);
+  try {
+    if (action === "enable") {
+      const data = await getSdk().senderDomain.enableInbound(projectId, domain);
+      console.log(JSON.stringify(data, null, 2));
+    } else {
+      await getSdk().senderDomain.disableInbound(projectId, domain);
+      console.log(JSON.stringify({ status: "ok", domain }));
+    }
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify(data, null, 2));
 }
 
 export async function run(sub, args) {

package/lib/service.mjs

@@ -1,4 +1,5 @@
-import { API } from "./config.mjs";
+import { getSdk } from "./sdk.mjs";
+import { reportSdkError } from "./sdk-errors.mjs";
 
 const HELP = `run402 service — Run402 service health and availability
 
@@ -12,22 +13,22 @@ Notes:
     balance, tier, projects), use 'run402 status'.
 `;
 
-async function fetchAndEmit(path) {
-  let res;
+async function status() {
   try {
-    res = await fetch(`${API}${path}`);
+    const data = await getSdk().service.status();
+    console.log(JSON.stringify(data, null, 2));
   } catch (err) {
-    console.error(JSON.stringify({ status: "error", message: err?.message || String(err) }));
-    process.exit(1);
+    reportSdkError(err);
   }
-  const text = await res.text();
-  let body;
-  try { body = JSON.parse(text); } catch { body = text; }
-  if (!res.ok) {
-    console.error(JSON.stringify({ status: "error", http: res.status, body }));
-    process.exit(1);
+}
+
+async function health() {
+  try {
+    const data = await getSdk().service.health();
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify(body, null, 2));
 }
 
 export async function run(sub, args) {
@@ -37,12 +38,8 @@ export async function run(sub, args) {
     process.exit(0);
   }
   switch (sub) {
-    case "status":
-      await fetchAndEmit("/status");
-      return;
-    case "health":
-      await fetchAndEmit("/health");
-      return;
+    case "status": await status(); break;
+    case "health": await health(); break;
     default:
       console.error(`Unknown subcommand: ${sub}\n`);
       console.log(HELP);

package/lib/sites.mjs

@@ -1,7 +1,9 @@
 import { readFileSync } from "fs";
 import { dirname, resolve } from "path";
-import { API, allowanceAuthHeaders, resolveProjectId, updateProject } from "./config.mjs";
+import { allowanceAuthHeaders, resolveProjectId, updateProject } from "./config.mjs";
 import { resolveFilePathsInManifest } from "./manifest.mjs";
+import { getSdk } from "./sdk.mjs";
+import { reportSdkError } from "./sdk-errors.mjs";
 
 const HELP = `run402 sites — Deploy and manage static sites
 
@@ -99,22 +101,22 @@ async function deploy(args) {
   const raw = opts.manifest ? readFileSync(opts.manifest, "utf-8") : await readStdin();
   const manifest = JSON.parse(raw);
   if (opts.manifest) resolveFilePathsInManifest(manifest, dirname(resolve(opts.manifest)));
-  const body = { files: manifest.files, project: projectId };
-  if (opts.target) body.target = opts.target;
-  if (opts.inherit) body.inherit = true;
-
-  const authHeaders = allowanceAuthHeaders("/deployments/v1");
-  const res = await fetch(`${API}/deployments/v1`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...authHeaders },
-    body: JSON.stringify(body),
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  if (data.deployment_id) {
-    updateProject(projectId, { last_deployment_id: data.deployment_id });
+
+  // Preserve the aggressive early exit when no allowance is configured.
+  allowanceAuthHeaders("/deployments/v1");
+
+  try {
+    const data = await getSdk().sites.deploy(projectId, manifest.files, {
+      target: opts.target,
+      inherit: opts.inherit,
+    });
+    if (data.deployment_id) {
+      updateProject(projectId, { last_deployment_id: data.deployment_id });
+    }
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
   }
-  console.log(JSON.stringify(data, null, 2));
 }
 
 async function status(args) {
@@ -123,10 +125,12 @@ async function status(args) {
     if (!args[i].startsWith("-")) { deploymentId = args[i]; break; }
   }
   if (!deploymentId) { console.error(JSON.stringify({ status: "error", message: "Missing deployment ID" })); process.exit(1); }
-  const res = await fetch(`${API}/deployments/v1/${deploymentId}`);
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
+  try {
+    const data = await getSdk().sites.getDeployment(deploymentId);
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 export async function run(sub, args) {

package/lib/subdomains.mjs

@@ -1,4 +1,6 @@
-import { resolveProject, resolveProjectId, API } from "./config.mjs";
+import { resolveProject, resolveProjectId } from "./config.mjs";
+import { getSdk } from "./sdk.mjs";
+import { reportSdkError } from "./sdk-errors.mjs";
 
 const HELP = `run402 subdomains — Manage custom subdomains
 
@@ -55,7 +57,6 @@ async function claim(positionalArgs, flagArgs) {
     if (flagArgs[i] === "--project" && flagArgs[i + 1]) opts.project = flagArgs[++i];
     if (flagArgs[i] === "--deployment" && flagArgs[i + 1]) opts.deployment = flagArgs[++i];
   }
-  // positional: [name] or [deployment_id, name]
   let name, deploymentId;
   if (positionalArgs.length >= 2) {
     deploymentId = positionalArgs[0];
@@ -68,15 +69,12 @@ async function claim(positionalArgs, flagArgs) {
   const p = resolveProject(opts.project);
   deploymentId = opts.deployment || deploymentId || p.last_deployment_id;
   if (!deploymentId) { console.error("Error: no deployment_id specified and no recent deployment found. Deploy a site first or pass --deployment <id>."); process.exit(1); }
-  const headers = { "Content-Type": "application/json", "Authorization": `Bearer ${p.service_key}` };
-  const res = await fetch(`${API}/subdomains/v1`, {
-    method: "POST",
-    headers,
-    body: JSON.stringify({ name, deployment_id: deploymentId }),
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
+  try {
+    const data = await getSdk().subdomains.claim(name, deploymentId, { projectId });
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 async function deleteSubdomain(name, args) {
@@ -84,28 +82,23 @@ async function deleteSubdomain(name, args) {
   for (let i = 0; i < args.length; i++) {
     if (args[i] === "--project" && args[i + 1]) opts.project = args[++i];
   }
-  const p = resolveProject(opts.project);
-  const headers = { "Authorization": `Bearer ${p.service_key}` };
-  const res = await fetch(`${API}/subdomains/v1/${encodeURIComponent(name)}`, {
-    method: "DELETE",
-    headers,
-  });
-  if (res.status === 204 || res.ok) {
+  const projectId = resolveProjectId(opts.project);
+  try {
+    await getSdk().subdomains.delete(name, { projectId });
     console.log(JSON.stringify({ status: "ok", message: `Subdomain '${name}' released.` }));
-  } else {
-    const data = await res.json().catch(() => ({}));
-    console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1);
+  } catch (err) {
+    reportSdkError(err);
   }
 }
 
-async function list(projectId) {
-  const p = resolveProject(projectId);
-  const res = await fetch(`${API}/subdomains/v1`, {
-    headers: { "Authorization": `Bearer ${p.service_key}` },
-  });
-  const data = await res.json();
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
+async function list(projectIdArg) {
+  const projectId = resolveProjectId(projectIdArg);
+  try {
+    const data = await getSdk().subdomains.list(projectId);
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
+  }
 }
 
 export async function run(sub, args) {

package/lib/tier.mjs

@@ -1,5 +1,5 @@
-import { readAllowance, ALLOWANCE_FILE, API, allowanceAuthHeaders } from "./config.mjs";
-import { setupPaidFetch } from "./paid-fetch.mjs";
+import { getSdk } from "./sdk.mjs";
+import { reportSdkError } from "./sdk-errors.mjs";
 
 const HELP = `run402 tier — Manage your Run402 tier subscription
 
@@ -25,36 +25,22 @@ Examples:
 `;
 
 async function status() {
-  const authHeaders = allowanceAuthHeaders("/tiers/v1/status");
-  const res = await fetch(`${API}/tiers/v1/status`, {
-    headers: { ...authHeaders },
-  });
-  const text = await res.text();
-  let data;
   try {
-    data = JSON.parse(text);
-  } catch {
-    console.error(JSON.stringify({ status: "error", http: res.status, message: "Non-JSON response from server", body: text.slice(0, 500) }));
-    process.exit(1);
+    const data = await getSdk().tier.status();
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
   }
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
 }
 
 async function set(tierName) {
   if (!tierName) { console.error(JSON.stringify({ status: "error", message: "Usage: run402 tier set <prototype|hobby|team>" })); process.exit(1); }
-  const fetchPaid = await setupPaidFetch();
-  const res = await fetchPaid(`${API}/tiers/v1/${tierName}`, { method: "POST", headers: { "Content-Type": "application/json" } });
-  const text = await res.text();
-  let data;
   try {
-    data = JSON.parse(text);
-  } catch {
-    console.error(JSON.stringify({ status: "error", http: res.status, message: "Non-JSON response from server", body: text.slice(0, 500) }));
-    process.exit(1);
+    const data = await getSdk().tier.set(tierName);
+    console.log(JSON.stringify(data, null, 2));
+  } catch (err) {
+    reportSdkError(err);
   }
-  if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
-  console.log(JSON.stringify(data, null, 2));
 }
 
 export async function run(sub, args) {