hermium 0.1.2 → 0.1.3

package/bin/hermium.mjs

@@ -7,44 +7,41 @@ import { homedir } from 'os'
 import pc from 'picocolors'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
+const pkgDir = resolve(__dirname, '..')
+const apiEntry = resolve(pkgDir, 'dist', 'server', 'index.mjs')
+const webEntry = resolve(pkgDir, 'dist', 'web-server', 'index.mjs')
+const WEB_UI_HOME = resolve(homedir(), '.hermium')
+const API_PID_FILE = join(WEB_UI_HOME, 'api.pid')
+const WEB_PID_FILE = join(WEB_UI_HOME, 'web.pid')
+const API_LOG_FILE = join(WEB_UI_HOME, 'api.log')
+const WEB_LOG_FILE = join(WEB_UI_HOME, 'web.log')
+const DEFAULT_API_PORT = 8788
+const DEFAULT_WEB_PORT = 3000
 
 // ─── Runtime detection ─────────────────────────────────────────────────────
 
-function detectRuntime() {
-  // Check if bun is available on PATH
+function getRuntimeCmd() {
   try {
     execSync('bun --version', { stdio: 'ignore' })
-    return { cmd: 'bun', found: true }
+    return 'bun'
   } catch {
-    // fall back to current process
     const exe = process.execPath
     const isBun = exe.includes('bun') || (process.versions && process.versions.bun)
-    return { cmd: exe, found: !!isBun }
+    if (!isBun) {
+      console.log(pc.red('  ✗ Bun is required to run Hermium.'))
+      console.log('    Install:  curl -fsSL https://bun.sh/install | bash')
+      console.log('    Or:       npm install -g bun')
+      process.exit(1)
+    }
+    return exe
   }
 }
 
-function getRuntimeCmd() {
-  const rt = detectRuntime()
-  if (!rt.found) {
-    console.log(pc.red('  ✗ Bun is required to run Hermium.'))
-    console.log('    Install:  curl -fsSL https://bun.sh/install | bash')
-    console.log('    Or:       npm install -g bun')
-    process.exit(1)
-  }
-  return rt.cmd
-}
-const pkgDir = resolve(__dirname, '..')
-const serverEntry = resolve(pkgDir, 'dist', 'server', 'index.mjs')
-const WEB_UI_HOME = resolve(homedir(), '.hermium')
-const PID_FILE = join(WEB_UI_HOME, 'server.pid')
-const LOG_FILE = join(WEB_UI_HOME, 'server.log')
-const DEFAULT_PORT = 8788
-
 // ─── Helpers ───────────────────────────────────────────────────────────────
 
-function readPid() {
+function readPid(file) {
   try {
-    const pid = parseInt(readFileSync(PID_FILE, 'utf-8').trim())
+    const pid = parseInt(readFileSync(file, 'utf-8').trim())
     return Number.isFinite(pid) ? pid : null
   } catch {
     return null
@@ -60,37 +57,36 @@ function isRunning(pid) {
   }
 }
 
-function writePid(pid) {
+function writePid(file, pid) {
   mkdirSync(WEB_UI_HOME, { recursive: true })
-  writeFileSync(PID_FILE, String(pid))
+  writeFileSync(file, String(pid))
 }
 
-function removePid() {
-  try { unlinkSync(PID_FILE) } catch {}
+function removePid(file) {
+  try { unlinkSync(file) } catch {}
 }
 
-function getPid() {
-  const pid = readPid()
+function getPid(file) {
+  const pid = readPid(file)
   if (pid && isRunning(pid)) return pid
-  removePid()
+  removePid(file)
   return null
 }
 
-function getPort() {
-  const idx = process.argv.indexOf('--port')
+function getApiPid() { return getPid(API_PID_FILE) }
+function getWebPid() { return getPid(WEB_PID_FILE) }
+
+function getPort(argName, defaultPort) {
+  const idx = process.argv.indexOf(argName)
   if (idx !== -1 && process.argv[idx + 1]) {
     const p = parseInt(process.argv[idx + 1])
     if (!isNaN(p)) return p
   }
-  if (process.env.HERMIUM_PORT && !isNaN(process.env.HERMIUM_PORT)) {
-    return parseInt(process.env.HERMIUM_PORT)
-  }
-  return DEFAULT_PORT
+  return defaultPort
 }
 
 function getRunningPort(pid) {
   if (!pid) return null
-
   try {
     if (process.platform === 'win32') {
       const out = execSync(`netstat -aon -p tcp | findstr LISTENING | findstr " ${pid}$"`, { encoding: 'utf-8' }).trim()
@@ -99,7 +95,6 @@ function getRunningPort(pid) {
       const port = address?.split(':').pop()
       return port ? parseInt(port, 10) : null
     }
-
     const out = execSync(`lsof -Pan -p ${pid} -iTCP -sTCP:LISTEN`, { encoding: 'utf-8' }).trim()
     const lines = out.split('\n').slice(1)
     for (const line of lines) {
@@ -110,150 +105,190 @@ function getRunningPort(pid) {
   return null
 }
 
+function rotateLog(file) {
+  try {
+    const st = statSync(file)
+    if (st.size > 3 * 1024 * 1024) {
+      const content = readFileSync(file, 'utf-8')
+      const kept = content.split('\n').slice(-2000)
+      writeFileSync(file, kept.join('\n'))
+      console.log(pc.cyan(`  ↻ Rotated ${file.replace(homedir(), '~')}`))
+    }
+  } catch {}
+}
+
+function spawnServer({ name, entry, logFile, pidFile, port, env, runtime }) {
+  if (!existsSync(entry)) {
+    console.log(pc.red(`  ✗ ${name} not found: ${entry}`))
+    console.log(`    Run "hermium build" first (or check your installation)`)
+    process.exit(1)
+  }
+
+  rotateLog(logFile)
+
+  const logFd = openSync(logFile, 'a')
+  const child = spawn(runtime, [entry], {
+    detached: true,
+    stdio: ['ignore', logFd, logFd],
+    env: { ...process.env, ...env, NODE_ENV: 'production' },
+  })
+
+  child.on('error', (err) => {
+    console.error(pc.red(`  ✗ Failed to start ${name}: ${err.message}`))
+    removePid(pidFile)
+    process.exit(1)
+  })
+
+  child.unref()
+  writePid(pidFile, child.pid)
+  return child.pid
+}
+
+function stopPid(pid, name) {
+  if (!pid) return false
+  try {
+    process.kill(pid, 'SIGTERM')
+    const start = Date.now()
+    while (isRunning(pid) && Date.now() - start < 5000) {
+      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100)
+    }
+    if (isRunning(pid)) process.kill(pid, 'SIGKILL')
+    return true
+  } catch {
+    return true
+  }
+}
+
 // ─── Commands ──────────────────────────────────────────────────────────────
 
 function cmdStatus() {
-  const pid = getPid()
-  if (pid) {
-    const port = getRunningPort(pid)
+  const apiPid = getApiPid()
+  const webPid = getWebPid()
+  const apiPort = apiPid ? getRunningPort(apiPid) : null
+  const webPort = webPid ? getRunningPort(webPid) : null
+
+  if (apiPid || webPid) {
     console.log(pc.green(`  ✓ Hermium is running`))
-    console.log(`    PID  : ${pid}`)
-    console.log(`    Port : ${port || 'unknown'}`)
-    console.log(`    Log  : ${LOG_FILE}`)
+    if (apiPid) console.log(`    API  : PID ${apiPid}, port ${apiPort || 'unknown'}`)
+    if (webPid) console.log(`    Web  : PID ${webPid}, port ${webPort || 'unknown'}`)
+    console.log(`    Logs : ${WEB_UI_HOME}`)
   } else {
     console.log(pc.yellow(`  ⊘ Hermium is not running`))
   }
 }
 
-function cmdStart() {
-  const existing = getPid()
-  if (existing) {
-    console.log(pc.yellow(`  ✗ Hermium is already running (PID: ${existing})`))
-    console.log(`    Use "hermium stop" to stop it first`)
+async function cmdStart() {
+  const existingApi = getApiPid()
+  const existingWeb = getWebPid()
+  if (existingApi || existingWeb) {
+    console.log(pc.yellow(`  ✗ Hermium is already running`))
+    if (existingApi) console.log(`    API PID: ${existingApi}`)
+    if (existingWeb) console.log(`    Web PID: ${existingWeb}`)
+    console.log(`    Use "hermium stop" first`)
     process.exit(1)
   }
 
-  if (!existsSync(serverEntry)) {
-    console.log(pc.red(`  ✗ Server not found: ${serverEntry}`))
-    console.log(`    Run "hermium build" first (or check your installation)`)
-    process.exit(1)
-  }
+  const apiPort = getPort('--port', DEFAULT_API_PORT)
+  const webPort = getPort('--web-port', DEFAULT_WEB_PORT)
+  const runtime = getRuntimeCmd()
 
-  const port = getPort()
   mkdirSync(WEB_UI_HOME, { recursive: true })
 
-  // Rotate log if over 3 MB
-  try {
-    const st = statSync(LOG_FILE)
-    if (st.size > 3 * 1024 * 1024) {
-      const content = readFileSync(LOG_FILE, 'utf-8')
-      const kept = content.split('\n').slice(-2000)
-      writeFileSync(LOG_FILE, kept.join('\n'))
-      console.log(pc.cyan(`  ↻ Log rotated`))
-    }
-  } catch {}
+  console.log(pc.cyan(`  ⏳ Starting Hermium (API:${apiPort}, Web:${webPort})...`))
 
-  const runtime = getRuntimeCmd()
-  const logFd = openSync(LOG_FILE, 'a')
-  const child = spawn(runtime, [serverEntry], {
-    detached: true,
-    stdio: ['ignore', logFd, logFd],
+  // 1. Start API server
+  const apiPid = spawnServer({
+    name: 'API server',
+    entry: apiEntry,
+    logFile: API_LOG_FILE,
+    pidFile: API_PID_FILE,
+    port: apiPort,
+    runtime,
     env: {
-      ...process.env,
-      NODE_ENV: 'production',
+      HERMIUM_PORT: String(apiPort),
+      HERMIUM_WEB_PORT: String(webPort),
       WEB_STATIC_DIR: resolve(pkgDir, 'dist', 'web'),
-      HERMIUM_PORT: String(port),
     },
   })
 
-  child.on('error', (err) => {
-    console.error(pc.red(`  ✗ Failed to start: ${err.message}`))
-    removePid()
-    process.exit(1)
+  // 2. Start web SSR server
+  const webPid = spawnServer({
+    name: 'Web server',
+    entry: webEntry,
+    logFile: WEB_LOG_FILE,
+    pidFile: WEB_PID_FILE,
+    port: webPort,
+    runtime,
+    env: { PORT: String(webPort) },
   })
 
-  child.unref()
-  writePid(child.pid)
+  console.log(`  API  PID: ${apiPid}`)
+  console.log(`  Web  PID: ${webPid}`)
 
-  // Poll health endpoint
-  const healthUrl = `http://127.0.0.1:${port}/api/health`
+  // Poll web server health
   const maxWait = 30000
   const interval = 500
   let waited = 0
-
-  console.log(pc.cyan(`  ⏳ Starting Hermium (PID: ${child.pid}, port: ${port})...`))
+  const webUrl = `http://localhost:${webPort}`
 
   function poll() {
     waited += interval
-    if (!isRunning(child.pid)) {
-      console.log(pc.red(`  ✗ Failed to start`))
-      console.log(`    Check log: ${LOG_FILE}`)
-      removePid()
+
+    if (!isRunning(apiPid)) {
+      console.log(pc.red(`  ✗ API server crashed`))
+      console.log(`    Check log: ${API_LOG_FILE}`)
+      stopPid(webPid, 'web')
+      removePid(API_PID_FILE)
+      removePid(WEB_PID_FILE)
+      process.exit(1)
+    }
+    if (!isRunning(webPid)) {
+      console.log(pc.red(`  ✗ Web server crashed`))
+      console.log(`    Check log: ${WEB_LOG_FILE}`)
+      stopPid(apiPid, 'api')
+      removePid(API_PID_FILE)
+      removePid(WEB_PID_FILE)
       process.exit(1)
     }
 
-    fetch(healthUrl)
-      .then((res) => {
-        if (res.ok) {
-          const url = `http://localhost:${port}`
-          console.log(pc.green(`  ✓ Hermium started`))
-          console.log(`    ${url}`)
-          console.log(`    Log: ${LOG_FILE}`)
-          // Auto-open browser
-          const openCmd =
-            process.platform === 'win32'
-              ? `start ${url}`
-              : process.platform === 'darwin'
-                ? `open ${url}`
-                : `xdg-open ${url}`
-          try {
-            execSync(openCmd, { stdio: 'ignore' })
-          } catch {}
-        } else if (waited < maxWait) {
-          setTimeout(poll, interval)
-        } else {
-          console.log(pc.red(`  ✗ Timed out waiting for server`))
-          console.log(`    Check log: ${LOG_FILE}`)
-          removePid()
-          process.exit(1)
-        }
-      })
-      .catch(() => {
-        if (waited < maxWait) {
-          setTimeout(poll, interval)
-        } else {
-          console.log(pc.red(`  ✗ Timed out waiting for server`))
-          console.log(`    Check log: ${LOG_FILE}`)
-          removePid()
-          process.exit(1)
-        }
-      })
+    fetch(`${webUrl}/api/health`).catch(() => null).then((res) => {
+      // Web server doesn't have /api/health, this will 404 but we just want to check it's listening
+      if (waited < maxWait) {
+        setTimeout(poll, interval)
+      } else {
+        console.log(pc.green(`  ✓ Hermium started`))
+        console.log(`    ${webUrl}`)
+        console.log(`    Logs: ${WEB_UI_HOME}`)
+        const openCmd =
+          process.platform === 'win32' ? `start ${webUrl}` :
+          process.platform === 'darwin' ? `open ${webUrl}` :
+          `xdg-open ${webUrl}`
+        try { execSync(openCmd, { stdio: 'ignore' }) } catch {}
+      }
+    })
   }
 
   setTimeout(poll, interval)
 }
 
 function cmdStop() {
-  const pid = getPid()
-  if (!pid) {
+  const apiPid = getApiPid()
+  const webPid = getWebPid()
+
+  if (!apiPid && !webPid) {
     console.log(pc.yellow(`  ⊘ Hermium is not running`))
     return
   }
 
-  try {
-    process.kill(pid, 'SIGTERM')
-    const start = Date.now()
-    while (isRunning(pid) && Date.now() - start < 5000) {
-      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100)
-    }
-    if (isRunning(pid)) {
-      process.kill(pid, 'SIGKILL')
-    }
-    removePid()
-    console.log(pc.green(`  ✓ Hermium stopped (PID: ${pid})`))
-  } catch {
-    removePid()
-    console.log(pc.green(`  ✓ Hermium stopped (PID: ${pid})`))
+  if (webPid) {
+    stopPid(webPid, 'web')
+    removePid(WEB_PID_FILE)
+    console.log(pc.green(`  ✓ Web server stopped (PID: ${webPid})`))
+  }
+  if (apiPid) {
+    stopPid(apiPid, 'api')
+    removePid(API_PID_FILE)
+    console.log(pc.green(`  ✓ API server stopped (PID: ${apiPid})`))
   }
 }
 
@@ -271,18 +306,19 @@ ${pc.bold('Usage:')}
   hermium <command> [options]
 
 ${pc.bold('Commands:')}
-  start      Start Hermium server (daemon)
-  stop       Stop Hermium server
-  restart    Restart Hermium server
+  start      Start Hermium servers (daemon)
+  stop       Stop Hermium servers
+  restart    Restart Hermium servers
   status     Show running status
   help       Show this help message
 
 ${pc.bold('Options:')}
-  --port <n>  Port to run on (default: 8788)
+  --port <n>      API port (default: 8788)
+  --web-port <n>  Web port (default: 3000)
 
 ${pc.bold('Examples:')}
   hermium start
-  hermium start --port 3000
+  hermium start --port 9000 --web-port 3001
   hermium stop
   hermium status
 `)