esque-bridge 0.6.7 → 0.6.8

package/index.js

@@ -1097,6 +1097,47 @@ function listenOnFreePort(app, startPort, maxTries = 25) {
   });
 }
 
+// Open the public pairing tunnel. Prefers cloudflared (reliable, no
+// interstitial), and falls back to localtunnel with a HARD timeout — otherwise
+// a slow/down localtunnel.me hangs the whole bridge before the QR ever prints
+// (exactly the "nothing happens after y" failure). Resolves a uniform handle
+// { url, kind, close(), onClose(cb) }, or null if both paths fail.
+function openPairTunnel(port) {
+  return new Promise((resolve) => {
+    let settled = false;
+    const done = (val) => { if (!settled) { settled = true; resolve(val); } };
+
+    const tryLocaltunnel = () => {
+      const timer = setTimeout(() => done(null), 20000);
+      localtunnel({ port, subdomain: LT_SUBDOMAIN })
+        .then((t) => {
+          clearTimeout(timer);
+          if (settled) { try { t.close(); } catch { /* already gone */ } return; }
+          done({ url: t.url, kind: 'localtunnel', close: () => { try { t.close(); } catch { /* already gone */ } }, onClose: (cb) => t.on('close', cb) });
+        })
+        .catch(() => { clearTimeout(timer); done(null); });
+    };
+
+    if (!hasCloudflared()) { tryLocaltunnel(); return; }
+
+    const proc = spawn('cloudflared', ['tunnel', '--url', `http://localhost:${port}`], { stdio: ['ignore', 'pipe', 'pipe'] });
+    let gotUrl = false, fellBack = false;
+    const scan = (d) => {
+      const m = String(d).match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/i);
+      if (m && !gotUrl) {
+        gotUrl = true;
+        done({ url: m[0], kind: 'cloudflared', close: () => { try { proc.kill(); } catch { /* already gone */ } }, onClose: (cb) => proc.on('exit', cb) });
+      }
+    };
+    proc.stdout.on('data', scan);
+    proc.stderr.on('data', scan);
+    // cloudflared died before emitting a URL, or took too long → fall back once.
+    const fallback = () => { if (!gotUrl && !fellBack) { fellBack = true; try { proc.kill(); } catch { /* already gone */ } tryLocaltunnel(); } };
+    proc.on('exit', fallback);
+    setTimeout(fallback, 25000);
+  });
+}
+
 async function main() {
   if (!fs.existsSync(WORKDIR) || !fs.statSync(WORKDIR).isDirectory()) {
     console.error(`workdir does not exist: ${WORKDIR}`);
@@ -1136,15 +1177,17 @@ async function main() {
     console.log(`  ✓ Using port ${boundPort} instead (${PORT} was taken).`);
   }
 
-  let tunnel;
-  try {
-    tunnel = await localtunnel({ port: boundPort, subdomain: LT_SUBDOMAIN });
-  } catch (err) {
-    console.error('Failed to open localtunnel:', err.message);
-    console.error('If localtunnel.me is blocked, try cloudflared:');
-    console.error(`  cloudflared tunnel --url http://localhost:${boundPort}`);
+  const tunnel = await openPairTunnel(boundPort);
+  if (!tunnel) {
+    console.error('\n  ✗ Could not open a public tunnel.');
+    console.error('    cloudflared and localtunnel.me both failed to respond.');
+    console.error('    Check your internet connection and retry. For the reliable path:');
+    console.error('      brew install cloudflared');
     process.exit(1);
   }
+  if (tunnel.kind === 'localtunnel') {
+    console.log('  (Using localtunnel — install cloudflared for a faster, steadier tunnel: brew install cloudflared)');
+  }
 
   const pairUrl = `esque://pair?url=${encodeURIComponent(tunnel.url)}&secret=${PAIRING_SECRET}&agent=${AGENT_TYPE}`;
 
@@ -1169,7 +1212,9 @@ async function main() {
   console.log('  Press Ctrl-C to stop.');
   console.log('━'.repeat(68));
 
+  let shuttingDown = false;
   const shutdown = (signal) => {
+    shuttingDown = true;
     console.log(`\n  Received ${signal} — closing tunnel…`);
     killPreview();
     try {
@@ -1182,7 +1227,10 @@ async function main() {
   process.on('SIGINT', () => shutdown('SIGINT'));
   process.on('SIGTERM', () => shutdown('SIGTERM'));
 
-  tunnel.on('close', () => {
+  // Detect an unexpected tunnel drop (but stay quiet during our own shutdown,
+  // since closing the tunnel also fires this).
+  tunnel.onClose(() => {
+    if (shuttingDown) return;
     console.error('\nTunnel closed unexpectedly. Restart `esque-bridge`.');
     process.exit(1);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esque-bridge",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "description": "Desktop-side receiver for the Esque Agent mobile app. Pairs your phone with a local coding-agent CLI (Claude Code, Codex, Aider, or any custom command) via a tunnel + QR code, so prompts run through your subscription instead of per-token API billing.",
   "bin": {
     "esque-bridge": "index.js"