openzoo 0.21.0 → 0.21.2

package/lib/setup.js

@@ -190,7 +190,7 @@ export async function setupEditor(which, target) {
     // an unbounded wait once left the editor never launching at all.
     if (!publicUrl) {
       process.stdout.write('waiting for the public tunnel (the editor\'s server cannot reach localhost)');
-      for (let i = 0; i < 120 && !started?.publicUrl; i++) {   // up to 60s
+      for (let i = 0; i < 240 && !started?.publicUrl; i++) {   // up to 120s (rungs race; first to SERVE wins)
         await new Promise((r) => setTimeout(r, 500));
         if (i % 4 === 3) process.stdout.write('.');
       }

package/lib/tunnel.js

@@ -105,10 +105,18 @@ export async function ensureCloudflared(log = console.log) {
  * edge-IP or protocol survives — so cascade instead of giving up.
  */
 const TUNNEL_RUNGS = [
+  // IPv4 FIRST, deliberately. cloudflared prefers IPv6+QUIC to reach the edge
+  // whenever the interface merely HAS an IPv6 address — it never checks the
+  // route is usable. MEASURED on a box with an IPv6 address and no IPv6 route:
+  //   failed to dial to edge with quic: write udp6 [::]->[2606:4700:a8::1]:7844:
+  //   sendmsg: no route to host
+  // ...on every retry, so the tunnel registered and immediately died and the
+  // edge served 502/530 — which looks exactly like a dead origin or a rate
+  // limit, and is neither. Forcing v4 registered first try on the same machine.
+  { args: ['--edge-ip-version', '4'], why: 'ipv4 edge' },
   { args: [], why: 'default (quic, auto edge ip)' },
-  { args: ['--edge-ip-version', '4'], why: 'ipv4 edge (the ipv6 path failed to register)' },
+  { args: ['--edge-ip-version', '4', '--protocol', 'http2'], why: 'ipv4 + http2' },
   { args: ['--protocol', 'http2'], why: 'http2 (quic/udp blocked or lossy)' },
-  { args: ['--edge-ip-version', '4', '--protocol', 'http2'], why: 'ipv4 + http2 (most conservative)' },
 ];
 
 /**
@@ -132,22 +140,33 @@ export async function probeTunnel(url, { tries = 8, gapMs = 2500 } = {}) {
  * Returns { url, proc, rung } or throws when every rung fails.
  */
 export async function startHealthyTunnel(bin, port, log = () => {}) {
-  let lastErr = null;
-  for (const rung of TUNNEL_RUNGS) {
-    let started = null;
-    try {
-      started = await startCloudflared(bin, port, log, { args: rung.args });
-    } catch (e) { lastErr = e; log(`tunnel: ${rung.why} — ${e.message}`); continue; }
-    if (await probeTunnel(started.url)) {
-      log(`tunnel: up via ${rung.why}`);
-      return { ...started, rung: rung.why };
-    }
-    // Printed a URL but never served — kill it before trying the next rung, or
-    // the dead process keeps holding the port's tunnel slot.
-    log(`tunnel: ${rung.why} printed ${started.url} but the edge could not reach it — next`);
-    try { started.proc.kill(); } catch { /* already gone */ }
+  // RACE, DO NOT WALK. Tried serially, four rungs cost up to 60s waiting for a
+  // URL plus ~20s of probing EACH — minutes of "waiting for the public tunnel"
+  // before the good one is even attempted, and the caller times out first.
+  // Quick tunnels are free and independent, so all rungs are started at once and
+  // the first one that actually SERVES wins; the losers are killed. Worst case
+  // becomes one rung's latency instead of four.
+  const losers = [];
+  let settled = false;
+  const attempts = TUNNEL_RUNGS.map(async (rung) => {
+    const started = await startCloudflared(bin, port, log, { args: rung.args });
+    losers.push(started.proc);
+    const ok = await probeTunnel(started.url, { tries: 6, gapMs: 2000 });
+    if (!ok) throw new Error(`${rung.why}: printed ${started.url} but the edge could not reach it`);
+    if (settled) throw new Error('another rung won');
+    settled = true;
+    return { ...started, rung: rung.why };
+  });
+  try {
+    const winner = await Promise.any(attempts);
+    log(`tunnel: up via ${winner.rung}`);
+    for (const p of losers) { if (p !== winner.proc) { try { p.kill(); } catch { /* gone */ } } }
+    return winner;
+  } catch (agg) {
+    for (const p of losers) { try { p.kill(); } catch { /* gone */ } }
+    const why = agg?.errors?.map((e) => e.message).join(' | ') || agg?.message || 'unknown';
+    throw new Error(`no cloudflared configuration produced a working tunnel (${why})`);
   }
-  throw lastErr || new Error('no cloudflared configuration produced a working tunnel');
 }
 
 /**
@@ -183,7 +202,13 @@ export function superviseTunnel({ bin, port, url, proc, log = () => {}, onRebind
 /** Start a quick tunnel to localhost:<port>; resolve with its public URL. */
 export function startCloudflared(bin, port, log, { args = [] } = {}) {
   return new Promise((resolve, reject) => {
-    const proc = spawn(bin, ['tunnel', '--url', `http://localhost:${port}`, '--no-autoupdate', ...args], {
+    // 127.0.0.1, NOT localhost. MEASURED: the proxy binds IPv4 only, while
+    // `localhost` resolves to ::1 FIRST on macOS — cloudflared dialled the IPv6
+    // loopback, got connection-refused, and reported "Unable to reach the origin
+    // service" (502) on a tunnel that had registered with Cloudflare perfectly.
+    // Every rung failed identically, which is what made it look like a network
+    // or rate-limit problem when it was a loopback address-family mismatch.
+    const proc = spawn(bin, ['tunnel', '--url', `http://127.0.0.1:${port}`, '--no-autoupdate', ...args], {
       stdio: ['ignore', 'pipe', 'pipe'],
     });
     let settled = false;
@@ -195,7 +220,8 @@ export function startCloudflared(bin, port, log, { args = [] } = {}) {
     proc.stderr.on('data', scan); // cloudflared prints the URL on stderr
     proc.on('error', reject);
     proc.on('exit', (c) => { if (!settled) reject(new Error(`cloudflared exited ${c} before printing a URL`)); });
-    setTimeout(() => { if (!settled) reject(new Error('cloudflared did not produce a URL in 60s')); }, 60000);
+    const urlWaitMs = Number(process.env.OPENZOO_TUNNEL_URL_WAIT_MS || 25000);
+    setTimeout(() => { if (!settled) { try { proc.kill(); } catch { /* gone */ } reject(new Error(`cloudflared did not produce a URL in ${urlWaitMs}ms`)); } }, urlWaitMs);
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.21.0",
+  "version": "0.21.2",
   "description": "Local x402-paying proxy + MCP server for openzoo.fun — point any OpenAI-compatible harness (Cursor, Claude Code, aider, SDKs) at localhost and it pays per call from a local burner wallet. Solana and Base rails live; Robinhood experimental.",
   "license": "MIT",
   "type": "module",