nervur 0.2.0 → 0.3.0

package/nervur.js

@@ -9,7 +9,7 @@ import { spawnSync } from 'node:child_process'
 import { createHash } from 'node:crypto'
 import { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from 'node:fs'
 import { homedir } from 'node:os'
-import { dirname, join } from 'node:path'
+import { dirname, join, relative } from 'node:path'
 import { request as httpsRequest } from 'node:https'
 import { pathToFileURL } from 'node:url'
 import { resolveTemplate } from '@nervur-org/kit/templates.js'
@@ -103,7 +103,7 @@ const localOk = async (url) => {
 // scheme, and one without it still comes up on localhost. Bounded but generous:
 // the first boot installs node_modules (a native module) inside the container,
 // which takes a few minutes, so the wait prints progress rather than looking hung.
-async function knock({ localUrl, domain, ca, ms = 300_000 }) {
+async function knock({ localUrl, domain, ca, ms = 600_000 }) {
   const until = Date.now() + ms
   let noted = 0
   for (;;) {
@@ -214,13 +214,43 @@ async function main() {
   // and any contributor testing `install`, points the client at their OWN carcass
   // rather than the dev bench's). Absent NERVUR_PORT, the dev bench's config.face.port
   // is the convenience default; absent both, a published install's own default (4000).
+  // Reached at 127.0.0.1, never `localhost`: the compose binds IPv4 loopback
+  // only, and macOS launchd holds ::1 listeners (AirPlay on 5000) that accept
+  // and hang a localhost knock. Host ports must also dodge the WHATWG fetch
+  // bad-ports list (6000/X11 and kin) — node's fetch refuses those outright.
   const faceUrl = process.env.NERVUR_PORT
-    ? `http://localhost:${process.env.NERVUR_PORT}`
-    : config.face?.port
-      ? `http://localhost:${config.face.port}`
-      : 'http://localhost:4000'
+    ? `http://127.0.0.1:${process.env.NERVUR_PORT}`
+    : (config.hostPorts?.face ?? config.face?.port)
+      ? `http://127.0.0.1:${config.hostPorts?.face ?? config.face.port}`
+      : 'http://127.0.0.1:4000'
   const face = () => faceUrl
 
+  // A config without project/hostPorts/domains (the published install path)
+  // gets none of these vars — the compose defaults hold.
+  const composeEnv = () => {
+    const env = { ...process.env }
+    if (config.project) env.COMPOSE_PROJECT_NAME = config.project
+    if (config.domains) env.COMPOSE_PROFILES = 'door'
+    const seam = {
+      face: 'FACE',
+      console: 'CONSOLE',
+      faces: 'FACES',
+      ctlKeeper: 'CTL_KEEPER',
+      ctlUpsy: 'CTL_UPSY',
+      ctlFedexy: 'CTL_FEDEXY',
+      dpUpsy: 'DP_UPSY',
+      dpFedexy1: 'DP_FEDEXY1',
+      dpFedexy2: 'DP_FEDEXY2'
+    }
+    for (const [key, name] of Object.entries(seam))
+      if (config.hostPorts?.[key] != null) env[`NERVUR_HOST_${name}`] = String(config.hostPorts[key])
+    if (config.compose) {
+      const rel = configPath.startsWith('/') ? relative(process.cwd(), configPath) : configPath
+      env.NERVUR_GROUND_IN = `/app/${rel.replace(/^\.\//, '')}`
+    }
+    return env
+  }
+
   // `--as <name>` is a global flag — it rides before OR after the verb (`nervur
   // --as acme add empty` and `nervur add empty --as acme` both work), so pull it
   // out of the raw argv before the verb is read off position 0.
@@ -315,7 +345,7 @@ async function main() {
         }
       })
 
-      const localUrl = `http://localhost:${port}`
+      const localUrl = `http://127.0.0.1:${port}`
       await knock({ localUrl: `${localUrl}/health` })
       print(await getJson(`${localUrl}/whoami`))
 
@@ -359,7 +389,7 @@ async function main() {
         process.exit(1)
       }
       if (config.certs) sh('bash', [config.certs])
-      if (config.compose) sh('docker', ['compose', '-f', config.compose, 'up', '-d'])
+      if (config.compose) sh('docker', ['compose', '-f', config.compose, 'up', '-d'], { env: composeEnv() })
       const ca = readCA(config)
       // Door open: knock the domain first, so a bench with hosts run reports through
       // the real URL scheme (slice-2 behavior). Door closed: localhost only.
@@ -384,17 +414,17 @@ async function main() {
       // the domain door.
       console.log(
         banner('ground is standing', [
-          ['console', cyan(`http://localhost:${config.console?.port ?? 4200}`), 'open in your browser']
+          ['console', cyan(`http://localhost:${config.hostPorts?.console ?? config.console?.port ?? 4200}`), 'open in your browser']
         ]) + `\n    ${dim(`api ${via === 'domain' ? `https://${faceDomain}` : face()}`)}\n`
       )
       break
     }
     case 'down':
-      if (config.compose) sh('docker', ['compose', '-f', config.compose, 'down'])
+      if (config.compose) sh('docker', ['compose', '-f', config.compose, 'down'], { env: composeEnv() })
       console.log('down')
       break
     case 'reset':
-      if (config.compose) sh('docker', ['compose', '-f', config.compose, 'down', '-v'])
+      if (config.compose) sh('docker', ['compose', '-f', config.compose, 'down', '-v'], { env: composeEnv() })
       for (const dir of config.dataDirs ?? []) rmSync(dir, { recursive: true, force: true })
       console.log('reset')
       break

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nervur",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "The nervur CLI — a client of a running carcass, never the runtime (papers/host.md).",
   "type": "module",
   "bin": {