apiblaze 0.1.4 → 0.1.6

package/dist/index.js

@@ -89,12 +89,13 @@ var api_exports = {};
 __export(api_exports, {
   deleteDevTunnel: () => deleteDevTunnel,
   getLocalhostTargets: () => getLocalhostTargets,
+  getProjects: () => getProjects,
   getTeams: () => getTeams,
   putDevTunnel: () => putDevTunnel
 });
 async function apiFetch(path3, options = {}) {
   const token = getAccessToken();
-  const url = `${API_BASE}${path3}`;
+  const url = `${DASHBOARD_BASE}${path3}`;
   const res = await fetch(url, {
     ...options,
     headers: {
@@ -118,132 +119,121 @@ async function apiFetch(path3, options = {}) {
   return res.json();
 }
 async function getTeams() {
-  return apiFetch("/me/teams");
+  const res = await apiFetch("/api/cli/teams");
+  const raw = Array.isArray(res) ? res : res?.teams ?? res?.data ?? [];
+  return raw.map((t) => {
+    const teamId = t.teamId ?? t.team_id;
+    return { teamId: teamId ?? "", name: t.name ?? teamId ?? "" };
+  }).filter((t) => t.teamId);
 }
 async function getLocalhostTargets(teamId) {
-  return apiFetch(`/projects/localhost-targets?team_id=${encodeURIComponent(teamId)}`);
+  return apiFetch(`/api/cli/localhost-targets?team_id=${encodeURIComponent(teamId)}`);
+}
+async function getProjects(teamId) {
+  return apiFetch(`/api/cli/projects?team_id=${encodeURIComponent(teamId)}`);
 }
 async function putDevTunnel(payload) {
-  return apiFetch("/dev-tunnel", {
+  return apiFetch("/api/cli/dev-tunnel", {
     method: "PUT",
     body: JSON.stringify(payload)
   });
 }
 async function deleteDevTunnel() {
-  return apiFetch("/dev-tunnel", { method: "DELETE" });
+  return apiFetch("/api/cli/dev-tunnel", { method: "DELETE" });
 }
-var API_BASE;
+var DASHBOARD_BASE;
 var init_api = __esm({
   "src/lib/api.ts"() {
     "use strict";
     init_auth();
     init_types();
-    API_BASE = "https://cli.admin.apiblaze.com";
+    DASHBOARD_BASE = "https://dashboard.apiblaze.com";
   }
 });
 
 // src/index.ts
 var import_commander = require("commander");
-var import_chalk4 = __toESM(require("chalk"));
+var import_chalk5 = __toESM(require("chalk"));
 init_types();
 
 // src/commands/login.ts
 var import_chalk = __toESM(require("chalk"));
 var import_ora = __toESM(require("ora"));
-var crypto = __toESM(require("crypto"));
 init_auth();
 init_api();
-var AUTH_BASE = "https://auth.apiblaze.com";
-var CLIENT_ID = "emdE4-Pt9LGOAXL5MA1zEQ";
-var SCOPE = "openid email profile offline_access";
-function generateCodeVerifier() {
-  return crypto.randomBytes(32).toString("base64url");
-}
-function generateCodeChallenge(verifier) {
-  return crypto.createHash("sha256").update(verifier).digest("base64url");
-}
+var DASHBOARD_BASE2 = "https://dashboard.apiblaze.com";
 function openBrowser(url) {
   const { exec } = require("child_process");
   const cmd = process.platform === "darwin" ? `open "${url}"` : process.platform === "win32" ? `start "" "${url}"` : `xdg-open "${url}"`;
   exec(cmd);
 }
-async function requestDeviceCode(codeChallenge) {
-  const res = await fetch(`${AUTH_BASE}/device_authorization`, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      client_id: CLIENT_ID,
-      scope: SCOPE,
-      code_challenge: codeChallenge,
-      code_challenge_method: "S256"
-    })
-  });
-  if (!res.ok) {
-    const body = await res.text();
-    throw new Error(`Failed to start device flow: ${res.status} ${body}`);
-  }
-  return res.json();
+function decodeJWTPayload(token) {
+  const part = token.split(".")[1];
+  return JSON.parse(Buffer.from(part, "base64url").toString());
 }
-async function pollForToken(deviceCode, codeVerifier, intervalSecs) {
-  const DEVICE_GRANT = "urn:ietf:params:oauth:grant-type:device_code";
-  let pollInterval = intervalSecs * 1e3;
+async function runLogin() {
+  console.log(import_chalk.default.bold("\nLogging in to APIblaze...\n"));
+  const codeRes = await fetch(`${DASHBOARD_BASE2}/api/device/code`, { method: "POST" });
+  if (!codeRes.ok) {
+    throw new Error(`Failed to start login: ${codeRes.status}`);
+  }
+  const deviceAuth = await codeRes.json();
+  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.cyan("\u2192")} Your code: ${import_chalk.default.bold(deviceAuth.user_code)}
+`);
+  openBrowser(deviceAuth.verification_uri_complete ?? deviceAuth.verification_uri);
+  const spinner = (0, import_ora.default)("Waiting for authorization in browser...").start();
+  let accessToken;
+  let pollInterval = (deviceAuth.interval ?? 5) * 1e3;
   while (true) {
     await new Promise((r) => setTimeout(r, pollInterval));
-    const res = await fetch(`${AUTH_BASE}/token`, {
+    const tokenRes = await fetch(`${DASHBOARD_BASE2}/api/device/token`, {
       method: "POST",
-      headers: { "Content-Type": "application/x-www-form-urlencoded" },
-      body: new URLSearchParams({
-        grant_type: DEVICE_GRANT,
-        device_code: deviceCode,
-        client_id: CLIENT_ID,
-        code_verifier: codeVerifier
-      })
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ device_code: deviceAuth.device_code })
     });
-    const body = await res.json();
-    if (res.ok) {
-      return body;
+    const body = await tokenRes.json();
+    if (body.access_token) {
+      accessToken = body.access_token;
+      break;
     }
     if (body.error === "authorization_pending") {
       continue;
     } else if (body.error === "slow_down") {
       pollInterval += 5e3;
     } else if (body.error === "expired_token") {
+      spinner.fail("Login failed.");
       throw new Error("Device code expired. Run `apiblaze login` again.");
     } else if (body.error === "access_denied") {
+      spinner.fail("Login failed.");
       throw new Error("Login was denied or cancelled.");
     } else {
+      spinner.fail("Login failed.");
       throw new Error(`Unexpected error during login: ${body.error ?? "unknown"}`);
     }
   }
-}
-async function runLogin() {
-  console.log(import_chalk.default.bold("\nLogging in to APIblaze...\n"));
-  const codeVerifier = generateCodeVerifier();
-  const codeChallenge = generateCodeChallenge(codeVerifier);
-  const deviceAuth = await requestDeviceCode(codeChallenge);
-  const verifyUrl = 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(verifyUrl)}
-`);
-  console.log(`${import_chalk.default.cyan("\u2192")} Your code: ${import_chalk.default.bold(deviceAuth.user_code)}
-`);
-  openBrowser(verifyUrl);
-  const spinner = (0, import_ora.default)("Waiting for authorization in browser...").start();
-  let token;
-  try {
-    token = await pollForToken(deviceAuth.device_code, codeVerifier, deviceAuth.interval);
-  } catch (err) {
-    spinner.fail("Login failed.");
-    throw err;
-  }
+  const jwtPayload = decodeJWTPayload(accessToken);
+  const expiresAt = jwtPayload.exp * 1e3;
+  const apiblazeUserId = jwtPayload.sub;
+  const githubHandle = jwtPayload.handle;
+  const email = jwtPayload.email;
+  const defaultTeamId = jwtPayload.defaultTeamId;
   saveCredentials({
-    accessToken: token.access_token,
-    refreshToken: token.refresh_token,
-    expiresAt: Date.now() + token.expires_in * 1e3,
-    tokenType: token.token_type
+    accessToken,
+    expiresAt,
+    tokenType: "Bearer",
+    apiblazeUserId,
+    githubHandle,
+    email,
+    teamId: defaultTeamId ?? void 0
   });
   spinner.succeed(import_chalk.default.green("Authorized!"));
-  let teamId;
+  if (githubHandle) {
+    console.log(`${import_chalk.default.cyan("\u2192")} Logged in as ${import_chalk.default.bold("@" + githubHandle)}${apiblazeUserId ? import_chalk.default.dim(` (${apiblazeUserId})`) : ""}`);
+  }
+  let teamId = defaultTeamId ?? void 0;
   let teamName;
   try {
     const teams = await getTeams();
@@ -253,7 +243,7 @@ async function runLogin() {
       teamId = teams[0].teamId;
       teamName = teams[0].name;
       console.log(`
-${import_chalk.default.cyan("\u2192")} Using team: ${import_chalk.default.bold(teamName)}`);
+${import_chalk.default.cyan("\u2192")} Team: ${import_chalk.default.bold(teamName)}`);
     } else {
       const { default: inquirer2 } = await import("inquirer");
       const { chosen } = await inquirer2.prompt([{
@@ -267,16 +257,16 @@ ${import_chalk.default.cyan("\u2192")} Using team: ${import_chalk.default.bold(t
     }
   } catch {
   }
-  if (teamId) {
-    saveCredentials({
-      accessToken: token.access_token,
-      refreshToken: token.refresh_token,
-      expiresAt: Date.now() + token.expires_in * 1e3,
-      tokenType: token.token_type,
-      teamId,
-      teamName
-    });
-  }
+  saveCredentials({
+    accessToken,
+    expiresAt,
+    tokenType: "Bearer",
+    apiblazeUserId,
+    githubHandle,
+    email,
+    teamId,
+    teamName
+  });
   console.log(import_chalk.default.green("\n\u2714 Logged in successfully!"));
 }
 
@@ -605,6 +595,68 @@ Tunneling ${selectedTargets.length} project(s) to localhost:${options.port}
   }
 }
 
+// src/commands/projects.ts
+var import_chalk4 = __toESM(require("chalk"));
+var import_ora4 = __toESM(require("ora"));
+init_auth();
+init_api();
+async function runProjects() {
+  const creds = loadCredentials();
+  if (!creds) {
+    console.error(import_chalk4.default.red("Not logged in. Run `apiblaze login` first."));
+    process.exit(1);
+  }
+  if (creds.githubHandle) {
+    console.log(
+      `${import_chalk4.default.cyan("\u2192")} Logged in as ${import_chalk4.default.bold("@" + creds.githubHandle)}` + (creds.apiblazeUserId ? import_chalk4.default.dim(` (${creds.apiblazeUserId})`) : "")
+    );
+  }
+  let teamId = creds.teamId;
+  let teamName = creds.teamName;
+  if (!teamId) {
+    const teams = await getTeams().catch(() => []);
+    if (teams.length === 1) {
+      teamId = teams[0].teamId;
+      teamName = teams[0].name;
+    } else if (teams.length > 1) {
+      const { default: inquirer2 } = await import("inquirer");
+      const { chosen } = await inquirer2.prompt([{
+        type: "list",
+        name: "chosen",
+        message: "Which team do you want to use?",
+        choices: teams.map((t) => ({ name: t.name, value: t.teamId }))
+      }]);
+      teamId = chosen;
+      teamName = teams.find((t) => t.teamId === chosen)?.name;
+    }
+  }
+  if (!teamId) {
+    console.error(import_chalk4.default.red("No team found. Run `apiblaze login` to set up your team."));
+    process.exit(1);
+  }
+  console.log(`${import_chalk4.default.cyan("\u2192")} Team: ${import_chalk4.default.bold(teamName ?? teamId)} ${import_chalk4.default.dim(teamId)}
+`);
+  const spinner = (0, import_ora4.default)("Fetching projects...").start();
+  let projects;
+  try {
+    projects = await getProjects(teamId);
+    spinner.stop();
+  } catch (err) {
+    spinner.fail("Failed to fetch projects.");
+    throw err;
+  }
+  if (projects.length === 0) {
+    console.log(import_chalk4.default.yellow("No projects found for this team."));
+    return;
+  }
+  for (const p of projects) {
+    console.log(`${import_chalk4.default.bold(p.projectName)} ${import_chalk4.default.dim(p.projectId)}`);
+    console.log(`  ${import_chalk4.default.dim("version:")} ${p.apiVersion}   ${import_chalk4.default.dim("team:")} ${p.teamId}`);
+  }
+  console.log(import_chalk4.default.dim(`
+${projects.length} project(s).`));
+}
+
 // src/index.ts
 var program = new import_commander.Command();
 program.name("apiblaze").description("APIblaze dev tunnel CLI").version("0.1.0");
@@ -616,6 +668,14 @@ program.command("login").description("Authenticate with APIblaze").action(async
     process.exit(1);
   }
 });
+program.command("projects").description("List the projects in your team").action(async () => {
+  try {
+    await runProjects();
+  } catch (err) {
+    printError(err);
+    process.exit(1);
+  }
+});
 program.command("dev").description("Start a dev tunnel for your localhost projects").option("-p, --port <number>", "Local port to tunnel", "3000").action(async (opts) => {
   try {
     await runDev({ port: parseInt(opts.port, 10) });
@@ -626,13 +686,13 @@ program.command("dev").description("Start a dev tunnel for your localhost projec
 });
 function printError(err) {
   if (err instanceof ApiError) {
-    console.error(import_chalk4.default.red(`
+    console.error(import_chalk5.default.red(`
 API error (${err.status}): ${err.message}`));
   } else if (err instanceof Error) {
-    console.error(import_chalk4.default.red(`
+    console.error(import_chalk5.default.red(`
 Error: ${err.message}`));
   } else {
-    console.error(import_chalk4.default.red("\nUnknown error"));
+    console.error(import_chalk5.default.red("\nUnknown error"));
   }
 }
 program.parse(process.argv);

package/package.json

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