commanderclaw 1.1.10 → 1.1.11

package/bin/commanderclaw.cjs

@@ -7,12 +7,17 @@ const fs = require('fs');
 
 const command = process.argv[2];
 
-// Helper to get platform identifier
+const SERVER_PORT = 19739;
+const WEB_PORT = 19730;
+const SERVER_PID_FILE = '/tmp/commanderclaw-server.pid';
+const WEB_PID_FILE = '/tmp/commanderclaw-web.pid';
+const SERVER_LOG_FILE = '/tmp/commanderclaw-server.log';
+const WEB_LOG_FILE = '/tmp/commanderclaw-web.log';
+
 function getPlatformId() {
   const platform = os.platform();
   const arch = os.arch();
   
-  // Normalize architecture
   let normalizedArch = arch;
   if (arch === 'x64' || arch === 'amd64') {
     normalizedArch = 'x64';
@@ -23,9 +28,25 @@ function getPlatformId() {
   return `${platform}-${normalizedArch}`;
 }
 
-// Gateway start uses pre-compiled binary
-// Other gateway commands use TypeScript implementation
-if (command === 'gateway' && process.argv[3] === 'start') {
+function isProcessRunning(pidFile) {
+  if (!fs.existsSync(pidFile)) {
+    return false;
+  }
+  
+  const pid = parseInt(fs.readFileSync(pidFile, 'utf-8').trim(), 10);
+  if (isNaN(pid)) {
+    return false;
+  }
+  
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function startServer() {
   const platformId = getPlatformId();
   const ext = os.platform() === 'win32' ? '.exe' : '';
   const binaryPath = path.join(
@@ -49,23 +70,151 @@ if (command === 'gateway' && process.argv[3] === 'start') {
   
   const configPath = path.join(__dirname, '..', 'configs', 'server.yaml');
   const args = ['-config', configPath, ...process.argv.slice(4)];
+  const logFile = fs.openSync(SERVER_LOG_FILE, 'a');
+  
   const child = spawn(binaryPath, args, {
-    stdio: 'inherit',
+    detached: true,
+    stdio: ['ignore', logFile, logFile],
     env: { ...process.env },
-    shell: os.platform() === 'win32'
   });
   
-  child.on('error', (err) => {
-    console.error('Failed to start server:', err.message);
-    process.exit(1);
-  });
+  child.unref();
+  fs.writeFileSync(SERVER_PID_FILE, String(child.pid));
   
-  child.on('exit', (code) => {
-    process.exit(code || 0);
+  return true;
+}
+
+function startWeb() {
+  const webServerPath = path.join(__dirname, 'web-server.cjs');
+  const webDir = path.join(__dirname, '..', 'web');
+  
+  if (!fs.existsSync(webDir)) {
+    console.log('(web directory not found, skipping)');
+    return true;
+  }
+  
+  const logFile = fs.openSync(WEB_LOG_FILE, 'a');
+  
+  const child = spawn('node', [webServerPath], {
+    detached: true,
+    stdio: ['ignore', logFile, logFile],
+    env: { ...process.env, PORT: String(WEB_PORT) },
   });
+  
+  child.unref();
+  fs.writeFileSync(WEB_PID_FILE, String(child.pid));
+  
+  return true;
+}
+
+if (command === 'gateway' && process.argv[3] === 'start') {
+  const serverRunning = isProcessRunning(SERVER_PID_FILE);
+  const webRunning = isProcessRunning(WEB_PID_FILE);
+  
+  if (serverRunning && webRunning) {
+    console.log('Gateway is already running');
+    console.log(`  Server:     http://127.0.0.1:${SERVER_PORT}`);
+    console.log(`  Web Console: http://127.0.0.1:${WEB_PORT}`);
+    process.exit(0);
+  }
+  
+  if (!serverRunning) {
+    process.stdout.write(`Starting server on port ${SERVER_PORT}... `);
+    if (startServer()) {
+      console.log('OK');
+    } else {
+      console.log('Failed');
+      process.exit(1);
+    }
+  }
+  
+  if (!webRunning) {
+    process.stdout.write(`Starting web console on port ${WEB_PORT}... `);
+    if (startWeb()) {
+      console.log('OK');
+    } else {
+      console.log('Failed');
+      process.exit(1);
+    }
+  }
+  
+  console.log();
+  console.log('Gateway started successfully!');
+  console.log(`  Server:     http://127.0.0.1:${SERVER_PORT}`);
+  console.log(`  WebSocket:  ws://127.0.0.1:${SERVER_PORT}/ws`);
+  console.log(`  Web Console: http://127.0.0.1:${WEB_PORT}`);
+  console.log();
+  console.log('Logs:');
+  console.log(`  Server: ${SERVER_LOG_FILE}`);
+  console.log(`  Web:    ${WEB_LOG_FILE}`);
+  process.exit(0);
+}
+
+else if (command === 'gateway' && process.argv[3] === 'stop') {
+  process.stdout.write('Stopping web console... ');
+  if (isProcessRunning(WEB_PID_FILE)) {
+    const pid = parseInt(fs.readFileSync(WEB_PID_FILE, 'utf-8').trim(), 10);
+    try {
+      process.kill(pid, 'SIGTERM');
+    } catch {}
+    fs.unlinkSync(WEB_PID_FILE);
+    console.log('OK');
+  } else {
+    console.log('(not running)');
+  }
+  
+  process.stdout.write('Stopping server... ');
+  if (isProcessRunning(SERVER_PID_FILE)) {
+    const pid = parseInt(fs.readFileSync(SERVER_PID_FILE, 'utf-8').trim(), 10);
+    try {
+      process.kill(pid, 'SIGTERM');
+    } catch {}
+    fs.unlinkSync(SERVER_PID_FILE);
+    console.log('OK');
+  } else {
+    console.log('(not running)');
+  }
+  
+  console.log('Gateway stopped');
+  process.exit(0);
+}
+
+else if (command === 'gateway' && process.argv[3] === 'status') {
+  console.log('CommanderClaw Gateway Status');
+  console.log('-'.repeat(40));
+  
+  const serverRunning = isProcessRunning(SERVER_PID_FILE);
+  const webRunning = isProcessRunning(WEB_PID_FILE);
+  
+  let serverStatus = 'stopped';
+  let serverPid = '';
+  if (serverRunning) {
+    serverStatus = 'running';
+    serverPid = fs.readFileSync(SERVER_PID_FILE, 'utf-8').trim();
+  }
+  
+  let webStatus = 'stopped';
+  let webPid = '';
+  if (webRunning) {
+    webStatus = 'running';
+    webPid = fs.readFileSync(WEB_PID_FILE, 'utf-8').trim();
+  }
+  
+  console.log(`Server (port ${SERVER_PORT}):  ${serverStatus}${serverPid ? ` (PID: ${serverPid})` : ''}`);
+  console.log(`Web (port ${WEB_PORT}):    ${webStatus}${webPid ? ` (PID: ${webPid})` : ''}`);
+  
+  if (serverRunning) {
+    console.log();
+    console.log(`Server URL:   http://127.0.0.1:${SERVER_PORT}`);
+    console.log(`WebSocket:    ws://127.0.0.1:${SERVER_PORT}/ws`);
+  }
+  
+  if (webRunning) {
+    console.log(`Web Console:  http://127.0.0.1:${WEB_PORT}`);
+  }
+  process.exit(0);
 }
 
-// Other commands use TypeScript implementation
 else {
   const cliPath = path.join(__dirname, '..', 'dist', 'cli', 'index.js');
   

package/dist/cli/index.js

@@ -1,7 +1,7 @@
 import { handleGateway } from './gateway.js';
 import { handlePlugin } from './plugin.js';
 import { handleConfig } from './config.js';
-const VERSION = '1.1.9';
+const VERSION = '1.1.11';
 function printUsage() {
     console.log('CommanderClaw - Multi-device Agent Coordination Framework');
     console.log();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commanderclaw",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "Multi-device Agent Coordination Framework - CLI and OpenClaw/QClaw Plugin",
   "type": "module",
   "bin": {