@montytools/cli 0.2.0 → 0.2.2

package/bin/monty.mjs

@@ -7,6 +7,7 @@ import { spawn, spawnSync } from "node:child_process";
 import { randomBytes } from "node:crypto";
 import { cpSync, mkdirSync, readFileSync, rmSync, writeFileSync, readdirSync, statSync, existsSync } from "node:fs";
 import { createServer } from "node:http";
+import { connect as netConnect } from "node:net";
 import { homedir } from "node:os";
 import { basename, dirname, join, relative } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -375,6 +376,7 @@ function installDeps() {
   const pm = spawnSync("pnpm", ["--version"], { stdio: "ignore" }).status === 0 ? "pnpm" : "npm";
   run(appDir, "install", [pm, "install"],
     "Dependency install failed. Read the package manager error above; usually network or a bad package.json edit.");
+  ensureSdk(appDir);
 }
 
 function buildApp() {
@@ -396,18 +398,68 @@ function typecheckApp() {
 }
 
 
+// Probe by CONNECTING (not binding): SO_REUSEADDR lets a wildcard bind
+// "succeed" on macOS even when a specific loopback address holds the port,
+// so bind-probes lie. A successful connect = someone is listening.
+function portTaken(host, port) {
+  return new Promise((resolve) => {
+    const sock = netConnect({ host, port });
+    const done = (taken) => {
+      sock.destroy();
+      resolve(taken);
+    };
+    sock.once("connect", () => done(true));
+    sock.once("error", () => done(false));
+    sock.setTimeout(400, () => done(false));
+  });
+}
+
 async function freePort(start) {
   for (let p = start; p < start + 50; p++) {
-    const ok = await new Promise((resolve) => {
-      const probe = createServer();
-      probe.once("error", () => resolve(false));
-      probe.listen(p, "127.0.0.1", () => probe.close(() => resolve(true)));
-    });
-    if (ok) return p;
+    if (!(await portTaken("127.0.0.1", p)) && !(await portTaken("::1", p))) return p;
   }
   fail("NO_FREE_PORT", `No free port between ${start} and ${start + 49}. Pass --port <n>.`);
 }
 
+
+// Apps pin @montytools/sdk at scaffold time and go stale — the CLI knows the
+// minimum SDK its workflows need (e.g. tunnel-host allowlisting lives in the
+// SDK's vite plugin) and upgrades the app automatically before dev/deploy.
+const MIN_SDK = "0.1.1";
+
+function installedSdkVersion(appDir) {
+  try {
+    return JSON.parse(
+      readFileSync(join(appDir, "node_modules", "@montytools", "sdk", "package.json"), "utf8"),
+    ).version;
+  } catch {
+    return null;
+  }
+}
+
+function semverLt(a, b) {
+  const pa = a.split(".").map(Number);
+  const pb = b.split(".").map(Number);
+  for (let i = 0; i < 3; i++) {
+    if ((pa[i] || 0) < (pb[i] || 0)) return true;
+    if ((pa[i] || 0) > (pb[i] || 0)) return false;
+  }
+  return false;
+}
+
+function ensureSdk(appDir) {
+  const v = installedSdkVersion(appDir);
+  if (v && !semverLt(v, MIN_SDK)) return;
+  console.log(
+    v
+      ? `sdk: installed ${v} < required ${MIN_SDK} — updating @montytools/sdk`
+      : "sdk: @montytools/sdk missing — installing",
+  );
+  const pm = spawnSync("pnpm", ["--version"], { stdio: "ignore" }).status === 0 ? "pnpm" : "npm";
+  run(appDir, "sdk-update", [pm, "install", "@montytools/sdk@latest"],
+    "Could not update @montytools/sdk. Run the install manually in the app folder, then retry.");
+}
+
 // ── monty dev ──────────────────────────────────────────────────────────────
 // Development mode: vite locally + a Cloudflare quick tunnel registered as
 // the app's DEV channel, so workspace admins see the app live (HMR included)
@@ -416,6 +468,7 @@ async function freePort(start) {
 // clicks Publish in the workspace, this process builds + uploads for real.
 async function dev() {
   const appDir = requireAppDir("dev");
+  ensureSdk(appDir);
   const meta = await compileConfig(appDir);
   const cfg = loadConfig();
   const host = cfg?.host ?? DEFAULT_HOST;
@@ -499,8 +552,14 @@ async function dev() {
       const t = await startTunnel(port);
       tunnelChild = t.child;
       if (t.url) {
-        originUrl = t.url;
         console.log(`tunnel: ${t.url}`);
+        console.log("tunnel: waiting for DNS to go live (prevents cached failures in your browser)…");
+        if (await waitForDns(t.url.replace("https://", ""))) {
+          originUrl = t.url;
+          console.log("tunnel: DNS live");
+        } else {
+          console.log("tunnel: DNS never propagated — dev mode registered on localhost (visible on this machine's browser only)");
+        }
       } else {
         console.log("tunnel: unavailable — dev mode registered on localhost (visible on this machine's browser only)");
       }
@@ -532,6 +591,26 @@ async function dev() {
   });
 }
 
+
+// trycloudflare DNS takes up to a couple of minutes to propagate. Registering
+// the origin before it resolves would make admins' browsers cache NXDOMAIN
+// (macOS negative cache ≈ 30 min of a broken iframe) — so gate on DNS via
+// DoH, which never touches the local resolver.
+async function waitForDns(hostname) {
+  for (let i = 0; i < 36; i++) {
+    try {
+      const r = await fetch(
+        `https://cloudflare-dns.com/dns-query?name=${hostname}&type=A`,
+        { headers: { accept: "application/dns-json" } },
+      );
+      const d = await r.json();
+      if (Array.isArray(d.Answer) && d.Answer.some((a) => a.type === 1)) return true;
+    } catch { /* transient — retry */ }
+    await new Promise((res) => setTimeout(res, 5000));
+  }
+  return false;
+}
+
 // Cloudflare quick tunnel via the cloudflared npm wrapper (downloads the
 // binary on first use). Resolves with the public URL, or null on failure —
 // dev mode then falls back to localhost-only registration.
@@ -673,6 +752,7 @@ async function docs() {
 // ── monty deploy ───────────────────────────────────────────────────────────
 async function deploy() {
   const appDir = requireAppDir("deploy");
+  ensureSdk(appDir);
   if (!rest.includes("--from-dev")) {
     console.log("note: direct deploy skips workspace review — the usual flow is `monty dev` + the Publish button in the workspace.");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@montytools/cli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "type": "module",
   "bin": {
     "monty": "./bin/monty.mjs"

package/template/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@fontsource-variable/roboto": "^5.2.10",
-    "@montytools/sdk": "^0.1.0",
+    "@montytools/sdk": "^0.1.1",
     "@tanstack/react-router": "1.170.17",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",