apiblaze 0.21.40 → 0.21.41

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.40";
+    version = "0.21.41";
   }
 });
 
@@ -394,12 +394,13 @@ __export(api_exports, {
 });
 function countRun(opts = {}) {
   if (/^(1|true|yes)$/i.test((process.env.DO_NOT_TRACK ?? "").trim())) return;
+  if (opts.event !== void 0 && !/^[a-z0-9-]{1,48}$/.test(opts.event)) 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()) }
+      env: { ...process.env, ABZ_COUNT_URL: (opts.url ?? `${PUBLIC_API_BASE}/cli/hello`) + (opts.event ? `/${opts.event}` : ""), ABZ_COUNT_HEADERS: JSON.stringify(cliHeaders()) }
     });
     child.on("error", () => {
     });
@@ -7720,7 +7721,7 @@ async function portFree(port) {
 }
 async function freePort(from, avoid = []) {
   for (let p = from; p < from + 200; p++) if (!avoid.includes(p) && await portFree(p)) return p;
-  throw new DemoError("No free port for the demo app.", "Close another local server, then run again.");
+  throw new DemoError("No free port for the demo app.", "Close another local server, then run again.", "no-free-port");
 }
 function readRegistry() {
   try {
@@ -7901,19 +7902,19 @@ async function createProxy2(name, backendPort2, openapi, tenantName) {
     return await createProxyAnonymous(body);
   } catch (err) {
     const status2 = err.status;
-    if (status2 === 429) throw new DemoError("Too many demos were started from this network in the last hour.", `Wait a few minutes, then run: ${LATEST} demo`);
-    if (status2 && status2 >= 500) throw new DemoError(`${B.product} is having trouble right now.`, `Try again in a minute: ${LATEST} demo`);
-    throw new DemoError(`Could not create the demo (${err.message}).`, `Run again: ${LATEST} demo`);
+    if (status2 === 429) throw new DemoError("Too many demos were started from this network in the last hour.", `Wait a few minutes, then run: ${LATEST} demo`, "create-429");
+    if (status2 && status2 >= 500) throw new DemoError(`${B.product} is having trouble right now.`, `Try again in a minute: ${LATEST} demo`, "create-5xx");
+    throw new DemoError(`Could not create the demo (${err.message}).`, `Run again: ${LATEST} demo`, "create-failed");
   }
 }
 async function waitTunnel(dir) {
   for (let i = 0; i < 200; i++) {
     const st = loadState(dir);
-    if (st?.error) throw new DemoError(st.error, `Run again: ${LATEST} demo`);
+    if (st?.error) throw new DemoError(st.error, `Run again: ${LATEST} demo`, "tunnel-error");
     if (st?.ready) return;
     await new Promise((r) => setTimeout(r, 100));
   }
-  throw new DemoError("The tunnel did not open in time.", `Try: ${LATEST} demo restart`);
+  throw new DemoError("The tunnel did not open in time.", `Try: ${LATEST} demo restart`, "tunnel-timeout");
 }
 async function waitThrough(apiUrl, serverKey) {
   let last = 0;
@@ -7922,13 +7923,13 @@ async function waitThrough(apiUrl, serverKey) {
       const r = await fetch(`${apiUrl}/reservations`, { headers: { "x-api-key": serverKey, "x-end-user-id": "ana" } });
       last = r.status;
       if (r.status === 200) return;
-      if (r.status === 402) throw new DemoError(`${B.product} refused the demo's free calls. That is a problem on our side, not yours.`, `Try again in a few minutes: ${LATEST} demo`);
+      if (r.status === 402) throw new DemoError(`${B.product} refused the demo's free calls. That is a problem on our side, not yours.`, `Try again in a few minutes: ${LATEST} demo`, "trial-402");
     } catch (e) {
       if (e instanceof DemoError) throw e;
     }
     await new Promise((r) => setTimeout(r, 1e3));
   }
-  throw new DemoError(`The demo is running but ${B.product} cannot reach it yet (last answer ${last}).`, `Run again: ${LATEST} demo`);
+  throw new DemoError(`The demo is running but ${B.product} cannot reach it yet (last answer ${last}).`, `Run again: ${LATEST} demo`, `cannot-reach-${last}`);
 }
 async function confirmStep(opts, question) {
   if (opts.yes || !interactive()) return true;
@@ -8003,9 +8004,10 @@ function routesOf(openapi) {
 async function runDemo(opts = {}) {
   if (opts.serve) return serveTunnel(import_path5.default.resolve(opts.serve));
   try {
-    await startDemo(opts);
+    countRun({ event: await startDemo(opts) });
   } catch (err) {
     const e = err instanceof DemoError ? err : new DemoError(`The demo could not start (${err.message}).`, `Run again: ${LATEST} demo`);
+    countRun({ event: `demo-failed-${e.why}` });
     await stopDemos().catch(() => 0);
     console.log(`${import_chalk24.default.red("\u2717")} ${e.message}`);
     console.log(`  ${e.fix}`);
@@ -8061,9 +8063,10 @@ async function startDemo(opts) {
   const cdDir = rel === "." ? "" : `cd ${rel} && `;
   const shell = (c, note = "") => console.log(`   ${import_chalk24.default.dim("$")} ${import_chalk24.default.cyan(c)}${note ? `   ${import_chalk24.default.dim(note)}` : ""}`);
   const ok = (text, note = "") => console.log(`   ${import_chalk24.default.green("\u2713")} ${text}${note ? `   ${import_chalk24.default.dim(note)}` : ""}`);
-  const stopHere = (lines) => {
+  const stopHere = (step, lines) => {
     console.log();
     for (const l of lines) console.log(`  ${l}`);
+    return `demo-declined-${step}`;
   };
   titleCard(["Restaurant Reservation Service Demo", `ResiResi, with ${B.product} in front`]);
   await stopDemos();
@@ -8090,16 +8093,16 @@ paths:`));
   for (const r of routesOf(openapi)) console.log(`     ${r.method.padEnd(7)}${r.path.padEnd(21)}${import_chalk24.default.dim(r.summary)}`);
   console.log(import_chalk24.default.dim("   No login, no API keys, no permission checks in its code. It only checks one shared backend secret (in .env.local)."));
   if (!await confirmStep(opts, `Ok to serve the backend on localhost:${backendPort2}?`)) {
-    return stopHere([
+    return stopHere("backend", [
       `Stopped before starting anything. ResiResi is written to ${rel}.`,
       `Start it any time: ${cdDir}npm run start  ${import_chalk24.default.dim("\xB7")}  or run the whole demo again: ${LATEST} demo`
     ]);
   }
   shell(`${cdDir}npm run start`, "npm run stop \xB7 npm run restart");
-  if (!appCtl(dir, "--background")) throw new DemoError("The ResiResi app could not start.", `Run again: ${LATEST} demo`);
+  if (!appCtl(dir, "--background")) throw new DemoError("The ResiResi app could not start.", `Run again: ${LATEST} demo`, "app-start");
   registerDemo(dir);
   const appUp = await busy("Starting the reservation backend and its front-end\u2026", () => waitPorts([backendPort2, directPort]), 1800);
-  if (!appUp) throw new DemoError(`The ResiResi app did not start (see ${import_path5.default.join(rel, STATE_DIR, "app.log")}).`, `Run again: ${LATEST} demo`);
+  if (!appUp) throw new DemoError(`The ResiResi app did not start (see ${import_path5.default.join(rel, STATE_DIR, "app.log")}).`, `Run again: ${LATEST} demo`, "app-not-up");
   ok(`${import_chalk24.default.bold("Reservation backend")}: localhost:${backendPort2}`, "unprotected");
   ok(`${import_chalk24.default.bold("Unprotected reservation front-end")}, going directly to the reservation backend: ${import_chalk24.default.bold(`http://localhost:${directPort}`)}`);
   console.log("   Book a table directly, the way the unprotected front-end does:");
@@ -8108,7 +8111,7 @@ paths:`));
   console.log(import_chalk24.default.cyan(`       -H "x-abz-user-id: ana" -H "x-abz-tenant-id: ${ninoTenant}" \\`));
   console.log(import_chalk24.default.cyan(`       -H "content-type: application/json" -d '{"time":"19:30","guests":2}'`));
   if (!await confirmStep(opts, `Ok to put an ${B.product} proxy and MCP in front of the reservation backend?`)) {
-    return stopHere([
+    return stopHere("proxy", [
       `Stopped before ${B.product}. ResiResi keeps running on this laptop: http://localhost:${directPort}  ${import_chalk24.default.dim(`(${cdDir}npm run stop stops it)`)}`,
       `Run the whole demo again any time: ${LATEST} demo`
     ]);
@@ -8127,7 +8130,7 @@ paths:`));
     const rr = r;
     const tenant3 = rr.tenant ?? tenantFromPortal(rr.portal ?? rr.devPortal) ?? "";
     const missing = [!cpKey2 && "workspace key", !teamId2 && "team", !serverKey2 && "API key", !tenant3 && "tenant"].filter(Boolean);
-    if (missing.length) throw new DemoError(`${B.product} did not return everything the demo needs (${missing.join(", ")}).`, `Run again: ${LATEST} demo`);
+    if (missing.length) throw new DemoError(`${B.product} did not return everything the demo needs (${missing.join(", ")}).`, `Run again: ${LATEST} demo`, "setup-incomplete");
     const createSecs2 = ((Date.now() - tCreate) / 1e3).toFixed(1);
     adoptWorkspace(cpKey2, teamId2, rr.claim_code);
     const cp = (p, init) => cpFetch(cpKey2, p, init).then(() => true).catch(() => false);
@@ -8149,7 +8152,7 @@ paths:`));
         return { limited: lim, secretOk: sec };
       })()
     ]);
-    if (!secretOk) throw new DemoError(`Could not give ${B.product} the backend secret.`, `Run again: ${LATEST} demo`);
+    if (!secretOk) throw new DemoError(`Could not give ${B.product} the backend secret.`, `Run again: ${LATEST} demo`, "secret-failed");
     return { cpKey: cpKey2, teamId: teamId2, serverKey: serverKey2, project: project2, version: version3, tenant: tenant3, gino: gino2, createSecs: createSecs2, adminOk: adminOk2, ginaOk: ginaOk2, limited: limited2, claimCode: rr.claim_code, applied: rr.secure?.applied ?? [] };
   });
   const { cpKey, teamId, serverKey, project, version: version2, tenant: tenant2, gino, createSecs, adminOk, ginaOk, limited } = setup;
@@ -8201,7 +8204,7 @@ paths:`));
     }
   ]);
   if (!await confirmStep(opts, `Ok to create a tunnel allowing ${project} to forward requests to localhost:${backendPort2}?`)) {
-    return stopHere([
+    return stopHere("tunnel", [
       `Stopped before the tunnel. The proxy exists but cannot reach this laptop yet.`,
       `Open the tunnel any time: ${LATEST} demo start`
     ]);
@@ -8216,7 +8219,7 @@ paths:`));
   ok(`${import_chalk24.default.bold("Tunnel")}: the public address reaches localhost:${backendPort2} on this laptop`, `checked with a real call \xB7 ${Math.round((Date.now() - t0) / 1e3)} s so far`);
   printAddresses(dir);
   if (!await confirmStep(opts, "Ok to launch the protected website, which will use the proxy to reach the backend?")) {
-    return stopHere([
+    return stopHere("website", [
       `Stopped before the protected website. The API and MCP addresses above work now.`,
       `Start the website any time: ${cdDir}npm run restart`
     ]);
@@ -8229,12 +8232,13 @@ paths:`));
     appCtl(dir, "--background");
     return waitPorts([appPort, directPort, backendPort2]);
   }, 1500);
-  if (!siteUp) throw new DemoError(`The protected website did not start (see ${import_path5.default.join(rel, STATE_DIR, "app.log")}).`, `Try: ${cdDir}npm run restart`);
+  if (!siteUp) throw new DemoError(`The protected website did not start (see ${import_path5.default.join(rel, STATE_DIR, "app.log")}).`, `Try: ${cdDir}npm run restart`, "site-not-up");
   ok(`${import_chalk24.default.bold("Protected reservation website")}, going through the ${B.product} proxy ${apiUrl}: ${import_chalk24.default.bold(`http://localhost:${appPort}`)}`);
   ok(`${import_chalk24.default.bold("Unprotected reservation front-end")}, still going directly to the backend: http://localhost:${directPort}`, "the switch at the top of the page goes between them");
   console.log();
   console.log(import_chalk24.default.dim(`  Logs: ${logsCommand(readEnvFile(import_path5.default.join(dir, ".env.local")))}  \xB7  Stop the tunnel: ${LATEST} demo stop  \xB7  Your own app: ${LATEST} dev --port <port>`));
   await offerBrowserAndLogs(dir, opts);
+  return "demo-ready";
 }
 function printAddresses(dir) {
   const env = readEnvFile(import_path5.default.join(dir, ".env.local"));
@@ -8266,10 +8270,12 @@ async function runDemoStart(opts = {}) {
     await spawnTunnel(dir, state);
   } catch (err) {
     const e = err instanceof DemoError ? err : new DemoError(`The tunnel could not start (${err.message}).`, `Start over: ${LATEST} demo`);
+    countRun({ event: `demo-restart-failed-${e.why}` });
     console.log(`${import_chalk24.default.red("\u2717")} ${e.message}`);
     console.log(`  ${e.fix}`);
     process.exit(1);
   }
+  countRun({ event: "demo-restarted" });
   console.log(`${import_chalk24.default.green("\u2713")} Tunnel open: the public address reaches localhost:${env.BACKEND_PORT} again   ${import_chalk24.default.dim(`(${Math.round((Date.now() - t0) / 1e3)} s)`)}`);
   printAddresses(dir);
   const appUp = await fetch(`http://127.0.0.1:${env.APP_PORT}/api/config`).then(() => true).catch(() => false);
@@ -8373,9 +8379,10 @@ var init_demo = __esm({
     DEMO_GINO_ADMIN_EMAIL = "gina@ginopizza.example";
     RULE_SENTENCE = "Only the person who made a reservation can change or cancel it";
     DemoError = class extends Error {
-      constructor(message, fix) {
+      constructor(message, fix, why = "unexpected") {
         super(message);
         this.fix = fix;
+        this.why = why;
       }
     };
     ADJ = ["brave", "calm", "clever", "eager", "happy", "jolly", "lucky", "merry", "noble", "quick", "sunny", "swift", "witty", "zesty", "bright", "gentle"];

package/package.json

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