apiblaze 0.4.2 → 0.4.4

package/dist/index.js

@@ -28,7 +28,7 @@ var import_commander = require("commander");
 var import_chalk26 = __toESM(require("chalk"));
 
 // package.json
-var version = "0.4.2";
+var version = "0.4.4";
 
 // src/types.ts
 var ApiError = class extends Error {
@@ -1104,14 +1104,23 @@ function fail(message) {
   console.error(import_chalk6.default.red(`Error: ${message}`));
   process.exit(1);
 }
-function printCurlExample(url, apiKey) {
+function buildTryItCurl(url, authType, apiKey) {
+  if (authType === "api_key") {
+    if (!apiKey) return null;
+    return `curl ${url} -H "X-API-Key: ${apiKey}"`;
+  }
+  if (authType === "none") return `curl ${url}`;
+  return null;
+}
+function printCurlExample(url, authType, apiKey, devPortal) {
+  const curl = buildTryItCurl(url, authType, apiKey);
   console.log();
-  console.log(`  ${import_chalk6.default.dim("Try it with curl:")}`);
-  if (apiKey) {
-    console.log(`    ${import_chalk6.default.cyan(`curl ${url} \\`)}`);
-    console.log(`    ${import_chalk6.default.cyan(`  -H "X-API-Key: ${apiKey}"`)}`);
-  } else {
-    console.log(`    ${import_chalk6.default.cyan(`curl ${url}`)}`);
+  if (curl) {
+    console.log(`  ${import_chalk6.default.dim("Try it \u2014 copy/paste:")}`);
+    console.log(`    ${import_chalk6.default.cyan(curl)}`);
+  } else if (authType === "oauth") {
+    console.log(`  ${import_chalk6.default.dim("Try it:")} this proxy uses OAuth \u2014 sign in at ${import_chalk6.default.bold(devPortal ?? "the dev portal")} to get a token,`);
+    console.log(`  ${import_chalk6.default.dim(`then call ${url} with`)} ${import_chalk6.default.cyan('-H "Authorization: Bearer <token>"')}`);
   }
 }
 var VALID_AUTH = ["api_key", "none", "oauth"];
@@ -1259,7 +1268,7 @@ async function runCreate(opts = {}) {
       console.log(import_chalk6.default.dim(`  (Separate keys were also created for: ${otherEnvs.join(", ")}.)`));
     }
   }
-  printCurlExample(proxyUrl, auth === "none" ? void 0 : adminKey);
+  printCurlExample(proxyUrl, auth, adminKey, devPortal);
   console.log();
 }
 async function runAnonymousCreate(opts) {
@@ -1370,7 +1379,7 @@ async function runAnonymousCreate(opts) {
     console.log(`    ${import_chalk6.default.bold.green(apiKey)}`);
     console.log(import_chalk6.default.dim("\n  Save this now \u2014 send it as the X-API-Key header. It may not be shown again."));
   }
-  if (prodEndpoint) printCurlExample(prodEndpoint, apiKey);
+  if (prodEndpoint) printCurlExample(prodEndpoint, opts.auth || "api_key", apiKey, result.portal);
   if (result.claim_url) {
     console.log();
     console.log(`  ${import_chalk6.default.yellow("\u26A0 Anonymous proxy \u2014 claim it to your account within 30 days or it expires:")}`);
@@ -1984,6 +1993,7 @@ var import_chalk16 = __toESM(require("chalk"));
 
 // src/lib/trace.ts
 var import_chalk15 = __toESM(require("chalk"));
+var CONTROL_API_VERSION = "1.0.0";
 var verbose = false;
 var entries = [];
 function setVerbose(v) {
@@ -2002,24 +2012,23 @@ function renderTrace() {
   console.log(import_chalk15.default.dim("\n" + "\u2500".repeat(64)));
   console.log(import_chalk15.default.bold(`--verbose: ${entries.length} API call${entries.length === 1 ? "" : "s"} this command made`));
   console.log(
-    import_chalk15.default.dim("Copy/paste the curl below to do it yourself \u2014 it uses your own login token.\n")
+    import_chalk15.default.dim("The same thing on the official API \u2014 copy/paste with your control-plane key\n(get one with `apiblaze apikeys`, then `export APIBLAZE_KEY=sk_...`):\n")
   );
   entries.forEach((e, i) => {
     const n = entries.length > 1 ? import_chalk15.default.bold(`${i + 1}. `) : "";
     if (e.summary) console.log(`${n}${import_chalk15.default.cyan(e.summary)}${e.status ? import_chalk15.default.dim(`  (HTTP ${e.status})`) : ""}`);
+    const url = `https://api.apiblaze.com/${CONTROL_API_VERSION}/prod${e.path}`;
     const masked = maskBody(e.body);
-    const payload = JSON.stringify({ path: e.path, method: e.method, ...masked ? { body: JSON.parse(masked) } : {} });
-    console.log(import_chalk15.default.green("  curl -sS -X POST https://dashboard.apiblaze.com/api/cli/admin \\"));
-    console.log(import_chalk15.default.green('    -H "Authorization: Bearer $(jq -r .accessToken ~/.apiblaze/credentials.json)" \\'));
-    console.log(import_chalk15.default.green("    -H 'Content-Type: application/json' \\"));
-    console.log(import_chalk15.default.green(`    -d '${payload}'`));
-    console.log(
-      import_chalk15.default.dim(
-        `  # \u2192 admin-api leaf (Lane 3, X-User-Assertion minted server-side): ${e.method} ${e.path}`
-      )
-    );
+    const hasBody = e.method !== "GET" && masked !== void 0;
+    console.log(import_chalk15.default.green(`  curl -sS -X ${e.method} ${url}` + (hasBody ? " \\" : "")));
+    console.log(import_chalk15.default.green('    -H "X-API-Key: $APIBLAZE_KEY"' + (hasBody ? " \\" : "")));
+    if (hasBody) {
+      console.log(import_chalk15.default.green("    -H 'Content-Type: application/json' \\"));
+      console.log(import_chalk15.default.green(`    -d '${masked}'`));
+    }
     if (i < entries.length - 1) console.log();
   });
+  entries.length = 0;
 }
 
 // src/lib/admin.ts
@@ -2148,7 +2157,7 @@ async function runDelete(project, version2, opts) {
   try {
     await admin({
       method: "DELETE",
-      path: `/${proj2.projectId}/${proj2.apiVersion}`,
+      path: `/projects/${proj2.projectId}/${proj2.apiVersion}`,
       summary: `Delete proxy ${proj2.projectName} v${proj2.apiVersion} (full cascade)`
     });
     s2.succeed(`Deleted ${proj2.projectName} v${proj2.apiVersion}.`);
@@ -2169,7 +2178,7 @@ async function patchConfig(project, opts, body, summary) {
   try {
     const out = await admin({
       method: "PATCH",
-      path: `/${proj2.projectId}/${proj2.apiVersion}/config`,
+      path: `/projects/${proj2.projectId}/${proj2.apiVersion}`,
       body,
       summary
     });
@@ -2228,9 +2237,10 @@ async function runDomainAdd(project, opts) {
   try {
     const out = await admin({
       method: "POST",
-      path: `/projects/${proj2.projectId}/cf-domains`,
+      path: `/projects/${proj2.projectId}/domains`,
+      // --tenant binds the domain to one of the project's tenants (per-tenant scope).
       body: { hostname: opts.domain, api_version: proj2.apiVersion, ...opts.tenant ? { tenant_name: opts.tenant } : {} },
-      summary: `Add custom domain ${opts.domain} to ${proj2.projectName} v${proj2.apiVersion}`
+      summary: `Add custom domain ${opts.domain} to ${proj2.projectName} v${proj2.apiVersion}${opts.tenant ? ` (tenant ${opts.tenant})` : ""}`
     });
     spinner.succeed(`Registered ${opts.domain}. Add these DNS records, then run \`apiblaze domain status\`:`);
     if (opts.json) {
@@ -2250,7 +2260,7 @@ async function runDomainList(project, opts) {
   const proj2 = await resolveProject(teamId, project, opts.apiversion);
   const out = await admin({
     method: "GET",
-    path: `/projects/${proj2.projectId}/cf-domains?api_version=${encodeURIComponent(proj2.apiVersion)}`,
+    path: `/projects/${proj2.projectId}/domains?api_version=${encodeURIComponent(proj2.apiVersion)}`,
     summary: `List custom domains for ${proj2.projectName} v${proj2.apiVersion}`
   });
   const domains = out?.domains ?? [];
@@ -2273,7 +2283,7 @@ async function runDomainStatus(project, opts) {
   const proj2 = await resolveProject(teamId, project, opts.apiversion);
   const out = await admin({
     method: "GET",
-    path: `/projects/${proj2.projectId}/cf-domains/${encodeURIComponent(opts.id)}/status`,
+    path: `/projects/${proj2.projectId}/domains/${encodeURIComponent(opts.id)}/status`,
     summary: `Check custom-domain status`
   });
   console.log(opts.json ? JSON.stringify(out) : `  ${import_chalk20.default.bold(out?.hostname ?? opts.id)}: ${import_chalk20.default.cyan(out?.status ?? "unknown")}`);
@@ -2289,7 +2299,7 @@ async function runDomainRemove(project, opts) {
   try {
     await admin({
       method: "DELETE",
-      path: `/projects/${proj2.projectId}/cf-domains/${encodeURIComponent(opts.id)}`,
+      path: `/projects/${proj2.projectId}/domains/${encodeURIComponent(opts.id)}`,
       summary: `Remove custom domain ${opts.id}`
     });
     spinner.succeed("Removed.");
@@ -2568,7 +2578,16 @@ var TOOLS = [
     name: "create_proxy",
     description: "Create a new API proxy (project) from a backend URL. auth is one of: api_key, none, oauth.",
     params: { name: "proxy name (becomes its subdomain)", target: "backend URL to forward to", auth: "api_key | none | oauth (default api_key)" },
-    run: async (a, { teamId }) => createProxy({ name: a.name, target_url: a.target ?? a.target_url ?? a.url, auth_type: a.auth ?? a.auth_type ?? "api_key", team_id: teamId })
+    run: async (a, { teamId }) => {
+      const auth = a.auth ?? a.auth_type ?? "api_key";
+      const res = await createProxy({ name: a.name, target_url: a.target ?? a.target_url ?? a.url, auth_type: auth, team_id: teamId });
+      const version2 = res.api_version || "1.0.0";
+      const keys = res.api_keys ?? {};
+      const key = keys.dev ?? Object.values(keys)[0];
+      const url = `https://${a.name}.apiblaze.com/${version2}/dev`;
+      const tryIt = buildTryItCurl(url, auth, key);
+      return { ...res, proxy_url: url, ...tryIt ? { try_it: tryIt } : {} };
+    }
   },
   {
     name: "list_projects",
@@ -2583,7 +2602,7 @@ var TOOLS = [
     run: async (a, { teamId }) => {
       const p = await proj(teamId, a.project, a.apiversion);
       const body = a.env ? { environments: { [a.env]: { target: a.url } } } : { target_url: a.url };
-      return admin({ method: "PATCH", path: `/${p.projectId}/${p.apiVersion}/config`, body, summary: `Set target for ${p.projectName}` });
+      return admin({ method: "PATCH", path: `/projects/${p.projectId}/${p.apiVersion}`, body, summary: `Set target for ${p.projectName}` });
     }
   },
   {
@@ -2596,7 +2615,7 @@ var TOOLS = [
       if (a.rate != null) throttling.userRateLimit = Number(a.rate);
       if (a.quota != null) throttling.proxyQuota = Number(a.quota);
       if (a.period) throttling.quotaPeriod = a.period;
-      return admin({ method: "PATCH", path: `/${p.projectId}/${p.apiVersion}/config`, body: { throttling }, summary: `Throttle ${p.projectName}` });
+      return admin({ method: "PATCH", path: `/projects/${p.projectId}/${p.apiVersion}`, body: { throttling }, summary: `Throttle ${p.projectName}` });
     }
   },
   {
@@ -2605,7 +2624,7 @@ var TOOLS = [
     params: { project: "project name or id", display_name: "new display name" },
     run: async (a, { teamId }) => {
       const p = await proj(teamId, a.project, a.apiversion);
-      return admin({ method: "PATCH", path: `/${p.projectId}/${p.apiVersion}/config`, body: { display_name: a.display_name }, summary: `Rename ${p.projectName}` });
+      return admin({ method: "PATCH", path: `/projects/${p.projectId}/${p.apiVersion}`, body: { display_name: a.display_name }, summary: `Rename ${p.projectName}` });
     }
   },
   {
@@ -2614,7 +2633,7 @@ var TOOLS = [
     params: { project: "project name or id", version: "optional api version" },
     run: async (a, { teamId }) => {
       const p = await proj(teamId, a.project, a.version);
-      return admin({ method: "DELETE", path: `/${p.projectId}/${p.apiVersion}`, summary: `Delete ${p.projectName} (cascade)` });
+      return admin({ method: "DELETE", path: `/projects/${p.projectId}/${p.apiVersion}`, summary: `Delete ${p.projectName} (cascade)` });
     }
   },
   {
@@ -2661,7 +2680,7 @@ var TOOLS = [
     params: { project: "project name or id" },
     run: async (a, { teamId }) => {
       const p = await proj(teamId, a.project, a.apiversion);
-      return admin({ method: "GET", path: `/projects/${p.projectId}/cf-domains?api_version=${encodeURIComponent(p.apiVersion)}`, summary: `List domains for ${p.projectName}` });
+      return admin({ method: "GET", path: `/projects/${p.projectId}/domains?api_version=${encodeURIComponent(p.apiVersion)}`, summary: `List domains for ${p.projectName}` });
     }
   },
   {
@@ -2768,6 +2787,7 @@ async function runAgent(opts) {
         const msg = err instanceof Error ? err.message : String(err);
         history.push({ role: "user", content: `TOOL_RESULT ${tool.name}: error \u2014 ${truncate(msg, 400)}` });
       }
+      renderTrace();
       if (step === MAX_TOOL_STEPS - 1) {
         console.log(import_chalk24.default.dim("  (paused after several steps \u2014 tell me how to continue)"));
       }
@@ -2956,7 +2976,9 @@ function action(fn) {
   return async (...args) => {
     try {
       await fn(...args);
+      renderTrace();
     } catch (err) {
+      renderTrace();
       printError(err);
       process.exit(1);
     }
@@ -2970,7 +2992,7 @@ program.command("login").description("Authenticate with APIblaze").action(async
     process.exit(1);
   }
 });
-program.command("create").description("Create a new API proxy (no login needed \u2014 without auth it creates an anonymous proxy and prints a claim URL)").option("--name <name>", "Proxy name (becomes <name>.apiblaze.com)").option("--target <url>", "Target URL to forward requests to").option("--team <id|name>", "Team to create under (defaults to your active team)").option("--auth <type>", "Auth type: api_key | none | oauth", "api_key").option("--apiversion <version>", "API version to create (e.g. 2.0.0). Creating a new version of a proxy you own adds a version to the existing project.").option("--tenant <slug>", "Tenant slug (anonymous create; generated if omitted)").option("--product <slug>", "Product tag to group this project under in the portal (team-scoped; anonymous create). Defaults to your team's existing/placeholder tag.").option("--display-name <name>", "Human-friendly display name").option("--subdomain <slug>", "Explicit subdomain (defaults to --name)").option("--config <file>", "JSON file with the full request body (anonymous create): requests_auth, login providers + client/server token types, scopes, callback URLs, etc. See apiblaze_anonymous.yaml. Flags override its fields.").option("-y, --yes", "Skip the confirmation prompt").option("--json", "Output machine-readable JSON (non-interactive)").action(async (opts) => {
+program.command("create").description("Create a new API proxy (no login needed \u2014 without auth it creates an anonymous proxy and prints a claim URL)").option("--name <name>", "Proxy name (becomes <name>.apiblaze.com)").option("--target <url>", "Target URL to forward requests to").option("--team <id|name>", "Team to create under (defaults to your active team)").option("--auth <type>", "Auth type: api_key | none | oauth", "api_key").option("--apiversion <version>", "API version to create (e.g. 2.0.0). Creating a new version of a proxy you own adds a version to the existing project.").option("--product <slug>", "Product tag to group this project under in the portal (team-scoped; anonymous create). Defaults to your team's existing/placeholder tag.").option("--display-name <name>", "Human-friendly display name").option("--subdomain <slug>", "Explicit subdomain (defaults to --name)").option("--config <file>", "JSON file with the full request body (anonymous create): requests_auth, login providers + client/server token types, scopes, callback URLs, etc. See apiblaze_anonymous.yaml. Flags override its fields.").option("-y, --yes", "Skip the confirmation prompt").option("--json", "Output machine-readable JSON (non-interactive)").action(async (opts) => {
   try {
     await runCreate(opts);
   } catch (err) {
@@ -3037,7 +3059,7 @@ program.command("target").description("Change where a proxy forwards requests").
 program.command("throttle").description("Set rate limits and quotas for a proxy").argument("<project>", "Project name or id").option("--rate <n>", "User rate limit (requests/sec)").option("--end-user-rate <n>", "Per-end-user rate limit (requests/sec)").option("--quota <n>", "Proxy quota (requests/period)").option("--period <p>", "Quota period: daily | weekly | monthly").option("--team <id|name>", "Team the project is in").option("--apiversion <version>", "API version").option("--json", "Output machine-readable JSON").action(action((project, opts) => runThrottleSet(project, opts)));
 program.command("rename").description("Change a proxy's display name").argument("<project>", "Project name or id").requiredOption("--display-name <name>", "New human-friendly display name").option("--team <id|name>", "Team the project is in").option("--apiversion <version>", "API version").option("--json", "Output machine-readable JSON").action(action((project, opts) => runRename(project, opts)));
 var domain = program.command("domain").description("Use your own domain for a proxy");
-domain.command("add").description("Add your own domain (shows the DNS records to set)").argument("<project>", "Project name or id").requiredOption("--domain <host>", "Custom hostname to add").option("--tenant <slug>", "Tenant to scope the domain to").option("--team <id|name>", "Team the project is in").option("--apiversion <version>", "API version").option("--json", "Output machine-readable JSON").action(action((project, opts) => runDomainAdd(project, opts)));
+domain.command("add").description("Add your own domain (shows the DNS records to set)").argument("<project>", "Project name or id").requiredOption("--domain <host>", "Custom hostname to add").option("--tenant <slug>", "Bind the domain to one of the project's tenants (per-tenant scope)").option("--team <id|name>", "Team the project is in").option("--apiversion <version>", "API version").option("--json", "Output machine-readable JSON").action(action((project, opts) => runDomainAdd(project, opts)));
 domain.command("list").description("List custom domains for a proxy").argument("<project>", "Project name or id").option("--team <id|name>", "Team the project is in").option("--apiversion <version>", "API version").option("--json", "Output machine-readable JSON").action(action((project, opts) => runDomainList(project, opts)));
 domain.command("status").description("Check a custom domain's validation status").argument("<project>", "Project name or id").requiredOption("--id <domainId>", "Domain id (see `domain list`)").option("--team <id|name>", "Team the project is in").option("--apiversion <version>", "API version").option("--json", "Output machine-readable JSON").action(action((project, opts) => runDomainStatus(project, opts)));
 domain.command("rm").description("Remove a custom domain").argument("<project>", "Project name or id").requiredOption("--id <domainId>", "Domain id (see `domain list`)").option("--team <id|name>", "Team the project is in").option("--apiversion <version>", "API version").action(action((project, opts) => runDomainRemove(project, opts)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Dev tunnel CLI for APIblaze — route localhost projects through your APIblaze endpoints",
   "keywords": [
     "apiblaze",