apiblaze 0.1.8 → 0.1.10

package/dist/index.js

@@ -134,8 +134,9 @@ async function getLocalhostTargets(teamId) {
 async function getProjects(teamId) {
   return apiFetch(`/api/cli/projects?team_id=${encodeURIComponent(teamId)}`);
 }
-async function checkProxyName(name) {
-  return apiFetch(`/api/cli/check-name?name=${encodeURIComponent(name)}`);
+async function checkProxyName(name, teamId) {
+  const q = teamId ? `&team_id=${encodeURIComponent(teamId)}` : "";
+  return apiFetch(`/api/cli/check-name?name=${encodeURIComponent(name)}${q}`);
 }
 async function createProxy(payload) {
   return apiFetch("/api/cli/create-proxy", {
@@ -164,7 +165,7 @@ var init_api = __esm({
 
 // src/index.ts
 var import_commander = require("commander");
-var import_chalk6 = __toESM(require("chalk"));
+var import_chalk7 = __toESM(require("chalk"));
 init_types();
 
 // src/commands/login.ts
@@ -189,12 +190,13 @@ async function runLogin() {
     throw new Error(`Failed to start login: ${codeRes.status}`);
   }
   const deviceAuth = await codeRes.json();
+  const loginUrl = deviceAuth.verification_uri_complete ?? deviceAuth.verification_uri;
   console.log(`${import_chalk.default.cyan("\u2192")} Open this URL in your browser to confirm login:`);
-  console.log(`  ${import_chalk.default.bold.underline(deviceAuth.verification_uri)}
+  console.log(`  ${import_chalk.default.bold.underline(loginUrl)}
 `);
   console.log(`${import_chalk.default.cyan("\u2192")} Your code: ${import_chalk.default.bold(deviceAuth.user_code)}
 `);
-  openBrowser(deviceAuth.verification_uri_complete ?? deviceAuth.verification_uri);
+  openBrowser(loginUrl);
   const spinner = (0, import_ora.default)("Waiting for authorization in browser...").start();
   let accessToken;
   let pollInterval = (deviceAuth.interval ?? 5) * 1e3;
@@ -676,7 +678,7 @@ function normalizeName(raw) {
 }
 function isHttpUrl(s) {
   try {
-    const u = new URL(s.trim());
+    const u = new URL((s || "").trim());
     return u.protocol === "http:" || u.protocol === "https:";
   } catch {
     return false;
@@ -694,78 +696,144 @@ function stripTenantFromPortal(devPortal) {
     return devPortal;
   }
 }
-async function runCreate() {
+function fail(message) {
+  console.error(import_chalk5.default.red(`Error: ${message}`));
+  process.exit(1);
+}
+var VALID_AUTH = ["api_key", "none", "oauth"];
+async function runCreate(opts = {}) {
   const creds = loadCredentials();
   if (!creds) {
-    console.error(import_chalk5.default.red("Not logged in. Run `apiblaze login` first."));
-    process.exit(1);
+    fail("Not logged in. Run `apiblaze login` first.");
+  }
+  const interactive = !!process.stdin.isTTY && !opts.json;
+  const auth = (opts.auth ?? "api_key").toLowerCase();
+  if (!VALID_AUTH.includes(auth)) {
+    fail(`Invalid --auth "${auth}". Use one of: ${VALID_AUTH.join(", ")}.`);
+  }
+  let teamId = creds.teamId;
+  if (opts.team) {
+    if (opts.team.startsWith("team_")) {
+      teamId = opts.team;
+    } else {
+      const teams = await getTeams().catch(() => []);
+      const match = teams.find(
+        (t) => t.teamId === opts.team || t.name.toLowerCase() === opts.team.toLowerCase()
+      );
+      if (!match) {
+        fail(`Team "${opts.team}" not found. Run \`apiblaze team\` to see your teams.`);
+      }
+      teamId = match.teamId;
+    }
   }
-  console.log(import_chalk5.default.bold("\nCreate an API proxy\n"));
-  const { default: inquirer2 } = await import("inquirer");
+  if (!opts.json) console.log(import_chalk5.default.bold("\nCreate an API proxy\n"));
   let name = "";
-  for (; ; ) {
-    const { rawName } = await inquirer2.prompt([{
-      type: "input",
-      name: "rawName",
-      message: "Proxy name (your API will live at <name>.apiblaze.com):",
-      transformer: (v) => normalizeName(v)
-    }]);
-    name = normalizeName(rawName);
-    if (name.length < 3) {
-      console.log(import_chalk5.default.yellow("  Name must be at least 3 characters (letters and digits only).\n"));
-      continue;
+  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);
+    if (check && (!check.canUseProjectName || !check.canUseApiVersion)) {
+      fail(`Proxy name "${name}" is not available${check.message ? ` \u2014 ${check.message}` : ""}.`);
     }
-    const spinner2 = (0, import_ora5.default)("Checking availability...").start();
-    try {
-      const check = await checkProxyName(name);
-      spinner2.stop();
-      if (!check.canUseProjectName || !check.canUseApiVersion) {
-        const why = check.message ? ` \u2014 ${check.message}` : "";
-        console.log(import_chalk5.default.yellow(`  "${name}" is not available${why}. Try another.
-`));
+  } else if (interactive) {
+    const { default: inquirer2 } = await import("inquirer");
+    for (; ; ) {
+      const { rawName } = await inquirer2.prompt([{
+        type: "input",
+        name: "rawName",
+        message: "Proxy name (your API will live at <name>.apiblaze.com):",
+        transformer: (v) => normalizeName(v)
+      }]);
+      name = normalizeName(rawName);
+      if (name.length < 3) {
+        console.log(import_chalk5.default.yellow("  Name must be at least 3 characters (letters and digits only).\n"));
         continue;
       }
-    } catch {
-      spinner2.stop();
-      console.log(import_chalk5.default.dim("  (could not verify availability; continuing)"));
-    }
-    console.log(`${import_chalk5.default.cyan("\u2192")} Your API will live at ${import_chalk5.default.bold(`https://${name}.apiblaze.com`)}
+      const spinner2 = (0, import_ora5.default)("Checking availability...").start();
+      try {
+        const check = await checkProxyName(name, teamId);
+        spinner2.stop();
+        if (!check.canUseProjectName || !check.canUseApiVersion) {
+          console.log(import_chalk5.default.yellow(`  "${name}" is not available${check.message ? ` \u2014 ${check.message}` : ""}. Try another.
+`));
+          continue;
+        }
+      } catch {
+        spinner2.stop();
+        console.log(import_chalk5.default.dim("  (could not verify availability; continuing)"));
+      }
+      console.log(`${import_chalk5.default.cyan("\u2192")} Your API will live at ${import_chalk5.default.bold(`https://${name}.apiblaze.com`)}
 `);
-    break;
+      break;
+    }
+  } else {
+    fail("--name is required in non-interactive mode.");
   }
   let targetUrl = "";
-  for (; ; ) {
-    const { url } = await inquirer2.prompt([{
-      type: "input",
-      name: "url",
-      message: "Target URL to forward requests to (e.g. https://httpbin.org):"
+  if (opts.target !== void 0) {
+    if (!isHttpUrl(opts.target)) fail("--target must be a valid http(s) URL.");
+    targetUrl = opts.target.trim();
+  } else if (interactive) {
+    const { default: inquirer2 } = await import("inquirer");
+    for (; ; ) {
+      const { url } = await inquirer2.prompt([{
+        type: "input",
+        name: "url",
+        message: "Target URL to forward requests to (e.g. https://httpbin.org):"
+      }]);
+      if (!isHttpUrl(url)) {
+        console.log(import_chalk5.default.yellow("  Enter a valid http(s) URL.\n"));
+        continue;
+      }
+      targetUrl = url.trim();
+      break;
+    }
+  } else {
+    fail("--target is required in non-interactive mode.");
+  }
+  if (interactive && !opts.yes) {
+    const { default: inquirer2 } = await import("inquirer");
+    console.log(`${import_chalk5.default.cyan("\u2192")} Auth: ${import_chalk5.default.bold(auth)}${auth === "api_key" ? " \u2014 consumers send an X-API-Key header" : ""}`);
+    const { ok } = await inquirer2.prompt([{
+      type: "confirm",
+      name: "ok",
+      message: `Create proxy "${name}" \u2192 ${targetUrl}?`,
+      default: true
     }]);
-    if (!isHttpUrl(url)) {
-      console.log(import_chalk5.default.yellow("  Enter a valid http(s) URL.\n"));
-      continue;
+    if (!ok) {
+      console.log(import_chalk5.default.yellow("Cancelled."));
+      return;
     }
-    targetUrl = url.trim();
-    break;
   }
-  console.log(`${import_chalk5.default.cyan("\u2192")} Auth: ${import_chalk5.default.bold("API key")} \u2014 consumers send an X-API-Key header
-`);
-  const spinner = (0, import_ora5.default)("Creating proxy (tenant, keys, dev portal)...").start();
+  const spinner = !opts.json ? (0, import_ora5.default)("Creating proxy (tenant, keys, dev portal)...").start() : null;
   let result;
   try {
-    result = await createProxy({ name, target_url: targetUrl, auth_type: "api_key" });
-    spinner.succeed(import_chalk5.default.green("Proxy created!"));
+    result = await createProxy({ name, target_url: targetUrl, auth_type: auth, team_id: teamId });
+    spinner?.succeed(import_chalk5.default.green("Proxy created!"));
   } catch (err) {
-    spinner.fail("Failed to create proxy.");
+    spinner?.fail("Failed to create proxy.");
     throw err;
   }
   const version = result.api_version || "1.0.0";
   const keys = result.api_keys ?? {};
   const adminKey = keys.dev ?? Object.values(keys)[0];
-  console.log();
-  console.log(`  ${import_chalk5.default.dim("Proxy URL: ")} ${import_chalk5.default.bold(`https://${name}.apiblaze.com/${version}/dev`)}`);
-  if (result.devPortal) {
-    console.log(`  ${import_chalk5.default.dim("Dev portal:")} ${import_chalk5.default.bold(stripTenantFromPortal(result.devPortal))}`);
+  const proxyUrl = `https://${name}.apiblaze.com/${version}/dev`;
+  const devPortal = result.devPortal ? stripTenantFromPortal(result.devPortal) : void 0;
+  if (opts.json) {
+    process.stdout.write(JSON.stringify({
+      project_id: result.project_id,
+      api_version: version,
+      proxy_url: proxyUrl,
+      dev_portal: devPortal,
+      api_key: adminKey,
+      api_keys: keys,
+      team_id: teamId
+    }) + "\n");
+    return;
   }
+  console.log();
+  console.log(`  ${import_chalk5.default.dim("Proxy URL: ")} ${import_chalk5.default.bold(proxyUrl)}`);
+  if (devPortal) console.log(`  ${import_chalk5.default.dim("Dev portal:")} ${import_chalk5.default.bold(devPortal)}`);
   if (adminKey) {
     console.log();
     console.log(`  ${import_chalk5.default.dim("Consumer admin API key (dev):")}`);
@@ -779,6 +847,52 @@ async function runCreate() {
   console.log();
 }
 
+// src/commands/team.ts
+var import_chalk6 = __toESM(require("chalk"));
+init_auth();
+init_api();
+function fail2(message) {
+  console.error(import_chalk6.default.red(`Error: ${message}`));
+  process.exit(1);
+}
+async function runTeam(arg) {
+  const creds = loadCredentials();
+  if (!creds) {
+    fail2("Not logged in. Run `apiblaze login` first.");
+  }
+  const teams = await getTeams().catch(() => []);
+  if (teams.length === 0) {
+    fail2("No teams found for your account.");
+  }
+  let chosen;
+  if (arg) {
+    chosen = teams.find(
+      (t) => t.teamId === arg || t.name.toLowerCase() === arg.toLowerCase()
+    );
+    if (!chosen) {
+      fail2(`Team "${arg}" not found. Available: ${teams.map((t) => t.name).join(", ")}.`);
+    }
+  } else if (teams.length === 1) {
+    chosen = teams[0];
+    console.log(`${import_chalk6.default.cyan("\u2192")} You only have one team: ${import_chalk6.default.bold(chosen.name)}`);
+  } else if (process.stdin.isTTY) {
+    const { default: inquirer2 } = await import("inquirer");
+    const { picked } = await inquirer2.prompt([{
+      type: "list",
+      name: "picked",
+      message: "Switch to which team?",
+      default: creds.teamId,
+      choices: teams.map((t) => ({ name: t.name, value: t.teamId }))
+    }]);
+    chosen = teams.find((t) => t.teamId === picked);
+  } else {
+    fail2(`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_chalk6.default.green(`
+\u2714 Active team: ${import_chalk6.default.bold(chosen.name)}`));
+}
+
 // src/index.ts
 var program = new import_commander.Command();
 program.name("apiblaze").description("APIblaze dev tunnel CLI").version("0.1.0");
@@ -790,9 +904,17 @@ program.command("login").description("Authenticate with APIblaze").action(async
     process.exit(1);
   }
 });
-program.command("create").description("Create a new API proxy").action(async () => {
+program.command("create").description("Create a new API proxy").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("-y, --yes", "Skip the confirmation prompt").option("--json", "Output machine-readable JSON (non-interactive)").action(async (opts) => {
+  try {
+    await runCreate(opts);
+  } catch (err) {
+    printError(err);
+    process.exit(1);
+  }
+});
+program.command("team").description("Switch the active team").argument("[team]", "Team name or id to switch to (omit to choose interactively)").action(async (team) => {
   try {
-    await runCreate();
+    await runTeam(team);
   } catch (err) {
     printError(err);
     process.exit(1);
@@ -816,13 +938,13 @@ program.command("dev").description("Start a dev tunnel for your localhost projec
 });
 function printError(err) {
   if (err instanceof ApiError) {
-    console.error(import_chalk6.default.red(`
+    console.error(import_chalk7.default.red(`
 API error (${err.status}): ${err.message}`));
   } else if (err instanceof Error) {
-    console.error(import_chalk6.default.red(`
+    console.error(import_chalk7.default.red(`
 Error: ${err.message}`));
   } else {
-    console.error(import_chalk6.default.red("\nUnknown error"));
+    console.error(import_chalk7.default.red("\nUnknown error"));
   }
 }
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Dev tunnel CLI for APIblaze — route localhost projects through Cloudflare tunnels",
   "keywords": [
     "apiblaze",