esque-bridge 0.6.6 → 0.6.8

package/index.js

@@ -687,58 +687,98 @@ async function probeBuildError(port) {
   return scanOutputForError(preview && preview.output);
 }
 
-// Runnable previews (`expo start`, `next dev`, `vite`, …) need the project's
-// dependencies on disk. The agent scaffolds package.json but deliberately does
-// NOT run a slow `npm install` itself (the blueprint hands that to Esque) — so
-// the very first preview would otherwise die with "module 'expo' is not
-// installed" / "next: command not found". This installs them once, up front,
-// with its own generous timeout so it never collides with the 60s port-wait.
-// Idempotent: skipped as soon as node_modules exists.
-function ensureDeps() {
+// Run one `sh -c <cmd>` inside the workdir, streaming a labelled copy of its
+// output and keeping a rolling tail we can scan afterwards. Self-kills after
+// timeoutMs so a wedged install can't hang the preview forever. Resolves
+// { code, out } (code -1 on timeout/spawn error).
+function runInWorkdir(cmd, label, timeoutMs) {
   return new Promise((resolve) => {
-    let needs;
-    try {
-      needs =
-        fs.existsSync(path.join(WORKDIR, 'package.json')) &&
-        !fs.existsSync(path.join(WORKDIR, 'node_modules'));
-    } catch {
-      needs = false;
-    }
-    if (!needs) return resolve(true);
-
-    // `--legacy-peer-deps`: AI-scaffolded Expo/RN projects routinely pin a
-    // React-18 app alongside test tooling that peer-wants React 19, which makes
-    // a strict `npm install` abort with ERESOLVE. The app runtime only needs
-    // the React it pins, so we tell npm to install the tree as written rather
-    // than fail the whole preview over a test-only peer mismatch.
-    console.log('[preview] installing dependencies (npm install) — first preview, this can take a few minutes…');
-    const proc = spawn('sh', ['-c', 'npm install --legacy-peer-deps --no-audit --no-fund'], {
-      cwd: WORKDIR,
-      env: process.env,
-      stdio: ['ignore', 'pipe', 'pipe'],
-    });
-    const onData = (d) => process.stdout.write(`[npm] ${d}`);
+    const proc = spawn('sh', ['-c', cmd], { cwd: WORKDIR, env: process.env, stdio: ['ignore', 'pipe', 'pipe'] });
+    let out = '';
+    const onData = (d) => { out = (out + d).slice(-20000); process.stdout.write(`[${label}] ${d}`); };
     proc.stdout.on('data', onData);
     proc.stderr.on('data', onData);
-    const timer = setTimeout(() => {
-      console.error('[preview] npm install exceeded 6 min — moving on (preview may fail)');
-      try { proc.kill('SIGKILL'); } catch { /* already gone */ }
-      resolve(false);
-    }, 360000);
-    proc.on('exit', (code) => {
-      clearTimeout(timer);
-      if (code === 0) console.log('[preview] dependencies installed');
-      else console.error(`[preview] npm install exited ${code} — preview may fail`);
-      resolve(code === 0);
-    });
-    proc.on('error', (e) => {
-      clearTimeout(timer);
-      console.error('[preview] npm install error:', e.message);
-      resolve(false);
-    });
+    const timer = setTimeout(() => { try { proc.kill('SIGKILL'); } catch { /* already gone */ } resolve({ code: -1, out }); }, timeoutMs);
+    proc.on('exit', (code) => { clearTimeout(timer); resolve({ code, out }); });
+    proc.on('error', (e) => { clearTimeout(timer); resolve({ code: -1, out: `${out}\n${e.message}` }); });
   });
 }
 
+// The agent sometimes invents a dependency version that does not exist on the
+// registry (e.g. `react-native-worklets@0.0.0`), and a single bad pin makes the
+// whole `npm install` abort with ETARGET/E404. Pull the offending package name
+// out of npm's error text and delete it from package.json (backing the original
+// up once) so the next attempt can get past it. Returns the dropped name or null.
+function dropUnresolvableDep(npmOutput) {
+  const m =
+    npmOutput.match(/No matching version found for (@?[\w.\/-]+)@/i) ||
+    npmOutput.match(/['"]?(@?[\w.\/-]+)@[^'"\s]+['"]? is not in this registry/i);
+  if (!m) return null;
+  const name = m[1];
+  const pkgPath = path.join(WORKDIR, 'package.json');
+  try {
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+    let dropped = false;
+    for (const sec of ['dependencies', 'devDependencies']) {
+      if (pkg[sec] && Object.prototype.hasOwnProperty.call(pkg[sec], name)) { delete pkg[sec][name]; dropped = true; }
+    }
+    if (!dropped) return null;
+    const bak = `${pkgPath}.esque-bak`;
+    if (!fs.existsSync(bak)) fs.copyFileSync(pkgPath, bak);
+    fs.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
+    return name;
+  } catch { return null; }
+}
+
+// Make sure the project's dependencies are on disk before a preview tries to
+// boot its dev server. The agent scaffolds package.json but deliberately leaves
+// the slow install to Esque (the blueprint says so), so the first preview would
+// otherwise die with "module 'expo' is not installed" / "next: not found".
+// Idempotent — skipped as soon as node_modules exists.
+async function ensureDeps() {
+  let isNode = false, hasModules = false, isExpo = false;
+  try {
+    const pkgPath = path.join(WORKDIR, 'package.json');
+    isNode = fs.existsSync(pkgPath);
+    hasModules = fs.existsSync(path.join(WORKDIR, 'node_modules'));
+    if (isNode) {
+      const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+      isExpo = !!(pkg.dependencies && pkg.dependencies.expo);
+    }
+  } catch { isNode = false; }
+  if (!isNode || hasModules) return true;
+
+  console.log('[preview] installing dependencies — first preview, this can take a few minutes…');
+  // `--legacy-peer-deps`: AI-scaffolded RN projects routinely pin a React-18 app
+  // beside test tooling that peer-wants React 19, which a strict install rejects.
+  const INSTALL = 'npm install --legacy-peer-deps --no-audit --no-fund';
+
+  let ok = false;
+  // Each failed pass may expose one invented version we can drop, then retry.
+  // Bounded so a genuinely unfixable project can't loop forever.
+  for (let attempt = 0; attempt < 6; attempt++) {
+    const { code, out } = await runInWorkdir(INSTALL, 'npm', 360000);
+    if (code === 0) { ok = true; break; }
+    const dropped = dropUnresolvableDep(out);
+    if (dropped) { console.log(`[preview] "${dropped}" has no installable version — removed it and retrying…`); continue; }
+    console.error(`[preview] npm install failed (exit ${code}) — preview may fail`);
+    break;
+  }
+  if (!ok) return false;
+  console.log('[preview] dependencies installed');
+
+  // For Expo apps, realign every SDK-managed package to the version the SDK
+  // expects. The agent often mixes incompatible pins (e.g. Expo 56 with
+  // react-native 0.76), which compiles to a blank/broken web bundle; this makes
+  // the tree coherent. Non-fatal — keep the installed versions if it can't run.
+  if (isExpo) {
+    const { code } = await runInWorkdir('npx --yes expo install --fix', 'expo', 240000);
+    if (code === 0) console.log('[preview] aligned dependency versions to the Expo SDK');
+    else console.warn('[preview] could not run expo install --fix — continuing with installed versions');
+  }
+  return true;
+}
+
 async function startPreview(cmd, port) {
   killPreview();
   // Make sure node_modules exists before the dev server tries to boot.
@@ -1057,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}`);
@@ -1096,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}`;
 
@@ -1129,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 {
@@ -1142,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.6",
+  "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"