apiblaze 0.1.19 → 0.1.21

package/dist/index.js

@@ -36,9 +36,10 @@ var init_types = __esm({
   "src/types.ts"() {
     "use strict";
     ApiError = class extends Error {
-      constructor(status, message) {
+      constructor(status, message, body) {
         super(message);
         this.status = status;
+        this.body = body;
         this.name = "ApiError";
       }
     };
@@ -132,12 +133,14 @@ async function apiFetch(path2, options = {}) {
   });
   if (!res.ok) {
     let message = res.statusText;
+    let parsed;
     try {
-      const body = await res.json();
-      message = body.message ?? body.error ?? message;
+      parsed = await res.json();
+      const b = parsed;
+      message = b.message ?? b.error ?? message;
     } catch {
     }
-    throw new ApiError(res.status, message);
+    throw new ApiError(res.status, message, parsed);
   }
   if (res.status === 204) {
     return void 0;
@@ -158,9 +161,10 @@ async function getLocalhostTargets(teamId) {
 async function getProjects(teamId) {
   return apiFetch(`/api/cli/projects?team_id=${encodeURIComponent(teamId)}`);
 }
-async function checkProxyName(name, teamId) {
+async function checkProxyName(name, teamId, apiVersion) {
   const q = teamId ? `&team_id=${encodeURIComponent(teamId)}` : "";
-  return apiFetch(`/api/cli/check-name?name=${encodeURIComponent(name)}${q}`);
+  const v = apiVersion ? `&api_version=${encodeURIComponent(apiVersion)}` : "";
+  return apiFetch(`/api/cli/check-name?name=${encodeURIComponent(name)}${q}${v}`);
 }
 async function createProxy(payload) {
   return apiFetch("/api/cli/create-proxy", {
@@ -199,10 +203,10 @@ var init_api = __esm({
 
 // src/index.ts
 var import_commander = require("commander");
-var import_chalk9 = __toESM(require("chalk"));
+var import_chalk10 = __toESM(require("chalk"));
 
 // package.json
-var version = "0.1.19";
+var version = "0.1.21";
 
 // src/index.ts
 init_types();
@@ -747,7 +751,7 @@ async function runCreate(opts = {}) {
   if (opts.name !== void 0) {
     name = normalizeName(opts.name);
     if (name.length < 3) fail("Proxy name must be at least 3 characters (letters and digits only).");
-    const check = await checkProxyName(name, teamId).catch(() => null);
+    const check = await checkProxyName(name, teamId, opts.apiversion).catch(() => null);
     if (check && (!check.canUseProjectName || !check.canUseApiVersion)) {
       fail(`Proxy name "${name}" is not available${check.message ? ` \u2014 ${check.message}` : ""}.`);
     }
@@ -767,7 +771,7 @@ async function runCreate(opts = {}) {
       }
       const spinner2 = (0, import_ora4.default)("Checking availability...").start();
       try {
-        const check = await checkProxyName(name, teamId);
+        const check = await checkProxyName(name, teamId, opts.apiversion);
         spinner2.stop();
         if (!check.canUseProjectName || !check.canUseApiVersion) {
           console.log(import_chalk5.default.yellow(`  "${name}" is not available${check.message ? ` \u2014 ${check.message}` : ""}. Try another.
@@ -824,11 +828,46 @@ async function runCreate(opts = {}) {
   const spinner = !opts.json ? (0, import_ora4.default)("Creating proxy (tenant, keys, dev portal)...").start() : null;
   let result;
   try {
-    result = await createProxy({ name, target_url: targetUrl, auth_type: auth, team_id: teamId });
+    result = await createProxy({ name, target_url: targetUrl, auth_type: auth, team_id: teamId, ...opts.apiversion ? { api_version: opts.apiversion } : {} });
     spinner?.succeed(import_chalk5.default.green("Proxy created!"));
   } catch (err) {
+    const e = err;
+    const ownedByYou = e?.status === 409 && e?.body?.reason === "slug_owned_by_your_other_team" && !opts.team;
     spinner?.fail("Failed to create proxy.");
-    throw err;
+    if (ownedByYou) {
+      const ownerId = e.body.owning_team_id;
+      const ownerName = e.body.owning_team_name || ownerId;
+      if (!opts.json) console.log(import_chalk5.default.yellow(`
+  You already own "${e.body.product_slug}" under your team "${ownerName}".`));
+      let doSwitch = false;
+      if (interactive && !opts.yes) {
+        const { default: inquirer2 } = await import("inquirer");
+        const { ok } = await inquirer2.prompt([{
+          type: "confirm",
+          name: "ok",
+          message: `Switch to team "${ownerName}" and create "${name}" there?`,
+          default: true
+        }]);
+        doSwitch = ok;
+      }
+      if (!doSwitch) {
+        if (!opts.json) console.log(import_chalk5.default.dim(`  Run \`apiblaze team ${ownerId}\` to switch, then retry \u2014 or pick another --name.`));
+        throw err;
+      }
+      const creds2 = loadCredentials();
+      if (creds2) saveCredentials({ ...creds2, teamId: ownerId, teamName: ownerName });
+      teamId = ownerId;
+      const spinner2 = !opts.json ? (0, import_ora4.default)(`Creating proxy under "${ownerName}"...`).start() : null;
+      try {
+        result = await createProxy({ name, target_url: targetUrl, auth_type: auth, team_id: ownerId, ...opts.apiversion ? { api_version: opts.apiversion } : {} });
+        spinner2?.succeed(import_chalk5.default.green(`Proxy created \u2014 active team switched to "${ownerName}".`));
+      } catch (err2) {
+        spinner2?.fail("Failed to create proxy after switching team.");
+        throw err2;
+      }
+    } else {
+      throw err;
+    }
   }
   const version2 = result.api_version || "1.0.0";
   const keys = result.api_keys ?? {};
@@ -934,6 +973,7 @@ async function runAnonymousCreate(opts) {
   if (opts.tenant) body.tenant = normalizeName(opts.tenant);
   if (opts.product) body.product_slug = normalizeName(opts.product);
   if (opts.displayName) body.display_name = opts.displayName;
+  if (opts.apiversion) body.api_version = opts.apiversion;
   if (opts.auth && opts.auth !== "api_key") body.auth_type = opts.auth;
   const spinner = !opts.json ? (0, import_ora4.default)("Creating proxy...").start() : null;
   let result;
@@ -1064,12 +1104,50 @@ async function runLogout() {
   console.log(import_chalk7.default.green(`\u2714 Logged out${who ? ` (${who})` : ""}.`));
 }
 
-// src/commands/team.ts
+// src/commands/whoami.ts
 var import_chalk8 = __toESM(require("chalk"));
 init_auth();
+async function runWhoami(opts = {}) {
+  const creds = loadCredentials();
+  if (!creds) {
+    if (opts.json) {
+      console.log(JSON.stringify({ loggedIn: false }, null, 2));
+    } else {
+      console.log(import_chalk8.default.yellow("Not logged in. Run `apiblaze login` first."));
+    }
+    return;
+  }
+  const expired = Date.now() >= creds.expiresAt;
+  if (opts.json) {
+    console.log(JSON.stringify({
+      loggedIn: true,
+      expired,
+      apiblazeUserId: creds.apiblazeUserId ?? null,
+      githubHandle: creds.githubHandle ?? null,
+      email: creds.email ?? null,
+      teamId: creds.teamId ?? null,
+      teamName: creds.teamName ?? null
+    }, null, 2));
+    return;
+  }
+  const who = creds.githubHandle ?? creds.email ?? creds.apiblazeUserId ?? "unknown";
+  console.log(`${import_chalk8.default.cyan("Signed in as")} ${import_chalk8.default.bold(who)}`);
+  if (creds.email && creds.email !== who) console.log(`  Email:   ${creds.email}`);
+  if (creds.apiblazeUserId) console.log(`  User ID: ${creds.apiblazeUserId}`);
+  if (creds.teamName || creds.teamId) {
+    console.log(`  Team:    ${import_chalk8.default.bold(creds.teamName ?? creds.teamId)}${creds.teamName && creds.teamId ? import_chalk8.default.gray(` (${creds.teamId})`) : ""}`);
+  }
+  if (expired) {
+    console.log(import_chalk8.default.yellow("\n\u26A0 Session expired. Run `apiblaze login` to re-authenticate."));
+  }
+}
+
+// src/commands/team.ts
+var import_chalk9 = __toESM(require("chalk"));
+init_auth();
 init_api();
 function fail3(message) {
-  console.error(import_chalk8.default.red(`Error: ${message}`));
+  console.error(import_chalk9.default.red(`Error: ${message}`));
   process.exit(1);
 }
 async function runTeam(arg) {
@@ -1091,7 +1169,7 @@ async function runTeam(arg) {
     }
   } else if (teams.length === 1) {
     chosen = teams[0];
-    console.log(`${import_chalk8.default.cyan("\u2192")} You only have one team: ${import_chalk8.default.bold(chosen.name)}`);
+    console.log(`${import_chalk9.default.cyan("\u2192")} You only have one team: ${import_chalk9.default.bold(chosen.name)}`);
   } else if (process.stdin.isTTY) {
     const { default: inquirer2 } = await import("inquirer");
     const { picked } = await inquirer2.prompt([{
@@ -1106,8 +1184,8 @@ async function runTeam(arg) {
     fail3(`Specify a team: \`apiblaze team <name|id>\`. Available: ${teams.map((t) => t.name).join(", ")}.`);
   }
   saveCredentials({ ...creds, teamId: chosen.teamId, teamName: chosen.name });
-  console.log(import_chalk8.default.green(`
-\u2714 Active team: ${import_chalk8.default.bold(chosen.name)}`));
+  console.log(import_chalk9.default.green(`
+\u2714 Active team: ${import_chalk9.default.bold(chosen.name)}`));
 }
 
 // src/index.ts
@@ -1121,7 +1199,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("--tenant <slug>", "Tenant slug (anonymous create; generated if omitted)").option("--product <slug>", "Product slug (anonymous create; defaults to the proxy name)").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("--tenant <slug>", "Tenant slug (anonymous create; generated if omitted)").option("--product <slug>", "Product slug (anonymous create; defaults to the proxy name)").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) {
@@ -1137,6 +1215,14 @@ program.command("logout").description("Sign out \u2014 remove stored credentials
     process.exit(1);
   }
 });
+program.command("whoami").description("Show the signed-in identity and active team").option("--json", "Output machine-readable JSON").action(async (opts) => {
+  try {
+    await runWhoami(opts);
+  } catch (err) {
+    printError(err);
+    process.exit(1);
+  }
+});
 program.command("claim").description("Claim an anonymously-created proxy into one of your teams (requires login)").argument("[code]", "Claim code from `create` output / claim URL (prompted if omitted)").option("--team <id|name>", "Team to claim into (defaults to your active team)").option("--json", "Output machine-readable JSON (non-interactive)").action(async (code, opts) => {
   try {
     await runClaim(code, opts);
@@ -1165,7 +1251,7 @@ program.command("dev").description("Start a dev tunnel for your localhost projec
   try {
     const resolved = parseInt(port ?? opts.port, 10);
     if (Number.isNaN(resolved)) {
-      console.error(import_chalk9.default.red(`Invalid port: ${port ?? opts.port}`));
+      console.error(import_chalk10.default.red(`Invalid port: ${port ?? opts.port}`));
       process.exit(1);
     }
     await runDev({ port: resolved });
@@ -1184,16 +1270,12 @@ Examples:
   # Non-interactive (CI / scripts):
   $ npx apiblaze create --target https://api.example.com --name myapi --json
 
-  # Claim that anonymous proxy into your team (after signing in):
-  $ npx apiblaze login
-  $ npx apiblaze claim G7QN-62JB-VN3D-RQNR-F6EZ
-  $ npx apiblaze claim G7QN-62JB-VN3D-RQNR-F6EZ --team my-team
-
   # Sign in, then create under your team:
   $ npx apiblaze login
   $ npx apiblaze create --name myapi --target https://api.example.com --auth api_key
 
   # Manage:
+  $ npx apiblaze whoami
   $ npx apiblaze projects
   $ npx apiblaze team
   $ npx apiblaze dev 3000
@@ -1202,13 +1284,13 @@ Examples:
 );
 function printError(err) {
   if (err instanceof ApiError) {
-    console.error(import_chalk9.default.red(`
+    console.error(import_chalk10.default.red(`
 API error (${err.status}): ${err.message}`));
   } else if (err instanceof Error) {
-    console.error(import_chalk9.default.red(`
+    console.error(import_chalk10.default.red(`
 Error: ${err.message}`));
   } else {
-    console.error(import_chalk9.default.red("\nUnknown error"));
+    console.error(import_chalk10.default.red("\nUnknown error"));
   }
 }
 program.parse(process.argv);

package/package.json

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