apiblaze 0.1.10 → 0.1.12

package/dist/index.js

@@ -150,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({
@@ -405,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,
@@ -439,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
@@ -552,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
@@ -895,7 +910,7 @@ async function runTeam(arg) {
 
 // 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();
@@ -928,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.10",
+  "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"
   }