apiblaze 0.21.39 → 0.21.40

package/dist/index.js

@@ -34,7 +34,7 @@ var __toESM = (mod, isNodeMode, target2) => (target2 = mod != null ? __create(__
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.21.39";
+    version = "0.21.40";
   }
 });
 
@@ -137,21 +137,26 @@ function handleUpgradeRequired(err) {
   })();
   return handling;
 }
+function cliHeaders() {
+  if (!guardVersion) return {};
+  const h = { [CLI_VERSION_HEADER]: guardVersion, "user-agent": `apiblaze-cli/${guardVersion}` };
+  const command = getCommandLabel();
+  if (command) {
+    h[CLI_COMMAND_HEADER] = command;
+    h[CLI_RUN_HEADER] = getRunId();
+  }
+  return h;
+}
 function installFetchGuard(version2) {
   if (installed || typeof globalThis.fetch !== "function") return;
   installed = true;
+  guardVersion = version2;
   const base2 = globalThis.fetch.bind(globalThis);
   globalThis.fetch = (async (input, init) => {
     const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
     if (!isControlPlaneHost(url)) return base2(input, init);
     const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : void 0));
-    headers.set(CLI_VERSION_HEADER, version2);
-    const command = getCommandLabel();
-    if (command) {
-      headers.set(CLI_COMMAND_HEADER, command);
-      headers.set(CLI_RUN_HEADER, getRunId());
-    }
-    if (!headers.has("user-agent")) headers.set("user-agent", `apiblaze-cli/${version2}`);
+    for (const [k, v] of Object.entries(cliHeaders())) if (k !== "user-agent" || !headers.has(k)) headers.set(k, v);
     const res = await base2(input, { ...init, headers });
     if (res.status === 426) {
       let body = null;
@@ -237,7 +242,7 @@ function watchCliPolicy(version2) {
   t.unref?.();
   return () => clearInterval(t);
 }
-var import_fs, import_os, import_path, import_chalk, DASHBOARD_BASE, CACHE_MS, UPGRADE_EXIT_CODE, CONTROL_PLANE_HOSTS, CONTROL_PLANE_ENV, CliUpgradeRequired, shutdownHook, handling, installed;
+var import_fs, import_os, import_path, import_chalk, DASHBOARD_BASE, CACHE_MS, UPGRADE_EXIT_CODE, CONTROL_PLANE_HOSTS, CONTROL_PLANE_ENV, CliUpgradeRequired, shutdownHook, handling, guardVersion, installed;
 var init_version_guard = __esm({
   "src/lib/version-guard.ts"() {
     "use strict";
@@ -273,6 +278,7 @@ var init_version_guard = __esm({
     };
     shutdownHook = null;
     handling = null;
+    guardVersion = "";
     installed = false;
   }
 });
@@ -372,6 +378,7 @@ __export(api_exports, {
   bothDoorsBody: () => bothDoorsBody,
   checkProxyName: () => checkProxyName,
   claimTeam: () => claimTeam,
+  countRun: () => countRun,
   createProxy: () => createProxy,
   createProxyAnonymous: () => createProxyAnonymous,
   deleteDevTunnel: () => deleteDevTunnel,
@@ -385,6 +392,21 @@ __export(api_exports, {
   putDevTunnel: () => putDevTunnel,
   sidecarInitAnonymous: () => sidecarInitAnonymous
 });
+function countRun(opts = {}) {
+  if (/^(1|true|yes)$/i.test((process.env.DO_NOT_TRACK ?? "").trim())) return;
+  try {
+    const child = (0, import_child_process.spawn)(process.execPath, ["-e", COUNT_RUN_CHILD], {
+      detached: true,
+      stdio: "ignore",
+      windowsHide: true,
+      env: { ...process.env, ABZ_COUNT_URL: opts.url ?? `${PUBLIC_API_BASE}/cli/hello`, ABZ_COUNT_HEADERS: JSON.stringify(cliHeaders()) }
+    });
+    child.on("error", () => {
+    });
+    child.unref();
+  } catch {
+  }
+}
 async function createProxyAnonymous(body) {
   const res = await fetch(`${PUBLIC_API_BASE}/proxy`, {
     method: "POST",
@@ -543,15 +565,18 @@ function integrationKitCall(project, stack) {
     summary: `Integration kit for ${project} (${stack})`
   };
 }
-var import_yaml, DASHBOARD_BASE2, PUBLIC_API_BASE, GITHUB_LOGIN, LOCAL_SPEC_PATHS, INTEGRATION_STACKS;
+var import_child_process, import_yaml, DASHBOARD_BASE2, PUBLIC_API_BASE, COUNT_RUN_CHILD, GITHUB_LOGIN, LOCAL_SPEC_PATHS, INTEGRATION_STACKS;
 var init_api = __esm({
   "src/lib/api.ts"() {
     "use strict";
+    import_child_process = require("child_process");
     init_auth();
+    init_version_guard();
     import_yaml = require("yaml");
     init_types();
     DASHBOARD_BASE2 = process.env.APIBLAZE_DASHBOARD_BASE || "https://dashboard.apiblaze.com";
     PUBLIC_API_BASE = "https://api.apiblaze.com";
+    COUNT_RUN_CHILD = "fetch(process.env.ABZ_COUNT_URL,{method:'POST',headers:JSON.parse(process.env.ABZ_COUNT_HEADERS||'{}'),signal:AbortSignal.timeout(5000)}).then((r)=>r.body&&r.body.cancel(),()=>{})";
     GITHUB_LOGIN = { providers: [{ type: "github", managed: true }] };
     LOCAL_SPEC_PATHS = ["/openapi.json", "/openapi.yaml", "/docs/openapi.json"];
     INTEGRATION_STACKS = ["nextjs", "express", "fastapi", "other"];
@@ -2281,7 +2306,7 @@ function waitForClaudeConnection(name, timeoutMs = 12e3) {
   for (; ; ) {
     last = claudeServerStatus(name);
     if (last === "connected" || Date.now() >= deadline) return last;
-    (0, import_child_process.spawnSync)(process.execPath, ["-e", "setTimeout(()=>{},1200)"], { timeout: 3e3 });
+    (0, import_child_process2.spawnSync)(process.execPath, ["-e", "setTimeout(()=>{},1200)"], { timeout: 3e3 });
   }
 }
 function claudeOneShot(spec2, prompt) {
@@ -2632,18 +2657,18 @@ async function installAndDemo(cli, spec2, getQuestion, log4 = console.log) {
   log4(import_chalk12.default.red(`    ${import_chalk12.default.bold(off)}`));
   return true;
 }
-var fs6, os4, path7, import_child_process, import_chalk12, useShell, winQuote, run, detected, mcpLoginSupport, OURS, mask, tomlStr, shellQuote, marker;
+var fs6, os4, path7, import_child_process2, import_chalk12, useShell, winQuote, run, detected, mcpLoginSupport, OURS, mask, tomlStr, shellQuote, marker;
 var init_external_mcp = __esm({
   "src/lib/external-mcp.ts"() {
     "use strict";
     fs6 = __toESM(require("fs"));
     os4 = __toESM(require("os"));
     path7 = __toESM(require("path"));
-    import_child_process = require("child_process");
+    import_child_process2 = require("child_process");
     import_chalk12 = __toESM(require("chalk"));
     useShell = process.platform === "win32";
     winQuote = (a) => /^[A-Za-z0-9_\-.:/\\=]+$/.test(a) ? a : `"${a.replace(/"/g, '""')}"`;
-    run = (cmd, args, opts = {}) => (0, import_child_process.spawnSync)(cmd, useShell ? args.map(winQuote) : args, {
+    run = (cmd, args, opts = {}) => (0, import_child_process2.spawnSync)(cmd, useShell ? args.map(winQuote) : args, {
       encoding: "utf-8",
       stdio: opts.interactive ? ["inherit", "inherit", "inherit"] : opts.inherit ? ["ignore", "inherit", "inherit"] : ["ignore", "pipe", "pipe"],
       timeout: opts.inherit || opts.interactive ? void 0 : 15e3,
@@ -2952,7 +2977,7 @@ function decodeJwt2(token) {
 function openBrowser2(url) {
   const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
   try {
-    (0, import_child_process2.spawn)(cmd, [url], { stdio: "ignore", detached: true }).unref();
+    (0, import_child_process3.spawn)(cmd, [url], { stdio: "ignore", detached: true }).unref();
   } catch {
   }
 }
@@ -3028,7 +3053,7 @@ async function validConsumerToken(creds) {
   if (Date.now() < creds.expiresAt - 3e4) return creds;
   return refreshConsumer(creds);
 }
-var fs7, os5, path8, crypto, import_child_process2, AUTH_BASE, APIBLAZE_DIR2, CONSUMER_PATH, DEVICE_GRANT;
+var fs7, os5, path8, crypto, import_child_process3, AUTH_BASE, APIBLAZE_DIR2, CONSUMER_PATH, DEVICE_GRANT;
 var init_consumer_auth = __esm({
   "src/lib/consumer-auth.ts"() {
     "use strict";
@@ -3036,7 +3061,7 @@ var init_consumer_auth = __esm({
     os5 = __toESM(require("os"));
     path8 = __toESM(require("path"));
     crypto = __toESM(require("crypto"));
-    import_child_process2 = require("child_process");
+    import_child_process3 = require("child_process");
     AUTH_BASE = process.env.APIBLAZE_AUTH_BASE || "https://auth.apiblaze.com";
     APIBLAZE_DIR2 = path8.join(os5.homedir(), ".apiblaze");
     CONSUMER_PATH = path8.join(APIBLAZE_DIR2, "consumer.json");
@@ -4738,7 +4763,7 @@ async function removeExternalMcp(projectId, cliKind) {
   const label3 = kind === "claude" ? "Claude CLI" : "Codex CLI";
   let removed = false;
   if (kind === "claude") {
-    const r = (0, import_child_process3.spawnSync)("claude", ["mcp", "remove", projectId], { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"], timeout: 15e3 });
+    const r = (0, import_child_process4.spawnSync)("claude", ["mcp", "remove", projectId], { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"], timeout: 15e3 });
     removed = r.status === 0;
   } else {
     removed = removeCodexServer(projectId);
@@ -4842,14 +4867,14 @@ async function runApichat(opts) {
   if (mcpUrl2 && await maybeInstallExternalCli(p, opts)) return;
   await startChat(p, [], opts);
 }
-var fs9, path9, crypto2, import_child_process3, import_chalk15, import_ora2, import_yaml3, GENERATOR_HINT, revealAuth, apichatsPath;
+var fs9, path9, crypto2, import_child_process4, import_chalk15, import_ora2, import_yaml3, GENERATOR_HINT, revealAuth, apichatsPath;
 var init_apichat = __esm({
   "src/commands/apichat.ts"() {
     "use strict";
     fs9 = __toESM(require("fs"));
     path9 = __toESM(require("path"));
     crypto2 = __toESM(require("crypto"));
-    import_child_process3 = require("child_process");
+    import_child_process4 = require("child_process");
     import_chalk15 = __toESM(require("chalk"));
     import_ora2 = __toESM(require("ora"));
     import_yaml3 = require("yaml");
@@ -7659,6 +7684,7 @@ __export(demo_exports, {
   DEMO_RPS: () => DEMO_RPS,
   demoName: () => demoName,
   isDemoProcess: () => isDemoProcess,
+  portFree: () => portFree,
   routesOf: () => routesOf,
   runDemo: () => runDemo,
   runDemoLogs: () => runDemoLogs,
@@ -7670,13 +7696,27 @@ __export(demo_exports, {
 function demoName() {
   return `demo${pick2(ADJ)}${pick2(NOUN)}${import_crypto.default.randomBytes(2).toString("hex")}`;
 }
-function portFree(port) {
-  return new Promise((resolve4) => {
+async function portFree(port) {
+  const answers = (host) => new Promise((resolve4) => {
+    const sock = import_net2.default.connect({ port, host });
+    sock.setTimeout(1e3, () => {
+      sock.destroy();
+      resolve4(true);
+    });
+    sock.once("connect", () => {
+      sock.destroy();
+      resolve4(true);
+    });
+    sock.once("error", () => resolve4(false));
+  });
+  const bindable = (host) => new Promise((resolve4) => {
     const s = import_net2.default.createServer();
-    s.once("error", () => resolve4(false));
+    s.once("error", (e) => resolve4(host === "::1" && (e.code === "EADDRNOTAVAIL" || e.code === "EAFNOSUPPORT")));
     s.once("listening", () => s.close(() => resolve4(true)));
-    s.listen(port, "127.0.0.1");
+    s.listen(port, host);
   });
+  const [v4, v6] = await Promise.all([answers("127.0.0.1"), answers("::1")]);
+  return !v4 && !v6 && await bindable("127.0.0.1") && await bindable("::1");
 }
 async function freePort(from, avoid = []) {
   for (let p = from; p < from + 200; p++) if (!avoid.includes(p) && await portFree(p)) return p;
@@ -7737,15 +7777,16 @@ async function stopTunnels() {
 }
 function appCtl(dir, arg) {
   if (!import_fs6.default.existsSync(import_path5.default.join(dir, "start.js"))) return false;
-  const r = (0, import_child_process4.spawnSync)(process.execPath, [import_path5.default.join(dir, "start.js"), arg], { cwd: dir, stdio: "ignore", timeout: 15e3 });
+  const r = (0, import_child_process5.spawnSync)(process.execPath, [import_path5.default.join(dir, "start.js"), arg], { cwd: dir, stdio: "ignore", timeout: 15e3 });
   return r.status === 0;
 }
 function isDemoProcess(args) {
-  return /[\\/](apiblaze|mcpblaze)-demo[\\/]start\.js(\s|$)/.test(args) || /\sdemo --serve\s/.test(args);
+  const node = String.raw`^(?:\S*[\\/])?node(?:\.exe)?\s+`;
+  return new RegExp(node + String.raw`.*[\\/](?:apiblaze|mcpblaze)-demo[\\/]start\.js$`).test(args.trim()) || new RegExp(node + String.raw`\S.*\sdemo --serve\s`).test(args);
 }
 function demoProcesses() {
   if (process.platform === "win32") return [];
-  const r = (0, import_child_process4.spawnSync)("ps", ["-Ao", "pid=,args="], { encoding: "utf8" });
+  const r = (0, import_child_process5.spawnSync)("ps", ["-Ao", "pid=,args="], { encoding: "utf8" });
   if (r.status !== 0 || !r.stdout) return [];
   const out = [];
   for (const line of r.stdout.split("\n")) {
@@ -7918,7 +7959,7 @@ function openBrowser3(url) {
   const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
   const args = process.platform === "win32" ? ["/c", "start", "", url] : [url];
   try {
-    (0, import_child_process4.spawn)(cmd, args, { stdio: "ignore", detached: true }).on("error", () => {
+    (0, import_child_process5.spawn)(cmd, args, { stdio: "ignore", detached: true }).on("error", () => {
     }).unref();
   } catch {
   }
@@ -8204,7 +8245,7 @@ function printAddresses(dir) {
 }
 async function spawnTunnel(dir, state) {
   const log4 = import_fs6.default.openSync(import_path5.default.join(dir, STATE_DIR, "tunnel.log"), "a");
-  const child = (0, import_child_process4.spawn)(process.execPath, [process.argv[1], "demo", "--serve", dir], { cwd: dir, detached: true, stdio: ["ignore", log4, log4] });
+  const child = (0, import_child_process5.spawn)(process.execPath, [process.argv[1], "demo", "--serve", dir], { cwd: dir, detached: true, stdio: ["ignore", log4, log4] });
   child.unref();
   saveState(dir, { ...state, pid: child.pid, ready: false, error: void 0 });
   registerDemo(dir, child.pid ?? 0);
@@ -8306,14 +8347,14 @@ async function serveTunnel(dir) {
   await new Promise(() => {
   });
 }
-var import_fs6, import_path5, import_net2, import_child_process4, import_crypto, import_chalk24, import_ora9, DIR_NAME, STATE_DIR, LATEST, DEMO_RPS, DEMO_ADMIN_EMAIL, DEMO_GINO_ADMIN_EMAIL, RULE_SENTENCE, DemoError, ADJ, NOUN, pick2, registryFile, alive, interactive, logsCommand;
+var import_fs6, import_path5, import_net2, import_child_process5, import_crypto, import_chalk24, import_ora9, DIR_NAME, STATE_DIR, LATEST, DEMO_RPS, DEMO_ADMIN_EMAIL, DEMO_GINO_ADMIN_EMAIL, RULE_SENTENCE, DemoError, ADJ, NOUN, pick2, registryFile, alive, interactive, logsCommand;
 var init_demo = __esm({
   "src/commands/demo.ts"() {
     "use strict";
     import_fs6 = __toESM(require("fs"));
     import_path5 = __toESM(require("path"));
     import_net2 = __toESM(require("net"));
-    import_child_process4 = require("child_process");
+    import_child_process5 = require("child_process");
     import_crypto = __toESM(require("crypto"));
     import_chalk24 = __toESM(require("chalk"));
     import_ora9 = __toESM(require("ora"));
@@ -8587,7 +8628,7 @@ __export(op_anon_exports, {
 function runCli(args, cwd, home, timeoutMs) {
   return new Promise((resolve4) => {
     const t0 = Date.now();
-    const child = (0, import_child_process5.spawn)(process.execPath, [process.argv[1], ...args], { cwd, env: { ...process.env, HOME: home, USERPROFILE: home }, stdio: ["ignore", "pipe", "pipe"] });
+    const child = (0, import_child_process6.spawn)(process.execPath, [process.argv[1], ...args], { cwd, env: { ...process.env, HOME: home, USERPROFILE: home }, stdio: ["ignore", "pipe", "pipe"] });
     let out = "";
     child.stdout.on("data", (d) => {
       out += d;
@@ -8721,7 +8762,7 @@ async function runOpAnon(o = {}) {
     const demoFolder = import_path7.default.join(work, `${B.cli}-demo`);
     if (import_fs10.default.existsSync(import_path7.default.join(demoFolder, "start.js"))) {
       await new Promise((res) => {
-        const c = (0, import_child_process5.spawn)(process.execPath, [import_path7.default.join(demoFolder, "start.js"), "--stop"], { cwd: demoFolder, stdio: "ignore" });
+        const c = (0, import_child_process6.spawn)(process.execPath, [import_path7.default.join(demoFolder, "start.js"), "--stop"], { cwd: demoFolder, stdio: "ignore" });
         c.on("close", () => res());
       });
     }
@@ -8745,14 +8786,14 @@ async function runOpAnon(o = {}) {
   if (failed) process.exitCode = 1;
   return { ok: !failed, checks };
 }
-var import_fs10, import_os3, import_path7, import_child_process5, import_chalk70, SECRET;
+var import_fs10, import_os3, import_path7, import_child_process6, import_chalk70, SECRET;
 var init_op_anon = __esm({
   "src/commands/op-anon.ts"() {
     "use strict";
     import_fs10 = __toESM(require("fs"));
     import_os3 = __toESM(require("os"));
     import_path7 = __toESM(require("path"));
-    import_child_process5 = require("child_process");
+    import_child_process6 = require("child_process");
     import_chalk70 = __toESM(require("chalk"));
     init_brand();
     SECRET = /\bsk_(?:dev|test|prod)_[A-Za-z0-9]{6,}/;
@@ -9546,6 +9587,7 @@ function backendPort(f) {
 }
 
 // src/commands/skill.ts
+init_api();
 var SKILL_NAME = "ship-safely";
 var SKILL_RELATIVE_PATH = import_path6.default.join(".claude", "skills", SKILL_NAME, "SKILL.md");
 var CP_TOOLS = [
@@ -10189,6 +10231,7 @@ async function runForPerson(found) {
   await runDemo2({});
 }
 async function runSkill(opts = {}) {
+  countRun();
   if (opts.install) return installSkill(opts);
   if (opts.static) {
     process.stdout.write(skillMarkdown());
@@ -13482,10 +13525,10 @@ async function runBillingTopup(amount, opts) {
   if (c?.auto_rebuy?.enabled) console.log(import_chalk48.default.dim(`  Auto-rebuy is on (${money(c.auto_rebuy.amount_cents)} under ${money(c.auto_rebuy.threshold_cents)}).`));
   else console.log(import_chalk48.default.dim(`  Never run dry: ${B.cli} billing rebuy on --amount 50 --threshold 10`));
   if (opts.open) {
-    const { spawn: spawn4 } = await import("child_process");
+    const { spawn: spawn5 } = await import("child_process");
     const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
     try {
-      spawn4(cmd, [url], { stdio: "ignore", detached: true }).unref();
+      spawn5(cmd, [url], { stdio: "ignore", detached: true }).unref();
     } catch {
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.21.39",
+  "version": "0.21.40",
   "description": "APIblaze CLI — Chat with your APIs, Manage your API keys, users and groups with the APIblaze serverless proxy",
   "keywords": [
     "apiblaze",