commanderclaw 1.1.11 → 1.1.12

package/bin/commanderclaw.cjs

@@ -1,227 +1,2 @@
 #!/usr/bin/env node
-
-const path = require('path');
-const { spawn } = require('child_process');
-const os = require('os');
-const fs = require('fs');
-
-const command = process.argv[2];
-
-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();
-  
-  let normalizedArch = arch;
-  if (arch === 'x64' || arch === 'amd64') {
-    normalizedArch = 'x64';
-  } else if (arch === 'arm64' || arch === 'aarch64') {
-    normalizedArch = 'arm64';
-  }
-  
-  return `${platform}-${normalizedArch}`;
-}
-
-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(
-    __dirname,
-    '..',
-    'binaries',
-    platformId,
-    `coordination-server${ext}`
-  );
-  
-  if (!fs.existsSync(binaryPath)) {
-    console.error(`Error: Unsupported platform: ${platformId}`);
-    console.error('');
-    console.error('Supported platforms:');
-    console.error('  - darwin-x64 (macOS Intel)');
-    console.error('  - darwin-arm64 (macOS Apple Silicon)');
-    console.error('  - linux-x64 (Linux)');
-    console.error('  - win32-x64 (Windows)');
-    process.exit(1);
-  }
-  
-  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, {
-    detached: true,
-    stdio: ['ignore', logFile, logFile],
-    env: { ...process.env },
-  });
-  
-  child.unref();
-  fs.writeFileSync(SERVER_PID_FILE, String(child.pid));
-  
-  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);
-}
-
-else {
-  const cliPath = path.join(__dirname, '..', 'dist', 'cli', 'index.js');
-  
-  if (!fs.existsSync(cliPath)) {
-    console.error('Error: CLI not built. Run: npm run build');
-    process.exit(1);
-  }
-  
-  require(cliPath);
-}
+import('../dist/cli/index.js');

package/bin/web-server.cjs

@@ -1,8 +1,10 @@
 const http = require('http');
+const net = require('net');
 const fs = require('fs');
 const path = require('path');
 
-const PORT = process.env.PORT || 19730;
+const WEB_PORT = process.env.PORT || 19730;
+const SERVER_PORT = 19739;
 const WEB_DIR = path.join(__dirname, '..', 'web');
 
 const MIME_TYPES = {
@@ -16,6 +18,11 @@ const MIME_TYPES = {
 };
 
 const server = http.createServer((req, res) => {
+  if (req.url.startsWith('/api/')) {
+    proxyRequest(req, res, SERVER_PORT);
+    return;
+  }
+
   let filePath = path.join(WEB_DIR, req.url === '/' ? 'index.html' : req.url);
   const ext = path.extname(filePath).toLowerCase();
   const contentType = MIME_TYPES[ext] || 'application/octet-stream';
@@ -43,6 +50,87 @@ const server = http.createServer((req, res) => {
   });
 });
 
-server.listen(PORT, '0.0.0.0', () => {
-  console.log(`Web console running at http://127.0.0.1:${PORT}`);
+function proxyRequest(req, res, targetPort) {
+  const options = {
+    hostname: '127.0.0.1',
+    port: targetPort,
+    path: req.url,
+    method: req.method,
+    headers: {
+      ...req.headers,
+      host: `127.0.0.1:${targetPort}`,
+    },
+  };
+
+  const proxyReq = http.request(options, (proxyRes) => {
+    res.writeHead(proxyRes.statusCode, proxyRes.headers);
+    proxyRes.pipe(res);
+  });
+
+  proxyReq.on('error', (err) => {
+    console.error('Proxy error:', err.message);
+    res.writeHead(502);
+    res.end(JSON.stringify({ error: 'Bad Gateway' }));
+  });
+
+  req.pipe(proxyReq);
+}
+
+server.on('upgrade', (req, socket, head) => {
+  if (req.url === '/ws' || req.url.startsWith('/ws?')) {
+    const targetPort = SERVER_PORT;
+
+    const proxyReq = http.request({
+      hostname: '127.0.0.1',
+      port: targetPort,
+      path: req.url,
+      method: 'GET',
+      headers: {
+        ...req.headers,
+        host: `127.0.0.1:${targetPort}`,
+      },
+    });
+
+    proxyReq.on('response', (res) => {
+      res.pipe(socket);
+    });
+
+    proxyReq.on('upgrade', (proxyRes, proxySocket, proxyHead) => {
+      proxyRes.on('end', () => {
+        socket.end();
+      });
+
+      socket.on('error', (err) => {
+        proxySocket.end();
+      });
+
+      proxySocket.on('error', (err) => {
+        socket.end();
+      });
+
+      socket.write(
+        'HTTP/1.1 101 Switching Protocols\r\n' +
+        Object.entries(proxyRes.headers)
+          .map(([k, v]) => `${k}: ${v}`)
+          .join('\r\n') +
+        '\r\n\r\n'
+      );
+
+      proxySocket.pipe(socket);
+      socket.pipe(proxySocket);
+    });
+
+    proxyReq.on('error', (err) => {
+      console.error('WebSocket proxy error:', err.message);
+      socket.end();
+    });
+
+    proxyReq.end();
+  }
+});
+
+server.listen(WEB_PORT, '0.0.0.0', () => {
+  console.log(`Web console running at http://127.0.0.1:${WEB_PORT}`);
+  console.log(`Proxying /ws -> ws://127.0.0.1:${SERVER_PORT}/ws`);
+  console.log(`Proxying /api -> http://127.0.0.1:${SERVER_PORT}/api`);
 });

package/dist/cli/gateway.js

@@ -1,8 +1,12 @@
 import * as path from 'path';
 import * as fs from 'fs';
 import * as os from 'os';
+import * as http from 'http';
+import { fileURLToPath } from 'url';
 import { spawn, execSync } from 'child_process';
 import { getProjectRoot } from './utils.js';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 const SERVER_PORT = 19739;
 const WEB_PORT = 19730;
 const SERVER_PID_FILE = '/tmp/commanderclaw-server.pid';
@@ -108,7 +112,7 @@ function stopProcess(pidFile) {
     catch { }
     fs.unlinkSync(pidFile);
 }
-function gatewayStart() {
+async function gatewayStart() {
     const serverRunning = isProcessRunning(SERVER_PID_FILE);
     const webRunning = isProcessRunning(WEB_PID_FILE);
     if (serverRunning && webRunning) {
@@ -120,7 +124,14 @@ function gatewayStart() {
     if (!serverRunning) {
         process.stdout.write(`Starting server on port ${SERVER_PORT}... `);
         if (startServer()) {
-            console.log('OK');
+            const started = await waitForServer(SERVER_PORT, 5000);
+            if (started) {
+                console.log('OK');
+            }
+            else {
+                console.log('Failed (timeout waiting for server)');
+                process.exit(1);
+            }
         }
         else {
             console.log('Failed');
@@ -150,26 +161,58 @@ function gatewayStart() {
 function startServer() {
     try {
         const binaryPath = getBinaryPath();
-        const logFile = fs.openSync(SERVER_LOG_FILE, 'a');
+        if (!fs.existsSync(binaryPath)) {
+            console.error(`Server binary not found: ${binaryPath}`);
+            return false;
+        }
+        const logStream = fs.createWriteStream(SERVER_LOG_FILE, { flags: 'a' });
         const child = spawn(binaryPath, ['-port', String(SERVER_PORT)], {
             detached: true,
-            stdio: ['ignore', logFile, logFile],
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        child.stdout?.pipe(logStream);
+        child.stderr?.pipe(logStream);
+        child.on('error', (err) => {
+            console.error(`Failed to start server: ${err.message}`);
         });
         child.unref();
-        fs.writeFileSync(SERVER_PID_FILE, String(child.pid));
-        // Wait a bit to verify it started
-        setTimeout(() => {
-            if (!isProcessRunning(SERVER_PID_FILE)) {
-                console.log('\nServer process exited immediately. Check logs at ' + SERVER_LOG_FILE);
-                process.exit(1);
-            }
-        }, 500);
+        const pid = child.pid;
+        if (!pid) {
+            return false;
+        }
+        fs.writeFileSync(SERVER_PID_FILE, String(pid));
         return true;
     }
     catch (e) {
+        console.error(`Failed to start server: ${e.message}`);
         return false;
     }
 }
+function waitForServer(port, timeoutMs = 5000) {
+    return new Promise((resolve) => {
+        const startTime = Date.now();
+        const check = () => {
+            if (Date.now() - startTime > timeoutMs) {
+                resolve(false);
+                return;
+            }
+            const req = http.get(`http://127.0.0.1:${port}/api/health`, { timeout: 500 }, (res) => {
+                if (res.statusCode === 200) {
+                    resolve(true);
+                }
+                else {
+                    setTimeout(check, 200);
+                }
+            });
+            req.on('error', () => setTimeout(check, 200));
+            req.on('timeout', () => {
+                req.destroy();
+                setTimeout(check, 200);
+            });
+        };
+        check();
+    });
+}
 function startWeb() {
     try {
         const packageDir = path.dirname(path.dirname(__dirname));
@@ -212,12 +255,12 @@ function gatewayStop() {
     }
     console.log('Gateway stopped');
 }
-function gatewayRestart() {
+async function gatewayRestart() {
     console.log('Restarting gateway...');
     gatewayStop();
-    setTimeout(() => {
+    setTimeout(async () => {
         console.log();
-        gatewayStart();
+        await gatewayStart();
     }, 500);
 }
 function gatewayStatus() {

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.11';
+const VERSION = '1.1.12';
 function printUsage() {
     console.log('CommanderClaw - Multi-device Agent Coordination Framework');
     console.log();

package/dist/plugin/index.d.ts

@@ -8,7 +8,7 @@ declare const plugin: {
     id: string;
     name: string;
     description: string;
-    configSchema: import("openclaw/plugin-sdk").OpenClawPluginConfigSchema;
+    configSchema: any;
     register(api: any): void;
 };
 export default plugin;

package/package.json

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