@tokenoftrust/storefront-runner 2.2.85 → 2.2.87

package/scripts/tot-dev.mjs

@@ -63,8 +63,10 @@ import { dirname, resolve, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { resolveDevSourceRoot } from "./dev/tenant-source-root.mjs";
 import { tenantDirRelative, tenantDirSegments } from "./lib/tenant-dirs.mjs";
-import { firstFreePort } from "./dev/port-check.mjs";
+import { firstFreePort, isPortFree } from "./dev/port-check.mjs";
+import { busyPortMessage, classifyBusyPort, lockPort, unlockPort } from "./dev/port-lock.mjs";
 import { resync, startWatch } from "./dev/checkout-watch.mjs";
+import { standaloneGraftPlan } from "./dev/standalone-graft-plan.mjs";
 import { findMissingCtaIds } from "./tenant/validate.mjs";
 
 const here = dirname(fileURLToPath(import.meta.url));
@@ -273,25 +275,18 @@ if (workspacePath) {
   console.log(`\n  tot dev — standalone (${tenant})`);
   console.log(`  checkout: ${wsRoot}`);
 
-  for (const map of mappings) {
-    // `workspace` is the checkout-relative prefix (e.g. "content/", "theme.json").
-    // COLOCATION: a tenant IS the repo-root dir `tenants/<id>/`, and the checkout
-    // (a `git subtree split --prefix=tenants/<id>` of that dir) has the SAME layout
-    // at its root — so the graft is an identity map: content/ -> tenants/<id>/content/,
-    // public/ -> tenants/<id>/public/, theme.json -> tenants/<id>/theme.json. We map
-    // structurally (ignoring any legacy `repo` field in the checkout's .tot/config.json).
-    const wsRel = String(map.workspace ?? "").replace(/\/+$/, "");
-    if (!wsRel) continue;
+  /**
+   * Graft one checkout path (`wsRel`, checkout-relative) into the in-tree
+   * `tenants/<tenant>/` layout the app globs, with the same move-aside/restore +
+   * watch-and-resync machinery every mapping gets. Returns true if grafted.
+   */
+  function graftOne(wsRel, isDir) {
     const repoRel = join(tenantDirRelative(tenant), wsRel);
 
     const source = resolve(wsRoot, wsRel); // real files in the checkout
     const target = resolve(repoRoot, repoRel); // where the app globs them
-    const isDir = map.kind !== "file";
 
-    if (!existsSync(source)) {
-      console.warn(`  ⚠ checkout has no ${wsRel} — skipping (${map.kind ?? "?"})`);
-      continue;
-    }
+    if (!existsSync(source)) return false;
 
     // Ensure the destination's parent exists (e.g. content/ or themes/tenants/).
     mkdirSync(dirname(target), { recursive: true });
@@ -322,9 +317,31 @@ if (workspacePath) {
     }
 
     console.log(`  ↪ ${repoRel} ⇐ ${wsRel}${backup ? " (in-tree content backed up)" : ""}`);
+    return true;
   }
 
-  if (grafts.length === 0) {
+  // `workspace` is the checkout-relative prefix (e.g. "content/", "theme.json").
+  // COLOCATION: a tenant IS the repo-root dir `tenants/<id>/`, and the checkout
+  // (a `git subtree split --prefix=tenants/<id>` of that dir) has the SAME layout
+  // at its root — so the graft is an identity map: content/ -> tenants/<id>/content/,
+  // public/ -> tenants/<id>/public/, theme.json -> tenants/<id>/theme.json. We map
+  // structurally (ignoring any legacy `repo` field in the checkout's .tot/config.json).
+  // standaloneGraftPlan ALSO appends `.tot/config.json` unconditionally — see its
+  // own doc comment. Its success does NOT count toward "did we graft a usable
+  // site" below: a checkout with config but no content/public/theme is still
+  // nothing to serve.
+  let mappedCount = 0;
+  for (const { workspace, isDir } of standaloneGraftPlan(mappings)) {
+    const grafted = graftOne(workspace, isDir);
+    if (workspace === ".tot/config.json") {
+      if (!grafted) console.warn(`  ⚠ checkout has no .tot/config.json — compliance/capabilities/siteType resolve undeclared.`);
+      continue;
+    }
+    if (grafted) mappedCount++;
+    else console.warn(`  ⚠ checkout has no ${workspace} — skipping`);
+  }
+
+  if (mappedCount === 0) {
     console.error(`✗ nothing to graft — the checkout had none of the mapped prefixes.`);
     cleanupGrafts();
     process.exit(1);
@@ -354,12 +371,19 @@ if (workspacePath) {
 // which then mismatches the URL we (and the CLI's liveness poll) advertise.
 // Instead we pick the first free port ourselves and PRINT it, so a busy default
 // port "just works" (better UX than failing). See port-check.mjs.
+//
+// BEFORE drifting, classify WHY the requested port is busy (port-lock.mjs). When
+// an earlier `tot dev` session holds it — still running but possibly wedged after
+// a renderer crash, or exited with the socket lingering — the developer's browser
+// tab on that port is NOT this session, so say so and name the process to stop.
 const requestedPort = Number(flag("port", "4321"));
+const busy = await classifyBusyPort(requestedPort, { isFree: isPortFree });
 const resolvedPort = await firstFreePort(requestedPort);
 const port = String(resolvedPort);
 if (resolvedPort !== requestedPort) {
-  console.log(`  ⚠ port ${requestedPort} was busy — starting on ${resolvedPort} instead.`);
+  console.log(busyPortMessage(requestedPort, resolvedPort, busy));
 }
+lockPort(resolvedPort);
 
 // Land the developer on their store ROOT (plain save→reload HMR against their own
 // site) — not the /dev cockpit, which is a hosted-only surface excluded from the
@@ -429,15 +453,20 @@ const child = spawn(
   { cwd: appDir, stdio: "inherit", env: spawnEnv },
 );
 
-// Clean up grafts on every exit path so we never leave symlinks in the tree.
+// Clean up grafts + the port lock on every exit path so we never leave
+// symlinks in the tree, or a lock a LATER run would misread as still live.
 function shutdown(signal) {
   child.kill(signal);
 }
-child.on("exit", (code) => {
+function cleanupAll() {
   cleanupGrafts();
+  unlockPort(resolvedPort);
+}
+child.on("exit", (code) => {
+  cleanupAll();
   process.exit(code ?? 0);
 });
 process.on("SIGINT", () => shutdown("SIGINT"));
 process.on("SIGTERM", () => shutdown("SIGTERM"));
 // Belt-and-suspenders: if the parent dies without the child exit firing.
-process.on("exit", cleanupGrafts);
+process.on("exit", cleanupAll);