@swarmclawai/swarmclaw 1.0.3 → 1.0.4

package/bin/server-cmd.js

@@ -3,6 +3,7 @@
 /* eslint-disable @typescript-eslint/no-require-imports */
 
 const fs = require('node:fs')
+const http = require('node:http')
 const path = require('node:path')
 const { spawn, execFileSync } = require('node:child_process')
 const {
@@ -72,6 +73,62 @@ function isProcessRunning(pid) {
   }
 }
 
+function resolveReadyCheckHost(host) {
+  if (host === '0.0.0.0') return '127.0.0.1'
+  if (host === '::') return '::1'
+  return host
+}
+
+function probeHttpReady(host, port, timeoutMs = 1_000) {
+  return new Promise((resolve) => {
+    const req = http.request(
+      {
+        host,
+        port: Number(port),
+        path: '/api/auth',
+        method: 'GET',
+        timeout: timeoutMs,
+      },
+      (res) => {
+        res.resume()
+        resolve(res.statusCode >= 200 && res.statusCode < 500)
+      },
+    )
+
+    req.once('timeout', () => {
+      req.destroy()
+      resolve(false)
+    })
+    req.once('error', () => resolve(false))
+    req.end()
+  })
+}
+
+async function waitForPortReady({
+  host,
+  port,
+  timeoutMs = 30_000,
+  intervalMs = 250,
+  pid = null,
+  isProcessRunningFn = isProcessRunning,
+  probeFn = probeHttpReady,
+} = {}) {
+  const readyHost = resolveReadyCheckHost(host)
+  const deadline = Date.now() + timeoutMs
+
+  while (Date.now() < deadline) {
+    if (pid && !isProcessRunningFn(pid)) {
+      throw new Error(`Detached server process ${pid} exited before becoming ready.`)
+    }
+
+    if (await probeFn(readyHost, port)) return
+
+    await new Promise((resolve) => setTimeout(resolve, intervalMs))
+  }
+
+  throw new Error(`Timed out waiting for ${readyHost}:${port} to become ready.`)
+}
+
 function resolveStandaloneBase(pkgRoot = PKG_ROOT) {
   return path.join(pkgRoot, '.next', 'standalone')
 }
@@ -241,7 +298,7 @@ function findStandaloneServer({ pkgRoot = PKG_ROOT } = {}) {
 // Start server
 // ---------------------------------------------------------------------------
 
-function startServer(opts, { pkgRoot = PKG_ROOT } = {}) {
+async function startServer(opts, { pkgRoot = PKG_ROOT } = {}) {
   const standalone = locateStandaloneServer({ pkgRoot })
   if (!standalone) {
     logError('Standalone server.js not found in the installed package. Try running: swarmclaw server --build')
@@ -282,11 +339,22 @@ function startServer(opts, { pkgRoot = PKG_ROOT } = {}) {
       stdio: ['ignore', logStream, logStream],
     })
 
-    child.unref()
     fs.writeFileSync(PID_FILE, String(child.pid))
-    log(`Server started in background (PID: ${child.pid})`)
-    log(`Logs: ${LOG_FILE}`)
-    process.exit(0)
+    try {
+      await waitForPortReady({ host, port, pid: child.pid })
+      child.unref()
+      log(`Server started in background (PID: ${child.pid})`)
+      log(`Logs: ${LOG_FILE}`)
+      process.exit(0)
+    } catch (err) {
+      try {
+        if (isProcessRunning(child.pid)) process.kill(child.pid, 'SIGTERM')
+      } catch {}
+      try { fs.unlinkSync(PID_FILE) } catch {}
+      logError(`Detached start failed: ${err.message}`)
+      logError(`Check logs: ${LOG_FILE}`)
+      process.exit(1)
+    }
   } else {
     const child = spawn(process.execPath, [serverJs], {
       cwd: runtimeRoot,
@@ -386,7 +454,7 @@ Options:
   console.log(help)
 }
 
-function main(args = process.argv.slice(3)) {
+async function main(args = process.argv.slice(3)) {
   let command = 'start'
   let forceBuild = false
   let detach = false
@@ -446,11 +514,14 @@ function main(args = process.argv.slice(3)) {
     }
   }
 
-  startServer({ port, wsPort, host, detach })
+  await startServer({ port, wsPort, host, detach })
 }
 
 if (require.main === module) {
-  main()
+  void main().catch((err) => {
+    logError(err?.message || String(err))
+    process.exit(1)
+  })
 }
 
 module.exports = {
@@ -469,7 +540,9 @@ module.exports = {
   prepareBuildWorkspace,
   resolveInstalledNext,
   resolvePackageBuildRoot,
+  resolveReadyCheckHost,
   resolveStandaloneCandidateRoots,
   resolveStandaloneBase,
   runBuild,
+  waitForPortReady,
 }

package/bin/swarmclaw.js

@@ -128,7 +128,7 @@ async function runHelp(argv) {
   }
 
   if (target === 'run' || target === 'start' || target === 'stop' || target === 'status' || target === 'server') {
-    require('./server-cmd.js').main(['--help'])
+    await require('./server-cmd.js').main(['--help'])
     return
   }
   if (target === 'worker') {
@@ -164,7 +164,7 @@ async function main() {
 
   // Default to 'server' when invoked with no arguments.
   if (!top) {
-    require('./server-cmd.js').main([])
+    await require('./server-cmd.js').main([])
     return
   }
 
@@ -185,15 +185,15 @@ async function main() {
 
   // Route local lifecycle/maintenance commands to CJS scripts (no TS dependency).
   if (top === 'server') {
-    require('./server-cmd.js').main(argv.slice(1))
+    await require('./server-cmd.js').main(argv.slice(1))
     return
   }
   if (top === 'run' || top === 'start') {
-    require('./server-cmd.js').main(argv.slice(1))
+    await require('./server-cmd.js').main(argv.slice(1))
     return
   }
   if (top === 'status' || top === 'stop') {
-    require('./server-cmd.js').main([top, ...argv.slice(1)])
+    await require('./server-cmd.js').main([top, ...argv.slice(1)])
     return
   }
   if (top === 'worker') {
@@ -217,7 +217,10 @@ async function main() {
 }
 
 if (require.main === module) {
-  void main()
+  void main().catch((err) => {
+    process.stderr.write(`${err?.message || String(err)}\n`)
+    process.exit(1)
+  })
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmclawai/swarmclaw",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Self-hosted AI agent orchestration dashboard with OpenClaw integration, multi-provider support, LangGraph workflows, and chat platform connectors.",
   "license": "MIT",
   "publishConfig": {

package/src/cli/server-cmd.test.js

@@ -135,3 +135,56 @@ test('prepareBuildWorkspace copies the package tree and links node_modules outsi
   fs.rmSync(pkgRoot, { recursive: true, force: true })
   fs.rmSync(externalNodeModules, { recursive: true, force: true })
 })
+
+test('resolveReadyCheckHost maps wildcard bind hosts to loopback', () => {
+  const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'swarmclaw-server-home-'))
+  const serverCmd = loadServerCmdForHome(homeDir)
+
+  assert.equal(serverCmd.resolveReadyCheckHost('0.0.0.0'), '127.0.0.1')
+  assert.equal(serverCmd.resolveReadyCheckHost('::'), '::1')
+  assert.equal(serverCmd.resolveReadyCheckHost('127.0.0.1'), '127.0.0.1')
+
+  fs.rmSync(homeDir, { recursive: true, force: true })
+})
+
+test('waitForPortReady resolves once the readiness probe succeeds', async () => {
+  const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'swarmclaw-server-home-'))
+  const serverCmd = loadServerCmdForHome(homeDir)
+  const calls = []
+  let attempts = 0
+
+  await serverCmd.waitForPortReady({
+    host: '0.0.0.0',
+    port: 3456,
+    timeoutMs: 1_000,
+    intervalMs: 10,
+    probeFn: async (host, port) => {
+      calls.push({ host, port })
+      attempts += 1
+      return attempts >= 3
+    },
+  })
+
+  assert.deepEqual(calls[0], { host: '127.0.0.1', port: 3456 })
+  assert.equal(calls.length, 3)
+  fs.rmSync(homeDir, { recursive: true, force: true })
+})
+
+test('waitForPortReady fails fast when the detached process exits before readiness', async () => {
+  const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'swarmclaw-server-home-'))
+  const serverCmd = loadServerCmdForHome(homeDir)
+
+  await assert.rejects(
+    serverCmd.waitForPortReady({
+      host: '127.0.0.1',
+      port: 6553,
+      pid: 4242,
+      timeoutMs: 500,
+      intervalMs: 25,
+      isProcessRunningFn: () => false,
+    }),
+    /exited before becoming ready/,
+  )
+
+  fs.rmSync(homeDir, { recursive: true, force: true })
+})