@avelor/mesh 0.3.0 → 0.4.0

package/README.md

@@ -28,10 +28,10 @@ Requires Node.js 18+. For HTTPS, install [mkcert](https://github.com/FiloSottile
 
 ```bash
 mesh init         # create mesh.yml in current directory
-sudo mesh start   # start proxy in background
+mesh start        # start proxy in background (will prompt for sudo)
 mesh status       # show running services
-sudo mesh stop    # stop the proxy
-sudo mesh route   # start in foreground (useful for debugging)
+mesh stop         # stop the proxy
+mesh route        # start in foreground (useful for debugging)
 ```
 
 `mesh start` runs on `:80` and `:443` (if mkcert is available), writes the hostname entries to `/etc/hosts`, and cleans them up automatically on stop.
@@ -138,7 +138,7 @@ cd examples/basic
 node app.js
 
 # terminal 3 (from examples/basic)
-sudo mesh route
+mesh route
 ```
 
 Then open `https://app.test`.

package/bin/mesh.js

@@ -8,6 +8,7 @@ import { writeHosts, removeHosts } from '../src/hosts.js'
 import { startProxy }              from '../src/proxy.js'
 import { ensureCerts }             from '../src/certs.js'
 import { init }                    from '../src/init.js'
+import { findFreePort, startServices } from '../src/services.js'
 
 const STATE_FILE = '/tmp/.mesh.json'
 
@@ -179,81 +180,105 @@ if (cmd !== 'route') {
 
 autoSudo()
 
-// ── Load config ───────────────────────────────────────────────────────────────
+// ── Load config + start managed services ─────────────────────────────────────
 
-let config
-try {
-  config = loadConfig(configArg ?? process.cwd())
-} catch (err) {
-  console.error('mesh:', err.message)
-  process.exit(1)
-}
+;(async () => {
+  let config
+  try {
+    config = loadConfig(configArg ?? process.cwd())
+  } catch (err) {
+    console.error('mesh:', err.message)
+    process.exit(1)
+  }
 
-const { services, rules, configPath } = config
+  const { services: rawServices, rules, configPath } = config
 
-writeHosts(services)
+  // Split into managed (command string) and static (port number) services.
+  // For managed services, find a guaranteed-free port and inject it via PORT env.
+  const managed  = {} // { [name]: { command, port } }
+  const services = {} // { [name]: port } — always numbers from here on
 
-const configDir = dirname(resolve(configPath))
-const certs     = ensureCerts(services, configDir)
-const servers   = startProxy(services, rules, certs)
+  for (const [name, value] of Object.entries(rawServices)) {
+    if (typeof value === 'string') {
+      const port     = await findFreePort()
+      managed[name]  = { command: value, port }
+      services[name] = port
+    } else {
+      services[name] = value
+    }
+  }
 
-writeFileSync(STATE_FILE, JSON.stringify({ pid: process.pid, configPath, services, rules, https: !!certs }))
+  const serviceManager = startServices(managed)
 
-// ── Crash safety — clean /etc/hosts even on unexpected exit ───────────────────
+  writeHosts(services)
 
-function shutdown(code = 0) {
-  removeHosts()
-  try { unlinkSync(STATE_FILE) } catch {}
-  servers.http.close()
-  servers.https?.close()
-  process.exit(code)
-}
+  const configDir = dirname(resolve(configPath))
+  const certs     = ensureCerts(services, configDir)
+  const servers   = startProxy(services, rules, certs)
 
-process.on('SIGINT',  () => { console.log('\n  mesh  cleaning up...'); shutdown(0) })
-process.on('SIGTERM', () => shutdown(0))
+  writeFileSync(STATE_FILE, JSON.stringify({ pid: process.pid, configPath, services, rules, https: !!certs }))
 
-process.on('uncaughtException', err => {
-  console.error('\n  mesh  uncaught exception:', err.message)
-  shutdown(1)
-})
+  // ── Crash safety — clean /etc/hosts even on unexpected exit ─────────────────
 
-process.on('unhandledRejection', err => {
-  console.error('\n  mesh  unhandled rejection:', err?.message ?? err)
-  shutdown(1)
-})
+  function shutdown(code = 0) {
+    serviceManager.stop()
+    removeHosts()
+    try { unlinkSync(STATE_FILE) } catch {}
+    servers.http.close()
+    servers.https?.close()
+    process.exit(code)
+  }
 
-// ── Hot-reload ────────────────────────────────────────────────────────────────
+  process.on('SIGINT',  () => { console.log('\n  mesh  cleaning up...'); shutdown(0) })
+  process.on('SIGTERM', () => shutdown(0))
 
-let reloadTimer
-watch(configPath, () => {
-  clearTimeout(reloadTimer)
-  reloadTimer = setTimeout(() => {
-    try {
-      const next = loadConfig(configPath)
+  process.on('uncaughtException', err => {
+    console.error('\n  mesh  uncaught exception:', err.message)
+    shutdown(1)
+  })
+
+  process.on('unhandledRejection', err => {
+    console.error('\n  mesh  unhandled rejection:', err?.message ?? err)
+    shutdown(1)
+  })
 
-      const hasNewServices = Object.keys(next.services).some(k => !services[k])
+  // ── Hot-reload ───────────────────────────────────────────────────────────────
+  // Managed service ports are fixed at startup — only static ports and rules reload.
 
-      Object.keys(services).forEach(k => delete services[k])
-      Object.assign(services, next.services)
-      Object.keys(rules).forEach(k => delete rules[k])
-      Object.assign(rules, next.rules)
+  let reloadTimer
+  watch(configPath, () => {
+    clearTimeout(reloadTimer)
+    reloadTimer = setTimeout(() => {
+      try {
+        const next = loadConfig(configPath)
 
-      writeHosts(services)
-      writeFileSync(STATE_FILE, JSON.stringify({ pid: process.pid, configPath, services, rules, https: !!certs }))
+        const hasNewServices = Object.keys(next.services).some(k => !services[k])
 
-      if (certs && hasNewServices) {
-        const newCerts = ensureCerts(services, configDir)
-        if (newCerts && servers.https) {
-          servers.https.setSecureContext({
-            cert: readFileSync(newCerts.certFile),
-            key:  readFileSync(newCerts.keyFile),
-          })
+        Object.keys(services).forEach(k => delete services[k])
+        for (const [name, value] of Object.entries(next.services)) {
+          // Preserve the already-assigned port for managed services
+          services[name] = managed[name]?.port ?? (typeof value === 'number' ? value : services[name])
+        }
+        Object.keys(rules).forEach(k => delete rules[k])
+        Object.assign(rules, next.rules)
+
+        writeHosts(services)
+        writeFileSync(STATE_FILE, JSON.stringify({ pid: process.pid, configPath, services, rules, https: !!certs }))
+
+        if (certs && hasNewServices) {
+          const newCerts = ensureCerts(services, configDir)
+          if (newCerts && servers.https) {
+            servers.https.setSecureContext({
+              cert: readFileSync(newCerts.certFile),
+              key:  readFileSync(newCerts.keyFile),
+            })
+          }
         }
-      }
 
-      console.log('\n  mesh  config reloaded\n')
-    } catch (err) {
-      console.error('\n  mesh  config reload failed:', err.message, '\n')
-    }
-  }, 100)
-})
+        console.log('\n  mesh  config reloaded\n')
+      } catch (err) {
+        console.error('\n  mesh  config reload failed:', err.message, '\n')
+      }
+    }, 100)
+  })
+})()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avelor/mesh",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Local dev proxy. Named services, failure rules, no ports.",
   "keywords": [
     "proxy",

package/src/config.js

@@ -33,11 +33,17 @@ export function loadConfig(cwdOrFile = process.cwd()) {
     if (!NAME_RE.test(name)) {
       throw new Error(`invalid service name "${name}" — only a-z, 0-9, hyphens and dots allowed`)
     }
-    const port = Number(raw)
-    if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    if (typeof raw === 'string') {
+      if (!raw.trim()) throw new Error(`service "${name}" command cannot be empty`)
+      services[name] = raw.trim()
+    } else if (typeof raw === 'number') {
+      if (!Number.isInteger(raw) || raw < 1 || raw > 65535) {
+        throw new Error(`invalid port for service "${name}": ${raw}`)
+      }
+      services[name] = raw
+    } else {
       throw new Error(`invalid port for service "${name}": ${raw}`)
     }
-    services[name] = port
   }
 
   const rules = {}

package/src/init.js

@@ -39,5 +39,5 @@ export function init(cwd = process.cwd()) {
     }
   }
 
-  console.log('      edit your services and run: sudo mesh route')
+  console.log('      edit your services and run: mesh route')
 }

package/src/proxy.js

@@ -6,20 +6,36 @@ import httpProxy        from 'http-proxy'
 import { matchRule, applyRule } from './rules.js'
 import { wantsHtml, errorPage } from './error-page.js'
 
-const hostCache = new Map()
+// Maps configuredPort → { host, port } — cleared on ECONNREFUSED so next
+// request re-discovers if the service moved to a different port.
+const endpointCache = new Map()
+const SCAN_RANGE = 10
 
-function probeHost(port) {
-  if (hostCache.has(port)) return Promise.resolve(hostCache.get(port))
+function probePort(port) {
   const probe = addr => new Promise((resolve, reject) => {
     const s = net.connect(port, addr)
-    s.setTimeout(200)
+    s.setTimeout(100)
     s.on('connect', () => { s.destroy(); resolve(addr) })
-    s.on('timeout',  () => { s.destroy(); reject(new Error('timeout')) })
+    s.on('timeout',  () => { s.destroy(); reject() })
     s.on('error', reject)
   })
-  return Promise.any([probe('127.0.0.1'), probe('::1')])
-    .then(host => { hostCache.set(port, host); return host })
-    .catch(() => '127.0.0.1')
+  return Promise.any([probe('127.0.0.1'), probe('::1')]).catch(() => null)
+}
+
+async function resolveEndpoint(configuredPort) {
+  const cached = endpointCache.get(configuredPort)
+  if (cached) return cached
+
+  // Probe configured port and the next SCAN_RANGE ports concurrently.
+  // results preserves order so .find() returns the closest open port.
+  const candidates = Array.from({ length: SCAN_RANGE + 1 }, (_, i) => configuredPort + i)
+  const results    = await Promise.all(
+    candidates.map(port => probePort(port).then(host => host ? { host, port } : null))
+  )
+
+  const found = results.find(r => r !== null) ?? { host: '127.0.0.1', port: configuredPort }
+  endpointCache.set(configuredPort, found)
+  return found
 }
 
 function fmtHost(host) {
@@ -38,6 +54,9 @@ export function startProxy(services, rules, certs = null) {
 
   proxy.on('error', (err, req, res) => {
     const { name, target } = resolveService(req.headers.host)
+    if (err.code === 'ECONNREFUSED' || err.code === 'ECONNRESET') {
+      endpointCache.delete(target)
+    }
     log(RED, 'ERR', name, req.url, `→ ${err.code ?? err.message}`)
     if (!res.headersSent) {
       const protocol = certs ? 'https' : 'http'
@@ -86,19 +105,24 @@ export function startProxy(services, rules, certs = null) {
       log(YELLOW, `${rule.delay}ms`, name, pathname, `→ :${target} (delayed)`)
     }
 
-    const host = await probeHost(target)
-    proxy.web(req, res, { target: `http://${fmtHost(host)}:${target}` })
-    if (!rule) log(DIM, '→', name, pathname, `→ :${target}`)
+    const endpoint = await resolveEndpoint(target)
+    proxy.web(req, res, { target: `http://${fmtHost(endpoint.host)}:${endpoint.port}` })
+    if (!rule) {
+      const portLabel = endpoint.port !== target
+        ? `:${endpoint.port} ${DIM}(shifted from :${target})${RESET}`
+        : `:${target}`
+      log(DIM, '→', name, pathname, `→ ${portLabel}`)
+    }
   }
 
   async function handleUpgrade(req, socket, head) {
     const { name, target } = resolveService(req.headers.host)
     if (!target) { socket.destroy(); return }
-    const host = await probeHost(target)
-    proxy.ws(req, socket, head, { target: `ws://${fmtHost(host)}:${target}` }, err => {
+    const endpoint = await resolveEndpoint(target)
+    proxy.ws(req, socket, head, { target: `ws://${fmtHost(endpoint.host)}:${endpoint.port}` }, err => {
       if (err) log(RED, 'WSE', name, req.url, `→ ${err.code ?? err.message}`)
     })
-    log(DIM, 'WS', name, req.url, `→ :${target}`)
+    log(DIM, 'WS', name, req.url, `→ :${endpoint.port}`)
   }
 
   const httpServer = http.createServer((req, res) => {

package/src/services.js

@@ -0,0 +1,91 @@
+import { spawn } from 'child_process'
+import net       from 'net'
+
+const RESET  = '\x1b[0m'
+const DIM    = '\x1b[2m'
+const CYAN   = '\x1b[36m'
+const YELLOW = '\x1b[33m'
+const RED    = '\x1b[31m'
+
+export function findFreePort() {
+  return new Promise((resolve, reject) => {
+    const server = net.createServer()
+    server.listen(0, '127.0.0.1', () => {
+      const { port } = server.address()
+      server.close(() => resolve(port))
+    })
+    server.on('error', reject)
+  })
+}
+
+export function startServices(managed) {
+  // managed: { [name]: { command: string, port: number } }
+  if (!Object.keys(managed).length) return { stop() {} }
+
+  let stopping = false
+  const children = new Map()
+
+  function logLine(name, line) {
+    if (!line.trim()) return
+    const time = new Date().toTimeString().slice(0, 8)
+    process.stdout.write(`  ${DIM}${time}${RESET}  ${CYAN}${name}${RESET}  ${DIM}│${RESET} ${line}\n`)
+  }
+
+  function launch(name, command, port, restartCount = 0, startedAt = Date.now()) {
+    const child = spawn(command, [], {
+      env:   { ...process.env, PORT: String(port), HOST: '127.0.0.1' },
+      shell: true,
+      stdio: ['ignore', 'pipe', 'pipe'],
+    })
+
+    children.set(name, child)
+
+    let buffer = ''
+    function flush(chunk) {
+      buffer += String(chunk)
+      const lines = buffer.split('\n')
+      buffer = lines.pop()
+      for (const line of lines) logLine(name, line)
+    }
+
+    child.stdout.on('data', flush)
+    child.stderr.on('data', flush)
+
+    child.on('exit', (code, signal) => {
+      if (buffer.trim()) logLine(name, buffer)
+      buffer = ''
+      if (stopping) return
+
+      const uptime    = Date.now() - startedAt
+      const nextCount = uptime > 10_000 ? 0 : restartCount + 1
+      const delay     = Math.min(1000 * 2 ** nextCount, 10_000)
+      const time      = new Date().toTimeString().slice(0, 8)
+
+      console.log(
+        `  ${DIM}${time}${RESET}  ${RED}${name}${RESET}  ` +
+        `${DIM}exited (${code ?? signal}) — restarting in ${delay / 1000}s${RESET}`
+      )
+
+      setTimeout(() => {
+        if (!stopping) launch(name, command, port, nextCount, Date.now())
+      }, delay)
+    })
+
+    const time = new Date().toTimeString().slice(0, 8)
+    const label = restartCount === 0 ? CYAN : YELLOW
+    console.log(`  ${DIM}${time}${RESET}  ${label}${name}${RESET}  ${DIM}→ :${port}  $ ${command}${RESET}`)
+  }
+
+  for (const [name, { command, port }] of Object.entries(managed)) {
+    launch(name, command, port)
+  }
+
+  return {
+    stop() {
+      stopping = true
+      for (const child of children.values()) {
+        try { child.kill('SIGTERM') } catch {}
+      }
+    },
+  }
+}