@odeva/cli 0.0.11 → 0.0.12

package/dist/commands/app/dev.js

@@ -67,25 +67,44 @@ class AppDev extends Command {
           PORT: String(port)
         }
       });
+      let tunnel;
+      let stopWatcher = () => {
+      };
+      let reloading = Promise.resolve();
+      let shuttingDown = false;
+      installShutdownHandler(async () => {
+        shuttingDown = true;
+        this.log("\n" + ui.dim("Cleaning up..."));
+        stopWatcher();
+        await reloading;
+        await Promise.allSettled([
+          server.stop(),
+          tunnel?.stop(),
+          cleanupSubscriptions(api, registered)
+        ]);
+        this.log(ui.ok("Done."));
+      });
       await this.verifyLocalDevServer(port, server, api, registered);
-      const tunnel = await this.startReachableTunnel(port, server);
-      if (saveDevTunnelUrl(loaded, tunnel.url)) {
+      tunnel = await this.startReachableTunnel(port, server, (startedTunnel) => {
+        tunnel = startedTunnel;
+      });
+      const activeTunnel = tunnel;
+      if (saveDevTunnelUrl(loaded, activeTunnel.url)) {
         this.log(ui.ok(`Wrote tunnel_url to ${ui.code(loaded.path)}`));
       }
-      registered = await this.registerDevWebhooks(api, loaded, tunnel.url);
+      registered = await this.registerDevWebhooks(api, loaded, activeTunnel.url);
       this.log("");
-      this.log(`${ui.bold("Tunnel:")}     ${tunnel.url}`);
+      this.log(`${ui.bold("Tunnel:")}     ${activeTunnel.url}`);
       this.log(`${ui.bold("Local:")}      http://localhost:${port}`);
       for (const reg of registered) {
         this.log(`  ${ui.dim("\u2192")} ${reg.config.topic.padEnd(28)} ${reg.fullUrl}`);
       }
       this.log("");
-      const syncedUrls = await this.syncDevAppUrls(api, loaded, tunnel.url);
+      const syncedUrls = await this.syncDevAppUrls(api, loaded, activeTunnel.url);
       this.printDevAppInfo(syncedUrls);
-      await this.ensureDevAppInstalled(api, loaded, tunnel, port, server, registered);
+      await this.ensureDevAppInstalled(api, loaded, activeTunnel, port, server, registered);
       this.log(ui.dim("Press Ctrl-C to stop. Subscriptions will be cleaned up on exit."));
       this.log("");
-      let shuttingDown = false;
       let restartingServer = false;
       let serverExited = () => {
       };
@@ -98,8 +117,7 @@ class AppDev extends Command {
         });
       };
       watchServerExit(server);
-      let reloading = Promise.resolve();
-      const stopWatcher = this.watchDevInputs(loaded.path, async () => {
+      stopWatcher = this.watchDevInputs(loaded.path, async () => {
         reloading = reloading.then(async () => {
           this.log("\n" + ui.dim("Reloading app dev config..."));
           const nextLoaded = loadAppConfig(loaded.root);
@@ -107,10 +125,10 @@ class AppDev extends Command {
           if (nextPort !== port) {
             this.log(ui.warn(`Port changed to ${nextPort}; restart \`odeva app dev\` to recreate the tunnel.`));
           }
-          if (saveDevTunnelUrl(nextLoaded, tunnel.url)) {
+          if (saveDevTunnelUrl(nextLoaded, activeTunnel.url)) {
             this.log(ui.ok(`Wrote tunnel_url to ${ui.code(nextLoaded.path)}`));
           }
-          const nextRegistered = await this.registerDevWebhooks(api, nextLoaded, tunnel.url);
+          const nextRegistered = await this.registerDevWebhooks(api, nextLoaded, activeTunnel.url);
           await cleanupSubscriptions(api, registered);
           registered = nextRegistered;
           const nextAppEnv = loadAppEnv(nextLoaded.path);
@@ -123,32 +141,20 @@ class AppDev extends Command {
             env: {
               ...nextAppEnv,
               PORT: String(port),
-              ODEVA_TUNNEL_URL: tunnel.url,
+              ODEVA_TUNNEL_URL: activeTunnel.url,
               ...registeredWebhookEnv(registered)
             }
           });
           server = nextServer;
           watchServerExit(server);
-          await this.verifyDevServerReachable(tunnel, port, server, api, registered);
-          await this.syncDevAppUrls(api, nextLoaded, tunnel.url);
+          await this.verifyDevServerReachable(activeTunnel, port, server, api, registered);
+          await this.syncDevAppUrls(api, nextLoaded, activeTunnel.url);
           this.log(ui.ok("Reloaded app dev config."));
         }).catch((err) => {
           restartingServer = false;
           this.log(ui.err(`Reload failed: ${err.message}`));
         });
       });
-      installShutdownHandler(async () => {
-        shuttingDown = true;
-        this.log("\n" + ui.dim("Cleaning up..."));
-        stopWatcher();
-        await reloading;
-        await Promise.allSettled([
-          server.stop(),
-          tunnel.stop(),
-          cleanupSubscriptions(api, registered)
-        ]);
-        this.log(ui.ok("Done."));
-      });
       await serverExit;
       shuttingDown = true;
       stopWatcher();
@@ -248,19 +254,19 @@ class AppDev extends Command {
       throw err;
     }
   }
-  async startReachableTunnel(port, server) {
+  async startReachableTunnel(port, server, onTunnelStarted) {
     let lastError;
     for (let attempt = 1; attempt <= 3; attempt += 1) {
       this.log(ui.dim(`Starting Cloudflare tunnel${attempt > 1 ? ` (attempt ${attempt}/3)` : ""}...`));
       const tunnel = await startQuickTunnel(port);
+      onTunnelStarted?.(tunnel);
       this.log(ui.ok(`Tunnel ready at ${ui.code(tunnel.url)}`));
-      this.log(ui.dim("Waiting 20s for trycloudflare DNS to propagate before first probe..."));
-      await new Promise((resolve) => setTimeout(resolve, 2e4));
-      this.log(ui.dim("Verifying dev server and tunnel... (trycloudflare can take up to 60s to propagate)"));
+      this.log(ui.dim("Verifying dev server and tunnel... (retrying for up to 60s while trycloudflare becomes reachable)"));
       try {
         const result = await waitForDevServerReachable({
           localPort: port,
-          tunnelUrl: tunnel.url
+          tunnelUrl: tunnel.url,
+          onProbeFailure: this.logTunnelProbeProgress()
         });
         this.log(ui.ok(`Tunnel verified via ${ui.code(result.path)} (HTTP ${result.tunnelStatus})`));
         return tunnel;
@@ -281,7 +287,8 @@ class AppDev extends Command {
     try {
       const result = await waitForDevServerReachable({
         localPort: port,
-        tunnelUrl: tunnel.url
+        tunnelUrl: tunnel.url,
+        onProbeFailure: this.logTunnelProbeProgress()
       });
       this.log(ui.ok(`Tunnel verified via ${ui.code(result.path)} (HTTP ${result.tunnelStatus})`));
     } catch (err) {
@@ -294,6 +301,17 @@ class AppDev extends Command {
       throw err;
     }
   }
+  logTunnelProbeProgress() {
+    let lastLogAt = 0;
+    return (probe) => {
+      const now = Date.now();
+      if (probe.elapsedMs < 5e3 || now - lastLogAt < 5e3) return;
+      lastLogAt = now;
+      this.log(ui.dim(
+        `Still waiting for tunnel ${ui.code(probe.path)} after ${Math.round(probe.elapsedMs / 1e3)}s: ${probe.lastError}`
+      ));
+    };
+  }
   watchDevInputs(appConfigPath, onChange) {
     const paths = watchedDevInputPaths(appConfigPath);
     let timer;

package/dist/lib/dev-runner.js

@@ -99,15 +99,20 @@ function spawnDevServer(opts) {
 }
 async function waitForDevServerReachable(opts) {
   const fetchImpl = opts.fetchImpl ?? fetch;
+  const startedAt = Date.now();
   const deadline = Date.now() + (opts.timeoutMs ?? 6e4);
   const requestTimeoutMs = opts.requestTimeoutMs ?? 2500;
   const mismatchGraceMs = opts.mismatchGraceMs ?? 45e3;
+  const cloudflareErrorGraceMs = opts.cloudflareErrorGraceMs ?? 1e4;
+  const networkErrorGraceMs = opts.networkErrorGraceMs ?? 1e4;
   const probe = await waitForLocalProbe(opts.localPort, deadline, requestTimeoutMs, fetchImpl);
   const tunnelUrl = new URL(opts.tunnelUrl);
   tunnelUrl.pathname = probe.path;
   tunnelUrl.search = "";
   let lastError = "not ready";
   let mismatchSince = null;
+  let cloudflareErrorSince = null;
+  let networkErrorSince = null;
   while (Date.now() < deadline) {
     try {
       const response = await fetchWithTimeout(fetchImpl, tunnelUrl, requestTimeoutMs);
@@ -119,18 +124,40 @@ async function waitForDevServerReachable(opts) {
         };
       }
       lastError = `HTTP ${response.status}`;
-      mismatchSince ??= Date.now();
-      if (Date.now() - mismatchSince >= mismatchGraceMs) break;
+      if (isCloudflareTunnelErrorStatus(response.status)) {
+        cloudflareErrorSince ??= Date.now();
+        mismatchSince = null;
+        networkErrorSince = null;
+        if (Date.now() - cloudflareErrorSince >= cloudflareErrorGraceMs) break;
+      } else {
+        mismatchSince ??= Date.now();
+        cloudflareErrorSince = null;
+        networkErrorSince = null;
+        if (Date.now() - mismatchSince >= mismatchGraceMs) break;
+      }
     } catch (err) {
       lastError = err instanceof Error ? err.message : String(err);
       mismatchSince = null;
+      cloudflareErrorSince = null;
+      networkErrorSince ??= Date.now();
+      if (Date.now() - networkErrorSince >= networkErrorGraceMs) break;
     }
+    opts.onProbeFailure?.({
+      elapsedMs: Date.now() - startedAt,
+      path: probe.path,
+      localStatus: probe.status,
+      tunnelUrl: tunnelUrl.toString(),
+      lastError
+    });
     await delay(500);
   }
   throw new CliError(`Cloudflare tunnel did not reach the local dev server at ${tunnelUrl.toString()}.`, {
     hint: `Local ${probe.path} returned HTTP ${probe.status}, but the tunnel returned ${lastError}. Restart \`odeva app dev\` if the quick tunnel URL expired.`
   });
 }
+function isCloudflareTunnelErrorStatus(status) {
+  return status === 530 || status === 502 || status === 503 || status === 504;
+}
 async function waitForLocalDevServer(opts) {
   const fetchImpl = opts.fetchImpl ?? fetch;
   const deadline = Date.now() + (opts.timeoutMs ?? 3e4);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odeva/cli",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Build apps on the Odeva booking platform — scaffold, develop, deploy.",
   "license": "MIT",
   "type": "module",