buncargo 3.2.3 → 3.2.4

package/dist/index.js

@@ -3,15 +3,15 @@ import {
   getFlagValue,
   hasFlag,
   runCli
-} from "./index-n5g93an7.js";
+} from "./index-emcawhxm.js";
 import {
   clearDevEnvCache,
   getDevEnv,
   loadDevEnv
-} from "./index-bycj26kj.js";
+} from "./index-1fset27q.js";
 import {
   createDevEnvironment
-} from "./index-n6z0qw70.js";
+} from "./index-tyk17rfn.js";
 import {
   DOCKER_NOT_RUNNING_MESSAGE,
   MAX_ATTEMPTS,
@@ -20,27 +20,7 @@ import {
   assertDockerRunning,
   isContainerRunning,
   isDockerRunning
-} from "./index-d8tyv5se.js";
-import {
-  getEnvVar,
-  getLocalIp,
-  isCI,
-  isPortAvailable,
-  logApiUrl,
-  logExpoApiUrl,
-  logFrontendPort,
-  sleep,
-  waitForServer
-} from "./index-c0dr6mcv.js";
-import {
-  calculatePortOffset,
-  computeDevIdentity,
-  findMonorepoRoot,
-  getProjectName,
-  getWorktreeName,
-  getWorktreeProjectSuffix,
-  isWorktree
-} from "./index-fb29934k.js";
+} from "./index-twwcjn9p.js";
 import {
   DEFAULT_GENERATED_COMPOSE_FILE,
   buildComposeModel,
@@ -53,7 +33,7 @@ import {
   resolveExposeTargets,
   startPublicTunnels,
   stopPublicTunnels
-} from "./index-mf4vjhm3.js";
+} from "./index-vr4ygtyj.js";
 import {
   getHeartbeatFile,
   getWatchdogPidFile,
@@ -71,6 +51,26 @@ import {
   killProcessOnPortAndWait,
   killProcessesOnAppPorts
 } from "./index-mm412dkp.js";
+import {
+  getEnvVar,
+  getLocalIp,
+  isCI,
+  isPortAvailable,
+  logApiUrl,
+  logExpoApiUrl,
+  logFrontendPort,
+  sleep,
+  waitForServer
+} from "./index-fkgqg6w2.js";
+import {
+  calculatePortOffset,
+  computeDevIdentity,
+  findMonorepoRoot,
+  getProjectName,
+  getWorktreeName,
+  getWorktreeProjectSuffix,
+  isWorktree
+} from "./index-fb29934k.js";
 import {
   assertValidConfig,
   defineDevConfig,

package/dist/loader/index.js

@@ -4,15 +4,15 @@ import {
   findConfigFile,
   getDevEnv,
   loadDevEnv
-} from "../index-bycj26kj.js";
-import"../index-n6z0qw70.js";
-import"../index-d8tyv5se.js";
-import"../index-c0dr6mcv.js";
-import"../index-fb29934k.js";
+} from "../index-1fset27q.js";
+import"../index-tyk17rfn.js";
+import"../index-twwcjn9p.js";
 import"../index-5t9jxqm0.js";
-import"../index-mf4vjhm3.js";
+import"../index-vr4ygtyj.js";
 import"../index-mam0bcyz.js";
 import"../index-mm412dkp.js";
+import"../index-fkgqg6w2.js";
+import"../index-fb29934k.js";
 import"../index-t0fj6gg1.js";
 import"../index-qnx9j3qa.js";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buncargo",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "description": "A Bun-powered development environment CLI for managing Docker Compose services, dev servers, and environment variables",
   "type": "module",
   "module": "./dist/index.js",
@@ -133,8 +133,8 @@
     "lint:write": "bun run typecheck && biome check --fix src example && biome format src example",
     "typecheck": "tsgo --incremental",
     "test": "bun test",
-    "test:integration-cloudflared": "bun test src/core/quick-tunnel/quick-tunnel.test.ts",
-    "test:integration-cloudflared-e2e": "BUNCARGO_TEST_CLOUDFLARED_E2E=1 bun test src/core/quick-tunnel/quick-tunnel.test.ts"
+    "test:integration-cloudflared": "BUNCARGO_TEST_CLOUDFLARED_SMOKE=1 bun test src/core/quick-tunnel/quick-tunnel.test.ts",
+    "test:integration-cloudflared-e2e": "BUNCARGO_TEST_CLOUDFLARED_SMOKE=1 BUNCARGO_TEST_CLOUDFLARED_E2E=1 bun test src/core/quick-tunnel/quick-tunnel.test.ts"
   },
   "devDependencies": {
     "@types/bun": "1.3.2",

package/src/core/quick-tunnel/cloudflared-process.ts

@@ -5,7 +5,22 @@
 import { type ChildProcess, spawn } from "node:child_process";
 import { cloudflaredBinPath } from "./constants";
 
-const urlRegex = /\|\s+(https?:\/\/\S+)/;
+/** Primary: ASCII box line from cloudflared (`|  https://…  |`). */
+const urlRegexPipe = /\|\s+(https?:\/\/\S+)/;
+/** Fallback: URL may appear without the leading pipe if logs wrap or format changes. */
+const urlRegexTryCloudflare =
+	/(https:\/\/[a-zA-Z0-9][-a-zA-Z0-9.]*\.trycloudflare\.com)\b/;
+
+const MAX_CAPTURED_LOG = 24_000;
+
+export function parseQuickTunnelUrlFromOutput(log: string): string | null {
+	const pipe = log.match(urlRegexPipe);
+	if (pipe?.[1]) {
+		return pipe[1];
+	}
+	const direct = log.match(urlRegexTryCloudflare);
+	return direct?.[1] ?? null;
+}
 
 export function startCloudflaredTunnel(
 	options: Record<string, string | number | null>,
@@ -55,22 +70,30 @@ export function startCloudflaredTunnel(
 		};
 	});
 
-	const parser = (data: Buffer) => {
-		const str = data.toString();
-
-		const urlMatch = str.match(urlRegex);
-		if (urlMatch) {
-			urlResolver(urlMatch[1] ?? "");
+	const log: { buf: string } = { buf: "" };
+	const append = (data: Buffer) => {
+		log.buf += data.toString();
+		if (log.buf.length > MAX_CAPTURED_LOG) {
+			log.buf = log.buf.slice(-MAX_CAPTURED_LOG);
+		}
+		const url = parseQuickTunnelUrlFromOutput(log.buf);
+		if (url) {
+			urlResolver(url);
 		}
 	};
-	child.stdout?.on("data", parser).on("error", urlRejector);
-	child.stderr?.on("data", parser).on("error", urlRejector);
+	child.stdout?.on("data", append).on("error", urlRejector);
+	child.stderr?.on("data", append).on("error", urlRejector);
 
 	child.on("exit", (code, signal) => {
 		if (!settled) {
+			const tail = log.buf.trimEnd();
+			const excerpt = tail.length > 1200 ? `…${tail.slice(-1200)}` : tail;
+			const detail = excerpt ? `\ncloudflared output (tail):\n${excerpt}` : "";
 			urlRejector(
 				new Error(
-					`cloudflared exited before a tunnel URL was parsed (code=${code}, signal=${signal ?? "none"})`,
+					`cloudflared exited before a tunnel URL was parsed (code=${code}, signal=${signal ?? "none"}). ` +
+						`Parallel quick-tunnel requests are often rate-limited; buncargo starts tunnels sequentially with a short pause. ` +
+						`If this persists, try fewer expose targets or increase BUNCARGO_EXPOSE_TUNNEL_STAGGER_MS.${detail}`,
 				),
 			);
 		}

package/src/core/quick-tunnel/index.ts

@@ -4,10 +4,48 @@
  */
 import { existsSync } from "node:fs";
 import { createInterface } from "node:readline";
+import { sleep } from "../utils";
 import { startCloudflaredTunnel } from "./cloudflared-process";
 import { cloudflaredBinPath, cloudflaredNotice } from "./constants";
 import { installCloudflared } from "./install";
 
+const MAX_QUICK_TUNNEL_ATTEMPTS = 5;
+
+function isQuickTunnelRateLimitedError(message: string): boolean {
+	return (
+		message.includes("429") ||
+		message.includes("Too Many Requests") ||
+		message.includes('status_code="429')
+	);
+}
+
+async function startCloudflaredTunnelWithRetry(
+	cfArgs: Record<string, string | number | null>,
+): Promise<ReturnType<typeof startCloudflaredTunnel>> {
+	for (let attempt = 1; attempt <= MAX_QUICK_TUNNEL_ATTEMPTS; attempt++) {
+		const tunnel = startCloudflaredTunnel(cfArgs);
+		try {
+			await tunnel.url;
+			return tunnel;
+		} catch (e) {
+			const msg = String(e);
+			if (
+				attempt < MAX_QUICK_TUNNEL_ATTEMPTS &&
+				isQuickTunnelRateLimitedError(msg)
+			) {
+				const delayMs = 2000 * attempt;
+				console.log(
+					`Cloudflare quick tunnel rate-limited (${attempt}/${MAX_QUICK_TUNNEL_ATTEMPTS}), retrying in ${delayMs}ms…`,
+				);
+				await sleep(delayMs);
+				continue;
+			}
+			throw e;
+		}
+	}
+	throw new Error("startCloudflaredTunnelWithRetry: exhausted attempts");
+}
+
 export interface QuickTunnelOptions {
 	url?: string;
 	port?: number | string;
@@ -83,7 +121,7 @@ export async function startQuickTunnel(
 	if (!opts.verifyTLS) {
 		cfArgs["--no-tls-verify"] = null;
 	}
-	const tunnel = startCloudflaredTunnel(cfArgs);
+	const tunnel = await startCloudflaredTunnelWithRetry(cfArgs);
 
 	const cleanup = async () => {
 		tunnel.stop();

package/src/core/tunnel.ts

@@ -1,5 +1,6 @@
 import type { AppConfig, DevEnvironment, ServiceConfig } from "../types";
 import { startQuickTunnel } from "./quick-tunnel";
+import { sleep } from "./utils";
 
 export interface PublicExposeTarget {
 	kind: "service" | "app";
@@ -115,6 +116,15 @@ export function resolveExposeTargets<
 	return { targets, unknownNames, notEnabledNames };
 }
 
+function resolveExposeTunnelStaggerMs(): number {
+	const raw = process.env.BUNCARGO_EXPOSE_TUNNEL_STAGGER_MS;
+	if (raw === undefined || raw === "") {
+		return 900;
+	}
+	const n = Number.parseInt(raw, 10);
+	return Number.isFinite(n) && n >= 0 ? n : 900;
+}
+
 export async function startPublicTunnels(
 	targets: PublicExposeTarget[],
 	options: {
@@ -124,9 +134,16 @@ export async function startPublicTunnels(
 	} = {},
 ): Promise<PublicTunnel[]> {
 	const start = options.start ?? ((input) => startQuickTunnel(input));
+	const staggerMs = resolveExposeTunnelStaggerMs();
 
-	const settled = await Promise.allSettled(
-		targets.map(async (target) => {
+	const tunnels: PublicTunnel[] = [];
+	try {
+		let index = 0;
+		for (const target of targets) {
+			if (index > 0 && staggerMs > 0) {
+				await sleep(staggerMs);
+			}
+			index += 1;
 			const localUrl = `http://localhost:${target.port}`;
 			const tunnel = (await start({
 				url: localUrl,
@@ -142,32 +159,19 @@ export async function startPublicTunnels(
 					`Tunnel for "${target.name}" did not provide a public URL`,
 				);
 			}
-			return {
+			tunnels.push({
 				kind: target.kind,
 				name: target.name,
 				localUrl,
 				publicUrl,
 				close: toCloseFn(tunnel),
-			};
-		}),
-	);
-
-	const tunnels: PublicTunnel[] = [];
-	const errors: unknown[] = [];
-	for (const result of settled) {
-		if (result.status === "fulfilled") {
-			tunnels.push(result.value);
-		} else {
-			errors.push(result.reason);
+			});
 		}
-	}
-
-	if (errors.length > 0) {
+		return tunnels;
+	} catch (e) {
 		await stopPublicTunnels(tunnels);
-		throw errors[0];
+		throw e;
 	}
-
-	return tunnels;
 }
 
 export async function stopPublicTunnels(