apiblaze 0.1.9 → 0.1.12

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", {
@@ -149,8 +150,11 @@ async function putDevTunnel(payload) {
     body: JSON.stringify(payload)
   });
 }
-async function deleteDevTunnel() {
-  return apiFetch("/api/cli/dev-tunnel", { method: "DELETE" });
+async function deleteDevTunnel(restore) {
+  return apiFetch("/api/cli/dev-tunnel", {
+    method: "DELETE",
+    body: JSON.stringify({ restore })
+  });
 }
 var DASHBOARD_BASE;
 var init_api = __esm({
@@ -404,9 +408,7 @@ function killCloudflared(proc) {
 }
 
 // src/lib/traffic.ts
-var import_ws = __toESM(require("ws"));
 var import_chalk2 = __toESM(require("chalk"));
-init_auth();
 var METHOD_COLORS = {
   GET: import_chalk2.default.cyan,
   POST: import_chalk2.default.green,
@@ -438,35 +440,51 @@ function formatLogLine(entry) {
   const ts = now.toTimeString().slice(0, 8);
   return `${import_chalk2.default.gray(`[${ts}]`)} ${colorMethod(entry.method)} ${import_chalk2.default.white(entry.path)} ${import_chalk2.default.gray("\u2192")} ${colorStatus(entry.status)} ${import_chalk2.default.gray(`(${colorLatency(entry.latency)})`)}`;
 }
-function connectTrafficStream(wsUrl, onEntry) {
-  const token = getAccessToken();
-  let ws;
-  let reconnectCount = 0;
-  const MAX_RECONNECTS = 3;
-  function connect() {
-    ws = new import_ws.default(wsUrl, { headers: { Authorization: `Bearer ${token}` } });
-    ws.on("message", (data) => {
-      try {
-        const entry = JSON.parse(data.toString());
-        onEntry(entry);
-      } catch {
-      }
+
+// src/lib/proxy-logger.ts
+var import_http = __toESM(require("http"));
+var import_net = __toESM(require("net"));
+function startPassthroughProxy(targetPort, onEntry) {
+  return new Promise((resolve, reject) => {
+    const server = import_http.default.createServer((req, res) => {
+      const start = Date.now();
+      const method = req.method ?? "GET";
+      const path3 = req.url ?? "/";
+      const proxyReq = import_http.default.request(
+        { host: "127.0.0.1", port: targetPort, method, path: path3, headers: req.headers },
+        (proxyRes) => {
+          onEntry({ method, path: path3, status: proxyRes.statusCode ?? 0, latency: Date.now() - start });
+          res.writeHead(proxyRes.statusCode ?? 502, proxyRes.headers);
+          proxyRes.pipe(res);
+        }
+      );
+      proxyReq.on("error", () => {
+        onEntry({ method, path: path3, status: 502, latency: Date.now() - start });
+        if (!res.headersSent) res.writeHead(502);
+        res.end();
+      });
+      req.pipe(proxyReq);
     });
-    ws.on("close", () => {
-      if (reconnectCount < MAX_RECONNECTS) {
-        reconnectCount++;
-        setTimeout(() => connect(), 2e3);
-      } else {
-        console.warn(import_chalk2.default.yellow("\nTraffic stream disconnected. Stop and restart `apiblaze dev` to reconnect."));
-      }
+    server.on("upgrade", (req, clientSocket, head) => {
+      const upstream = import_net.default.connect(targetPort, "127.0.0.1", () => {
+        const headerLines = Object.entries(req.headers).map(([k, v]) => `${k}: ${Array.isArray(v) ? v.join(", ") : v}`).join("\r\n");
+        upstream.write(`${req.method} ${req.url} HTTP/1.1\r
+${headerLines}\r
+\r
+`);
+        if (head && head.length) upstream.write(head);
+        upstream.pipe(clientSocket);
+        clientSocket.pipe(upstream);
+      });
+      upstream.on("error", () => clientSocket.destroy());
+      clientSocket.on("error", () => upstream.destroy());
     });
-    ws.on("error", (err) => {
-      console.warn(import_chalk2.default.yellow(`
-Traffic stream error: ${err.message}`));
+    server.on("error", reject);
+    server.listen(0, "127.0.0.1", () => {
+      const { port } = server.address();
+      resolve({ port, close: () => server.close() });
     });
-    return ws;
-  }
-  return connect();
+  });
 }
 
 // src/commands/dev.ts
@@ -551,60 +569,58 @@ Tunneling ${selectedTargets.length} project(s) to localhost:${options.port}
 `)
   );
   await ensureCloudflared();
+  const logger = await startPassthroughProxy(options.port, (entry) => {
+    console.log(formatLogLine(entry));
+  });
   let cfProcess;
   let tunnelUrl;
   {
     const spinner = (0, import_ora3.default)("Starting Cloudflare tunnel...").start();
     try {
-      ({ process: cfProcess, tunnelUrl } = await spawnCloudflared(options.port));
+      ({ process: cfProcess, tunnelUrl } = await spawnCloudflared(logger.port));
       spinner.succeed(`Tunnel active: ${import_chalk3.default.bold.cyan(tunnelUrl)}`);
     } catch (err) {
       spinner.fail("Failed to start cloudflared tunnel.");
+      logger.close();
       throw err;
     }
   }
+  let restore = [];
   {
     const spinner = (0, import_ora3.default)("Registering tunnel with APIblaze...").start();
-    let wsUrl;
     try {
       const result = await putDevTunnel({
         tunnelUrl,
         targets: selectedTargets.map((t) => ({ projectId: t.projectId, tenantId: t.tenantId }))
       });
-      wsUrl = result.wsUrl;
+      restore = result.restore ?? [];
       spinner.succeed("Tunnel registered. Proxying traffic.");
     } catch (err) {
       spinner.fail("Failed to register tunnel.");
+      logger.close();
       killCloudflared(cfProcess);
       throw err;
     }
-    let ws;
-    console.log("\n" + import_chalk3.default.gray("\u2500".repeat(60)));
-    console.log(import_chalk3.default.bold("Live traffic") + import_chalk3.default.gray(" (Ctrl+C to stop)"));
-    console.log(import_chalk3.default.gray("\u2500".repeat(60)) + "\n");
-    ws = connectTrafficStream(wsUrl, (entry) => {
-      console.log(formatLogLine(entry));
-    });
-    let isCleaningUp = false;
-    async function cleanup() {
-      if (isCleaningUp) return;
-      isCleaningUp = true;
-      console.log(import_chalk3.default.gray("\n\nShutting down..."));
-      try {
-        ws.close();
-      } catch {
-      }
-      await deleteDevTunnel().catch(() => {
-      });
-      killCloudflared(cfProcess);
-      console.log(import_chalk3.default.green("Tunnel stopped."));
-      process.exit(0);
-    }
-    process.on("SIGINT", () => void cleanup());
-    process.on("SIGTERM", () => void cleanup());
-    await new Promise(() => {
+  }
+  console.log("\n" + import_chalk3.default.gray("\u2500".repeat(60)));
+  console.log(import_chalk3.default.bold("Live traffic") + import_chalk3.default.gray(" (Ctrl+C to stop)"));
+  console.log(import_chalk3.default.gray("\u2500".repeat(60)) + "\n");
+  let isCleaningUp = false;
+  async function cleanup() {
+    if (isCleaningUp) return;
+    isCleaningUp = true;
+    console.log(import_chalk3.default.gray("\n\nShutting down..."));
+    await deleteDevTunnel(restore).catch(() => {
     });
+    logger.close();
+    killCloudflared(cfProcess);
+    console.log(import_chalk3.default.green("Tunnel stopped."));
+    process.exit(0);
   }
+  process.on("SIGINT", () => void cleanup());
+  process.on("SIGTERM", () => void cleanup());
+  await new Promise(() => {
+  });
 }
 
 // src/commands/projects.ts
@@ -677,7 +693,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;
@@ -695,78 +711,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.");
   }
-  console.log(import_chalk5.default.bold("\nCreate an API proxy\n"));
-  const { default: inquirer2 } = await import("inquirer");
+  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;
+    }
+  }
+  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):")}`);
@@ -784,43 +866,51 @@ async function runCreate() {
 var import_chalk6 = __toESM(require("chalk"));
 init_auth();
 init_api();
-async function runTeam() {
+function fail2(message) {
+  console.error(import_chalk6.default.red(`Error: ${message}`));
+  process.exit(1);
+}
+async function runTeam(arg) {
   const creds = loadCredentials();
   if (!creds) {
-    console.error(import_chalk6.default.red("Not logged in. Run `apiblaze login` first."));
-    process.exit(1);
+    fail2("Not logged in. Run `apiblaze login` first.");
   }
   const teams = await getTeams().catch(() => []);
   if (teams.length === 0) {
-    console.log(import_chalk6.default.yellow("No teams found for your account."));
-    return;
-  }
-  let teamId;
-  let teamName;
-  if (teams.length === 1) {
-    teamId = teams[0].teamId;
-    teamName = teams[0].name;
-    console.log(`${import_chalk6.default.cyan("\u2192")} You only have one team: ${import_chalk6.default.bold(teamName)}`);
-  } else {
+    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 { chosen } = await inquirer2.prompt([{
+    const { picked } = await inquirer2.prompt([{
       type: "list",
-      name: "chosen",
+      name: "picked",
       message: "Switch to which team?",
       default: creds.teamId,
       choices: teams.map((t) => ({ name: t.name, value: t.teamId }))
     }]);
-    teamId = chosen;
-    teamName = teams.find((t) => t.teamId === chosen)?.name;
+    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, teamName });
+  saveCredentials({ ...creds, teamId: chosen.teamId, teamName: chosen.name });
   console.log(import_chalk6.default.green(`
-\u2714 Active team: ${import_chalk6.default.bold(teamName ?? teamId)}`));
+\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");
+program.name("apiblaze").description("APIblaze dev tunnel CLI").version("0.1.11");
 program.command("login").description("Authenticate with APIblaze").action(async () => {
   try {
     await runLogin();
@@ -829,17 +919,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();
+    await runCreate(opts);
   } catch (err) {
     printError(err);
     process.exit(1);
   }
 });
-program.command("team").description("Switch the active team").action(async () => {
+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 runTeam();
+    await runTeam(team);
   } catch (err) {
     printError(err);
     process.exit(1);
@@ -853,9 +943,14 @@ program.command("projects").description("List the projects in your team").action
     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) => {
+program.command("dev").description("Start a dev tunnel for your localhost projects").argument("[port]", "Local port to tunnel (positional; overrides --port)").option("-p, --port <number>", "Local port to tunnel", "3000").action(async (port, opts) => {
   try {
-    await runDev({ port: parseInt(opts.port, 10) });
+    const resolved = parseInt(port ?? opts.port, 10);
+    if (Number.isNaN(resolved)) {
+      console.error(import_chalk7.default.red(`Invalid port: ${port ?? opts.port}`));
+      process.exit(1);
+    }
+    await runDev({ port: resolved });
   } catch (err) {
     printError(err);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.1.9",
+  "version": "0.1.12",
   "description": "Dev tunnel CLI for APIblaze — route localhost projects through Cloudflare tunnels",
   "keywords": [
     "apiblaze",
@@ -32,13 +32,11 @@
     "chalk": "^4.1.2",
     "commander": "^11.1.0",
     "inquirer": "^8.2.6",
-    "ora": "^5.4.1",
-    "ws": "^8.17.0"
+    "ora": "^5.4.1"
   },
   "devDependencies": {
     "@types/inquirer": "^8.2.10",
     "@types/node": "^20.0.0",
-    "@types/ws": "^8.5.10",
     "tsup": "^8.0.0",
     "typescript": "^5.4.0"
   }