@odeva/cli 0.0.8 → 0.0.10

package/dist/commands/app/dev.js

@@ -67,9 +67,7 @@ class AppDev extends Command {
         }
       });
       await this.verifyLocalDevServer(port, server, api, registered);
-      this.log(ui.dim("Starting Cloudflare tunnel..."));
-      const tunnel = await startQuickTunnel(port);
-      this.log(ui.ok(`Tunnel ready at ${ui.code(tunnel.url)}`));
+      const tunnel = await this.startReachableTunnel(port, server);
       registered = await this.registerDevWebhooks(api, loaded, tunnel.url);
       this.log("");
       this.log(`${ui.bold("Tunnel:")}     ${tunnel.url}`);
@@ -78,7 +76,6 @@ class AppDev extends Command {
         this.log(`  ${ui.dim("\u2192")} ${reg.config.topic.padEnd(28)} ${reg.fullUrl}`);
       }
       this.log("");
-      await this.verifyDevServerReachable(tunnel, port, server, api, registered);
       const syncedUrls = await this.syncDevAppUrls(api, loaded, tunnel.url);
       this.printDevAppInfo(syncedUrls);
       await this.ensureDevAppInstalled(api, loaded, tunnel, port, server, registered);
@@ -244,6 +241,34 @@ class AppDev extends Command {
       throw err;
     }
   }
+  async startReachableTunnel(port, server) {
+    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);
+      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)"));
+      try {
+        const result = await waitForDevServerReachable({
+          localPort: port,
+          tunnelUrl: tunnel.url
+        });
+        this.log(ui.ok(`Tunnel verified via ${ui.code(result.path)} (HTTP ${result.tunnelStatus})`));
+        return tunnel;
+      } catch (err) {
+        lastError = err;
+        await tunnel.stop();
+        if (attempt < 3) {
+          const message = err instanceof Error ? err.message : String(err);
+          this.log(ui.warn(`Tunnel ${attempt}/3 was not reachable: ${message}`));
+        }
+      }
+    }
+    await server.stop();
+    throw lastError instanceof Error ? lastError : new CliError(String(lastError));
+  }
   async verifyDevServerReachable(tunnel, port, server, api, registered) {
     this.log(ui.dim("Verifying dev server and tunnel... (trycloudflare can take up to 60s to propagate)"));
     try {

package/dist/commands/webhook/trigger.js

@@ -1,13 +1,13 @@
 import { Args, Command, Flags } from "@oclif/core";
 import { readFileSync } from "node:fs";
-import { resolve } from "node:path";
+import { join, resolve } from "node:path";
+import { APP_DEV_ENV_FILE, readEnvFile } from "../../lib/app-env.js";
 import { loadAppConfig, findAppConfigPath } from "../../lib/config.js";
 import { buildFixture, signPayload } from "../../lib/webhook-fixtures.js";
 import { CliError } from "../../lib/errors.js";
 import { withErrorHandling } from "../../lib/run.js";
-import { readEnvFile, webhookSecretForEvent } from "../../lib/dev-runner.js";
+import { webhookSecretForEvent } from "../../lib/dev-runner.js";
 import { ui } from "../../lib/ui.js";
-import { join } from "node:path";
 class WebhookTrigger extends Command {
   static description = "Fire a sample webhook payload at a local handler (uses the secret from .env.odeva.local if present)";
   static examples = [
@@ -107,7 +107,7 @@ class WebhookTrigger extends Command {
   secretFromEnvFile(event) {
     const cfgPath = findAppConfigPath();
     if (!cfgPath) return void 0;
-    const envPath = join(resolve(cfgPath, ".."), ".env.odeva.local");
+    const envPath = join(resolve(cfgPath, ".."), APP_DEV_ENV_FILE);
     const env = readEnvFile(envPath);
     return webhookSecretForEvent(event, env);
   }

package/dist/lib/app-env.js

@@ -1,8 +1,17 @@
 import { existsSync, readFileSync, writeFileSync, chmodSync } from "node:fs";
 import { dirname, join } from "node:path";
 const APP_ENV_FILE = ".odeva.env";
+const APP_ENV_LOCAL_FILE = ".odeva.env.local";
+const APP_DEV_ENV_FILE = ".env.odeva.local";
 function loadAppEnv(appConfigPath) {
-  const envPath = join(dirname(appConfigPath), APP_ENV_FILE);
+  const dir = dirname(appConfigPath);
+  return {
+    ...readEnvFile(join(dir, APP_DEV_ENV_FILE)),
+    ...readEnvFile(join(dir, APP_ENV_FILE)),
+    ...readEnvFile(join(dir, APP_ENV_LOCAL_FILE))
+  };
+}
+function readEnvFile(envPath) {
   if (!existsSync(envPath)) return {};
   const raw = readFileSync(envPath, "utf8");
   const result = {};
@@ -19,7 +28,7 @@ function loadAppEnv(appConfigPath) {
 }
 function saveAppEnv(appConfigPath, values) {
   const envPath = join(dirname(appConfigPath), APP_ENV_FILE);
-  const merged = { ...loadAppEnv(appConfigPath), ...values };
+  const merged = { ...readEnvFile(envPath), ...values };
   const body = [
     "# Auto-managed by `odeva` \u2014 do not commit. Add `.odeva.env` to .gitignore.",
     ...Object.entries(merged).map(([k, v]) => `${k}=${v}`),
@@ -33,7 +42,10 @@ function saveAppEnv(appConfigPath, values) {
   return envPath;
 }
 export {
+  APP_DEV_ENV_FILE,
   APP_ENV_FILE,
+  APP_ENV_LOCAL_FILE,
   loadAppEnv,
+  readEnvFile,
   saveAppEnv
 };

package/dist/lib/dev-runner.js

@@ -1,7 +1,7 @@
 import { spawn } from "node:child_process";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { APP_ENV_FILE } from "./app-env.js";
+import { APP_DEV_ENV_FILE, APP_ENV_FILE, APP_ENV_LOCAL_FILE, readEnvFile } from "./app-env.js";
 import { CliError } from "./errors.js";
 async function registerWebhookSubscriptions(api, appName, tunnelUrl, subscriptions) {
   const created = [];
@@ -167,7 +167,8 @@ function devAppTunnelUrl(opts) {
 }
 function writeDevEnvFile(cwd, registered) {
   if (registered.length === 0) return null;
-  const path = join(cwd, ".env.odeva.local");
+  const path = join(cwd, APP_DEV_ENV_FILE);
+  const preserved = Object.entries(readEnvFile(path)).filter(([key]) => !key.startsWith("ODEVA_WEBHOOK_SECRET"));
   const lines = [
     "# Auto-generated by `odeva app dev`. Do not commit.",
     "# Reload your dev server to pick up these values."
@@ -178,6 +179,13 @@ function writeDevEnvFile(cwd, registered) {
     lines.push(`# ${reg.config.topic} \u2192 ${reg.fullUrl}`);
     lines.push(`ODEVA_WEBHOOK_SECRET__${webhookSecretEnvKey(reg.config.topic)}=${reg.secret}`);
   }
+  if (preserved.length > 0) {
+    lines.push("");
+    lines.push("# Preserved local values.");
+    for (const [key, value] of preserved) {
+      lines.push(`${key}=${value}`);
+    }
+  }
   writeFileSync(path, lines.join("\n") + "\n", { mode: 384 });
   return path;
 }
@@ -196,7 +204,11 @@ function webhookSecretForEvent(event, env) {
   return env[`ODEVA_WEBHOOK_SECRET__${webhookSecretEnvKey(event)}`] ?? env["ODEVA_WEBHOOK_SECRET"];
 }
 function watchedDevInputPaths(appConfigPath) {
-  return [appConfigPath, join(dirname(appConfigPath), APP_ENV_FILE)];
+  return [
+    appConfigPath,
+    join(dirname(appConfigPath), APP_ENV_FILE),
+    join(dirname(appConfigPath), APP_ENV_LOCAL_FILE)
+  ];
 }
 function joinUrl(base, path) {
   const trimmedBase = base.replace(/\/$/, "");
@@ -341,25 +353,12 @@ function preflightChecks(cwd) {
   }
   return { warnings };
 }
-function readEnvFile(path) {
-  if (!existsSync(path)) return {};
-  const out = {};
-  for (const line of readFileSync(path, "utf8").split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#")) continue;
-    const eq = trimmed.indexOf("=");
-    if (eq === -1) continue;
-    out[trimmed.slice(0, eq)] = trimmed.slice(eq + 1);
-  }
-  return out;
-}
 export {
   cleanupSubscriptions,
   devAppTunnelUrl,
   devInstallCallbackUrl,
   ensureDevAppInstalled,
   preflightChecks,
-  readEnvFile,
   registerWebhookSubscriptions,
   registeredWebhookEnv,
   spawnDevServer,

package/package.json

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