openzoo 0.21.5 → 0.21.7

package/lib/setup.js

@@ -202,17 +202,26 @@ export async function setupEditor(which, target) {
     // With --edge-ip-version 4 the tunnel comes up in seconds; if it somehow
     // does not, we say so plainly and still launch.
     if (!publicUrl) {
-      process.stdout.write('waiting for the public tunnel');
-      for (let i = 0; i < 180 && !started?.publicUrl; i++) {    // up to 90s
+      // VISIBLY ALIVE, AND SHORT. A silent 90s wait is indistinguishable from a
+      // hang — which is exactly how it was read, correctly. One dot per second
+      // with a countdown, capped at 25s, because with --edge-ip-version 4 a
+      // healthy tunnel registers in ~5-10s; longer than that means it is broken,
+      // not slow, and waiting more does not help.
+      const LIMIT = Number(process.env.OPENZOO_TUNNEL_WAIT_S || 25);
+      for (let i = 0; i < LIMIT * 2 && !started?.publicUrl; i++) {
         await new Promise((r) => setTimeout(r, 500));
-        if (i % 4 === 3) process.stdout.write('.');
+        if (i % 2 === 1) process.stdout.write(`\rwaiting for the public tunnel — ${LIMIT - Math.floor(i / 2) - 1}s `);
       }
-      console.log('');
+      process.stdout.write('\r\x1b[K');
       publicUrl = started?.publicUrl ?? null;
       tunnelKey = started?.tunnelToken ?? tunnelKey;
     }
     if (publicUrl) console.log(`tunnel:  ${publicUrl}/v1   api_key ${tunnelKey}`);
-    else console.log('tunnel:  did not come up in 90s.');
+    else {
+      console.log('tunnel:  did NOT come up. cloudflared could not reach Cloudflare\'s edge.');
+      console.log('         most common cause here: no working IPv6 route (we already force');
+      console.log('         --edge-ip-version 4). check: npx openzoo tunnel   for the raw log.');
+    }
   } else {
     console.log(`proxy already running on ${base}`);
     // A proxy someone else started owns the tunnel; ask it for the public URL.

package/lib/tunnel.js

@@ -20,7 +20,7 @@
  *     OPENZOO_MAX_USD_PER_CALL and/or OPENZOO_TUNNEL_MAX_USD to add them;
  *   - every tunnel-served request is logged with its running spend.
  */
-import { spawn } from 'node:child_process';
+import { spawn, execFileSync } from 'node:child_process';
 import { createWriteStream } from 'node:fs';
 import fs from 'node:fs';
 import path from 'node:path';
@@ -91,8 +91,27 @@ export async function ensureCloudflared(log = console.log) {
   return cached;
 }
 
+/**
+ * Kill cloudflared processes left over from previous runs against OUR port.
+ *
+ * WHY: the proxy exits with its terminal but cloudflared does not always go with
+ * it, so repeated `openzoo cursor` runs stack tunnels. Observed: two orphaned
+ * cloudflared processes, the editor configured with a third hostname, and every
+ * request answering 530/1033 — the editor was pointed at a tunnel whose origin
+ * had died while other live tunnels sat there serving nothing.
+ */
+function killStaleTunnels(port, log) {
+  try {
+    const out = execFileSync('pgrep', ['-f', `cloudflared tunnel --url http://localhost:${port}`], { encoding: 'utf8' });
+    const pids = out.split('\n').map((x) => x.trim()).filter(Boolean).filter((x) => Number(x) !== process.pid);
+    for (const pid of pids) { try { process.kill(Number(pid), 'SIGTERM'); } catch { /* already gone */ } }
+    if (pids.length) log(`tunnel: cleared ${pids.length} stale cloudflared process(es) from an earlier run`);
+  } catch { /* pgrep exits non-zero when nothing matches — that is the good case */ }
+}
+
 /** Start a quick tunnel to localhost:<port>; resolve with its public URL. */
 export function startCloudflared(bin, port, log) {
+  killStaleTunnels(port, log);
   return new Promise((resolve, reject) => {
     // --edge-ip-version 4: cloudflared prefers IPv6+QUIC to reach the edge
     // whenever the interface merely HAS an IPv6 address — it never checks the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.21.5",
+  "version": "0.21.7",
   "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",