apiblaze 0.7.2 → 0.8.0

package/dist/index.js

@@ -31,6 +31,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/types.ts
+var types_exports = {};
+__export(types_exports, {
+  ApiError: () => ApiError
+});
 var ApiError;
 var init_types = __esm({
   "src/types.ts"() {
@@ -104,13 +108,12 @@ __export(api_exports, {
   getProjects: () => getProjects,
   getTeams: () => getTeams,
   putDevTunnel: () => putDevTunnel,
-  sidecarApproveAnonymous: () => sidecarApproveAnonymous,
   sidecarInitAnonymous: () => sidecarInitAnonymous
 });
-async function createProxyAnonymous(body, anonSession) {
+async function createProxyAnonymous(body) {
   const res = await fetch(`${PUBLIC_API_BASE}/proxy`, {
     method: "POST",
-    headers: { "Content-Type": "application/json", ...anonSession ? { "X-Abz-Anon-Session": anonSession } : {} },
+    headers: { "Content-Type": "application/json" },
     body: JSON.stringify(body)
   });
   if (!res.ok) {
@@ -124,9 +127,9 @@ async function createProxyAnonymous(body, anonSession) {
   }
   return res.json();
 }
-async function apiFetch(path6, options = {}) {
+async function apiFetch(path5, options = {}) {
   const token = getAccessToken();
-  const url = `${DASHBOARD_BASE}${path6}`;
+  const url = `${DASHBOARD_BASE}${path5}`;
   const res = await fetch(url, {
     ...options,
     headers: {
@@ -152,12 +155,12 @@ async function apiFetch(path6, options = {}) {
   }
   return res.json();
 }
-async function agentCall(path6, method, body) {
+async function agentCall(path5, method, body) {
   const token = getAccessToken();
   const res = await fetch(`${DASHBOARD_BASE}/api/cli/agents`, {
     method: "POST",
     headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
-    body: JSON.stringify({ path: path6, method, body })
+    body: JSON.stringify({ path: path5, method, body })
   });
   let data = null;
   try {
@@ -203,26 +206,16 @@ async function claimTeam(code) {
     body: JSON.stringify({ code })
   });
 }
-async function sidecarInitAnonymous(anonSession) {
+async function sidecarInitAnonymous() {
   const res = await fetch(`${PUBLIC_API_BASE}/sidecar/init`, {
     method: "POST",
-    headers: { "content-type": "application/json", ...anonSession ? { "X-Abz-Anon-Session": anonSession } : {} },
+    headers: { "content-type": "application/json" },
     body: "{}"
   });
   const data = await res.json().catch(() => ({}));
   if (!res.ok) throw new ApiError(res.status, data?.error ?? "init_failed", data);
   return data;
 }
-async function sidecarApproveAnonymous(invokeKey, origin) {
-  const res = await fetch(`${PUBLIC_API_BASE}/sidecar/approve`, {
-    method: "POST",
-    headers: { "content-type": "application/json", "x-abz-sidecar-key": invokeKey },
-    body: JSON.stringify({ origin })
-  });
-  const data = await res.json().catch(() => ({}));
-  if (!res.ok) throw new ApiError(res.status, data?.detail ?? data?.error ?? "approve_failed", data);
-  return data;
-}
 async function putDevTunnel(payload) {
   return apiFetch("/api/cli/dev-tunnel", {
     method: "PUT",
@@ -246,49 +239,71 @@ var init_api = __esm({
   }
 });
 
-// src/lib/anon-session.ts
-var anon_session_exports = {};
-__export(anon_session_exports, {
-  clearAnonSession: () => clearAnonSession,
-  loadAnonSession: () => loadAnonSession,
-  saveAnonSession: () => saveAnonSession
+// src/lib/anon-cred.ts
+var anon_cred_exports = {};
+__export(anon_cred_exports, {
+  clearAnonCred: () => clearAnonCred,
+  cpFetch: () => cpFetch,
+  loadAnonCred: () => loadAnonCred,
+  saveAnonCred: () => saveAnonCred
 });
-function loadAnonSession() {
+function loadAnonCred() {
   try {
-    const s = JSON.parse(fs3.readFileSync(SESSION_PATH, "utf8"));
-    return s?.anon_session ? s : null;
+    const c = JSON.parse(fs2.readFileSync(FILE, "utf8"));
+    return c?.cp_key ? c : null;
   } catch {
     return null;
   }
 }
-function saveAnonSession(anon_session, claim_code) {
+function saveAnonCred(cp_key, team_id, claim_code) {
   try {
-    fs3.mkdirSync(DIR, { recursive: true });
-    const prev = loadAnonSession();
+    fs2.mkdirSync(DIR, { recursive: true });
+    const prev = loadAnonCred();
     const merged = {
-      anon_session,
+      cp_key,
+      team_id,
       claim_code: claim_code ?? prev?.claim_code,
       created_at: prev?.created_at ?? (/* @__PURE__ */ new Date()).toISOString()
     };
-    fs3.writeFileSync(SESSION_PATH, JSON.stringify(merged, null, 2));
+    fs2.writeFileSync(FILE, JSON.stringify(merged, null, 2));
   } catch {
   }
 }
-function clearAnonSession() {
+function clearAnonCred() {
   try {
-    fs3.unlinkSync(SESSION_PATH);
+    fs2.unlinkSync(FILE);
   } catch {
   }
 }
-var fs3, path2, os2, DIR, SESSION_PATH;
-var init_anon_session = __esm({
-  "src/lib/anon-session.ts"() {
+async function cpFetch(cpKey, apiPath, opts = {}) {
+  const res = await fetch(`${CP_EDGE}${apiPath}`, {
+    ...opts,
+    headers: { "Content-Type": "application/json", "X-API-Key": cpKey, ...opts.headers ?? {} }
+  });
+  const text = await res.text();
+  let parsed;
+  try {
+    parsed = text ? JSON.parse(text) : void 0;
+  } catch {
+    parsed = text;
+  }
+  if (!res.ok) {
+    const msg = parsed && typeof parsed === "object" && (parsed.details ?? parsed.error) || res.statusText;
+    throw new ApiError(res.status, typeof msg === "string" ? msg : JSON.stringify(msg), parsed);
+  }
+  return parsed;
+}
+var fs2, path2, os2, DIR, FILE, CP_EDGE;
+var init_anon_cred = __esm({
+  "src/lib/anon-cred.ts"() {
     "use strict";
-    fs3 = __toESM(require("fs"));
+    fs2 = __toESM(require("fs"));
     path2 = __toESM(require("path"));
     os2 = __toESM(require("os"));
+    init_types();
     DIR = path2.join(os2.homedir(), ".apiblaze");
-    SESSION_PATH = path2.join(DIR, "anon.json");
+    FILE = path2.join(DIR, "anon.json");
+    CP_EDGE = process.env.APIBLAZE_API_BASE ? `${process.env.APIBLAZE_API_BASE}/1.0.0/prod` : "https://api.apiblaze.com/1.0.0/prod";
   }
 });
 
@@ -297,7 +312,7 @@ var import_commander = require("commander");
 var import_chalk30 = __toESM(require("chalk"));
 
 // package.json
-var version = "0.7.2";
+var version = "0.8.0";
 
 // src/index.ts
 init_types();
@@ -438,6 +453,37 @@ ${import_chalk2.default.cyan("\u2192")} Team: ${import_chalk2.default.bold(teamN
     teamName
   });
   console.log(import_chalk2.default.green("\n\u2714 Logged in successfully!"));
+  await offerClaimPendingAnon();
+}
+async function offerClaimPendingAnon() {
+  const { loadAnonCred: loadAnonCred2, clearAnonCred: clearAnonCred2 } = await Promise.resolve().then(() => (init_anon_cred(), anon_cred_exports));
+  const cred = loadAnonCred2();
+  if (!cred?.claim_code) return;
+  let doClaim = true;
+  if (process.stdin.isTTY) {
+    const { default: inquirer2 } = await import("inquirer");
+    const { yes } = await inquirer2.prompt([{
+      type: "confirm",
+      name: "yes",
+      message: "You created proxies anonymously before logging in. Claim them into this account?",
+      default: true
+    }]);
+    doClaim = yes;
+  }
+  if (!doClaim) {
+    console.log(import_chalk2.default.dim("  Left unclaimed \u2014 run `apiblaze claim` anytime to keep them (they GC after inactivity)."));
+    return;
+  }
+  try {
+    const { claimTeam: claimTeam2 } = await Promise.resolve().then(() => (init_api(), api_exports));
+    const t = await claimTeam2(cred.claim_code);
+    clearAnonCred2();
+    console.log(import_chalk2.default.green(`  \u2714 Claimed your anonymous proxies into your account (team ${import_chalk2.default.bold(t.team_id)}).`));
+  } catch (err) {
+    const { ApiError: ApiError2 } = await Promise.resolve().then(() => (init_types(), types_exports));
+    const why = err instanceof ApiError2 ? err.message : err instanceof Error ? err.message : "error";
+    console.log(import_chalk2.default.yellow(`  Couldn't auto-claim (${why}). Run \`apiblaze claim\` to retry.`));
+  }
 }
 
 // src/commands/dev.ts
@@ -541,11 +587,11 @@ function decodeJwt(token) {
     return null;
   }
 }
-function maskPath(path6) {
-  const q = path6.indexOf("?");
-  if (q < 0) return path6;
-  const base = path6.slice(0, q);
-  const query = path6.slice(q + 1);
+function maskPath(path5) {
+  const q = path5.indexOf("?");
+  if (q < 0) return path5;
+  const base = path5.slice(0, q);
+  const query = path5.slice(q + 1);
   const masked = query.split("&").map((pair) => {
     const eq = pair.indexOf("=");
     if (eq < 0) return pair;
@@ -1470,19 +1516,28 @@ async function runAnonymousCreate(opts) {
   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 { loadAnonSession: loadAnonSession2, saveAnonSession: saveAnonSession2, clearAnonSession: clearAnonSession2 } = await Promise.resolve().then(() => (init_anon_session(), anon_session_exports));
-  if (opts.newSession) clearAnonSession2();
-  const prior = loadAnonSession2();
-  const spinner = !opts.json ? (0, import_ora4.default)(prior ? "Creating proxy (adding to your anonymous session)..." : "Creating proxy...").start() : null;
+  const { loadAnonCred: loadAnonCred2, saveAnonCred: saveAnonCred2, clearAnonCred: clearAnonCred2, cpFetch: cpFetch2 } = await Promise.resolve().then(() => (init_anon_cred(), anon_cred_exports));
+  if (opts.newSession) clearAnonCred2();
+  const cred = loadAnonCred2();
+  const spinner = !opts.json ? (0, import_ora4.default)(cred ? "Creating proxy (in your anonymous workspace)..." : "Creating proxy...").start() : null;
   let result;
   try {
-    result = await createProxyAnonymous(body, prior?.anon_session);
+    if (cred) {
+      result = await cpFetch2(cred.cp_key, "/projects", { method: "POST", body: JSON.stringify(body) });
+      if (Array.isArray(result.endpoints)) {
+        result.endpoints = result.endpoints.map((e) => e.replace(/:\/\/[^/]+/, `://${result.project_id}.tryabz.run`));
+      }
+    } else {
+      result = await createProxyAnonymous(body);
+      if (result.cp_key && result.team_id) {
+        saveAnonCred2(result.cp_key, result.team_id, result.team_claim_code);
+      }
+    }
     spinner?.succeed(import_chalk6.default.green("Proxy created!"));
   } catch (err) {
     spinner?.fail("Failed to create proxy.");
     throw err;
   }
-  if (result.anon_session) saveAnonSession2(result.anon_session, result.team_claim_code);
   const version2 = result.api_version || "1.0.0";
   const keys = result.api_keys ?? {};
   const apiKey = result.apiKey ?? keys.prod ?? Object.values(keys)[0];
@@ -1509,12 +1564,13 @@ async function runAnonymousCreate(opts) {
     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, opts.auth || "api_key", apiKey, result.portal);
-  if (result.team_claim_code) {
+  const claimCode = result.team_claim_code || cred?.claim_code;
+  if (claimCode) {
     console.log();
     console.log(`  ${import_chalk6.default.yellow("\u26A0 Anonymous \u2014 claim within 30 days or it expires.")} All your anonymous proxies`);
-    console.log(`    on this machine share ONE team. To keep them all:`);
-    console.log(`      ${import_chalk6.default.cyan("apiblaze login")}  then  ${import_chalk6.default.cyan("apiblaze claim")}   ${import_chalk6.default.dim("(no code needed here)")}`);
-    console.log(import_chalk6.default.dim(`    From another machine: apiblaze claim ${result.team_claim_code}`));
+    console.log(`    on this machine share ONE workspace. To keep them all:`);
+    console.log(`      ${import_chalk6.default.cyan("apiblaze login")}   ${import_chalk6.default.dim("(prompts to claim them into your account)")}`);
+    console.log(import_chalk6.default.dim(`    From another machine: apiblaze claim ${claimCode}`));
   } else 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:")}`);
@@ -1526,7 +1582,7 @@ async function runAnonymousCreate(opts) {
 // src/commands/claim.ts
 var import_chalk7 = __toESM(require("chalk"));
 init_auth();
-init_anon_session();
+init_anon_cred();
 init_api();
 init_types();
 function fail2(message) {
@@ -1541,7 +1597,7 @@ async function runClaim(claimCodeArg, opts) {
   let claimCode = (claimCodeArg ?? "").trim();
   let fromLocalSession = false;
   if (!claimCode) {
-    const sess = loadAnonSession();
+    const sess = loadAnonCred();
     if (sess?.claim_code) {
       claimCode = sess.claim_code;
       fromLocalSession = true;
@@ -1561,7 +1617,7 @@ async function runClaim(claimCodeArg, opts) {
   }
   try {
     const t = await claimTeam(claimCode);
-    if (fromLocalSession) clearAnonSession();
+    if (fromLocalSession) clearAnonCred();
     if (opts.json) {
       console.log(JSON.stringify(t, null, 2));
       return;
@@ -3358,19 +3414,18 @@ function generateInspector(root, router) {
 }
 async function runAnonymousInit(root, router, opts) {
   const { sidecarInitAnonymous: sidecarInitAnonymous2 } = await Promise.resolve().then(() => (init_api(), api_exports));
-  const { loadAnonSession: loadAnonSession2, saveAnonSession: saveAnonSession2, clearAnonSession: clearAnonSession2 } = await Promise.resolve().then(() => (init_anon_session(), anon_session_exports));
-  if (opts.newSession) clearAnonSession2();
-  const prior = loadAnonSession2();
-  const spinner = (0, import_ora13.default)(prior ? "Adding to your anonymous session..." : "Setting up a sidecar (no login needed)...").start();
+  const { saveAnonCred: saveAnonCred2, clearAnonCred: clearAnonCred2 } = await Promise.resolve().then(() => (init_anon_cred(), anon_cred_exports));
+  if (opts.newSession) clearAnonCred2();
+  const spinner = (0, import_ora13.default)("Setting up a sidecar (no login needed)...").start();
   let out;
   try {
-    out = await sidecarInitAnonymous2(prior?.anon_session);
+    out = await sidecarInitAnonymous2();
     spinner.succeed("Sidecar ready (anonymous trial).");
   } catch (err) {
     spinner.fail("Setup failed.");
     throw err;
   }
-  if (out.anon_session) saveAnonSession2(out.anon_session, out.claim_code);
+  if (out.cp_key && out.team_id) saveAnonCred2(out.cp_key, out.team_id, out.claim_code);
   const envState = upsertEnvLocal(root, out.token);
   ensureGitignored(root);
   console.log(`  ${import_chalk28.default.green("\u2713")} .env.local ${envState} (APIBLAZE_API_KEY) \u2014 gitignored`);
@@ -3463,26 +3518,25 @@ async function runSidecar(opts) {
 // src/commands/origins.ts
 var import_chalk29 = __toESM(require("chalk"));
 var import_ora14 = __toESM(require("ora"));
-var fs8 = __toESM(require("fs"));
-var path5 = __toESM(require("path"));
 init_auth();
-init_api();
-function readEnvKey2() {
-  try {
-    const s = fs8.readFileSync(path5.join(process.cwd(), ".env.local"), "utf8");
-    const m = s.match(/^APIBLAZE_API_KEY=(.+)$/m) ?? s.match(/^APIBLAZE_TOKEN=(.+)$/m);
-    return m ? m[1].trim() : null;
-  } catch {
-    return null;
-  }
-}
+init_anon_cred();
 async function runOriginsList(opts) {
-  const { teamId, teamName } = await resolveTeam(opts.team);
-  const out = await admin({
-    method: "GET",
-    path: `/teams/${encodeURIComponent(teamId)}/sidecar/candidates`,
-    summary: `List sidecar origins for team ${teamName ?? teamId}`
-  });
+  let out;
+  if (!loadCredentials()) {
+    const cred = loadAnonCred();
+    if (!cred) {
+      console.log(import_chalk29.default.yellow("No anonymous workspace here. Run `apiblaze init` first."));
+      return;
+    }
+    out = await cpFetch(cred.cp_key, `/teams/${encodeURIComponent(cred.team_id)}/sidecar/candidates`, { method: "GET" });
+  } else {
+    const { teamId, teamName } = await resolveTeam(opts.team);
+    out = await admin({
+      method: "GET",
+      path: `/teams/${encodeURIComponent(teamId)}/sidecar/candidates`,
+      summary: `List sidecar origins for team ${teamName ?? teamId}`
+    });
+  }
   if (opts.json) {
     console.log(JSON.stringify(out));
     return;
@@ -3507,14 +3561,14 @@ Candidates \u2014 going direct, not yet approved (${candidates.length})`));
 }
 async function runOriginsApprove(origin, opts) {
   if (!loadCredentials()) {
-    const key = readEnvKey2();
-    if (!key) {
-      console.error(import_chalk29.default.red("Not logged in and no .env.local APIBLAZE_API_KEY found. Run `apiblaze init` first."));
+    const cred = loadAnonCred();
+    if (!cred) {
+      console.error(import_chalk29.default.red("Not logged in and no anonymous workspace. Run `apiblaze init` first."));
       process.exit(1);
     }
     const spinner2 = (0, import_ora14.default)(`Approving ${origin} (anonymous)...`).start();
     try {
-      const out = await sidecarApproveAnonymous(key, origin.replace(/^https?:\/\//, ""));
+      const out = await cpFetch(cred.cp_key, `/teams/${encodeURIComponent(cred.team_id)}/sidecar/approve`, { method: "POST", body: JSON.stringify({ origin }) });
       spinner2.succeed(`Approved ${origin} \u2192 proxy ${out.project_id}. Routing within ~5 min.`);
     } catch (err) {
       spinner2.fail("Approve failed.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "APIblaze CLI + sidecar — manage API proxies, run dev tunnels, and route a Next.js app's egress through APIblaze with one command",
   "keywords": [
     "apiblaze",