apiblaze 0.1.20 → 0.1.22

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", {
@@ -202,7 +206,7 @@ var import_commander = require("commander");
 var import_chalk10 = __toESM(require("chalk"));
 
 // package.json
-var version = "0.1.20";
+var version = "0.1.22";
 
 // src/index.ts
 init_types();
@@ -715,6 +719,16 @@ function fail(message) {
   console.error(import_chalk5.default.red(`Error: ${message}`));
   process.exit(1);
 }
+function printCurlExample(url, apiKey) {
+  console.log();
+  console.log(`  ${import_chalk5.default.dim("Try it with curl:")}`);
+  if (apiKey) {
+    console.log(`    ${import_chalk5.default.cyan(`curl ${url} \\`)}`);
+    console.log(`    ${import_chalk5.default.cyan(`  -H "X-API-Key: ${apiKey}"`)}`);
+  } else {
+    console.log(`    ${import_chalk5.default.cyan(`curl ${url}`)}`);
+  }
+}
 var VALID_AUTH = ["api_key", "none", "oauth"];
 async function runCreate(opts = {}) {
   const creds = loadCredentials();
@@ -747,7 +761,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 +781,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 +838,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 ?? {};
@@ -860,6 +909,7 @@ async function runCreate(opts = {}) {
       console.log(import_chalk5.default.dim(`  (Separate keys were also created for: ${otherEnvs.join(", ")}.)`));
     }
   }
+  printCurlExample(proxyUrl, auth === "none" ? void 0 : adminKey);
   console.log();
 }
 async function runAnonymousCreate(opts) {
@@ -934,6 +984,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;
@@ -969,6 +1020,7 @@ async function runAnonymousCreate(opts) {
     console.log(`    ${import_chalk5.default.bold.green(apiKey)}`);
     console.log(import_chalk5.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 (result.claim_url) {
     console.log();
     console.log(`  ${import_chalk5.default.yellow("\u26A0 Anonymous proxy \u2014 claim it to your account within 30 days or it expires:")}`);
@@ -1159,7 +1211,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "Dev tunnel CLI for APIblaze — route localhost projects through your APIblaze endpoints",
   "keywords": [
     "apiblaze",
@@ -26,7 +26,8 @@
     "build": "tsup",
     "build:watch": "tsup --watch",
     "typecheck": "tsc --noEmit",
-    "prepublishOnly": "npm run build && npm run typecheck"
+    "prepublishOnly": "npm run build && npm run typecheck",
+    "release": "bash scripts/release.sh"
   },
   "dependencies": {
     "chalk": "^4.1.2",