indieclaw-agent 2.2.0 → 2.4.0

package/index.js

@@ -143,64 +143,79 @@ try {
   // qrcode-terminal not installed, skip QR display
 }
 
-// --- OpenClaw Detection ---
-const OPENCLAW_PORTS = [18789, 8080, 11434, 1234, 8000];
+// --- OpenClaw Detection & Config ---
+const OPENCLAW_CONFIG_PATHS = [
+  path.join(os.homedir(), '.openclaw', 'openclaw.json'),
+  path.join(os.homedir(), '.openclaw', 'openclaw.json5'),
+];
+
+// Read OpenClaw gateway config (port + auth token) from local config file
+function readOpenClawConfig() {
+  for (const configPath of OPENCLAW_CONFIG_PATHS) {
+    try {
+      if (!fs.existsSync(configPath)) continue;
+      let raw = fs.readFileSync(configPath, 'utf-8');
+      // Strip JSON5 comments (// and /* */) for safe JSON.parse
+      raw = raw.replace(/\/\/.*$/gm, '').replace(/\/\*[\s\S]*?\*\//g, '');
+      // Strip trailing commas before } or ]
+      raw = raw.replace(/,\s*([\]}])/g, '$1');
+      const config = JSON.parse(raw);
+      const gw = config.gateway || {};
+      return {
+        port: gw.port || 18789,
+        token: gw.auth?.token || gw.auth?.password || null,
+        host: gw.bind || '127.0.0.1',
+      };
+    } catch {}
+  }
+  return { port: 18789, token: null, host: '127.0.0.1' };
+}
+
+// Cache the config on startup
+let openClawConfig = readOpenClawConfig();
 
-function tryOpenClawPort(port) {
+function detectOpenClaw() {
   return new Promise((resolve) => {
-    const req = http.request(
-      {
-        hostname: '127.0.0.1',
-        port,
-        path: '/v1/models',
-        method: 'GET',
-        timeout: 2000,
-      },
-      (res) => {
-        let body = '';
-        res.on('data', (chunk) => (body += chunk));
-        res.on('end', () => {
-          try {
-            const json = JSON.parse(body);
-            const models = (json.data || []).map((m) => m.id);
-            if (models.length > 0) {
-              resolve({ available: true, models, port });
-            } else {
-              resolve({ available: false, models: [], port });
-            }
-          } catch {
-            resolve({ available: false, models: [], port });
+    // Refresh config each detection
+    openClawConfig = readOpenClawConfig();
+
+    // Method 1: Use `openclaw gateway status` CLI (most reliable)
+    exec('openclaw gateway status 2>&1', { timeout: 5000 }, (err, stdout) => {
+      const output = (stdout || '').toLowerCase();
+      if (!err && (output.includes('running') || output.includes('active'))) {
+        return resolve({ available: true, models: ['openclaw'], port: openClawConfig.port });
+      }
+
+      // Method 2: Check if openclaw-gateway process is running
+      exec('pgrep -f "openclaw.gateway\\|openclaw-gateway" 2>/dev/null', { timeout: 2000 }, (err3, pid) => {
+        if (!err3 && pid?.trim()) {
+          return resolve({ available: true, models: ['openclaw'], port: openClawConfig.port });
+        }
+
+        // Method 3: Check if openclaw binary exists + health check
+        exec('command -v openclaw 2>/dev/null', { timeout: 2000 }, (err2, binPath) => {
+          if (err2 || !binPath?.trim()) {
+            return resolve({ available: false, models: [], port: null });
           }
+          exec(`openclaw gateway health --url ws://127.0.0.1:${openClawConfig.port} 2>&1`, { timeout: 5000 }, (err4, healthOut) => {
+            const hOutput = (healthOut || '').toLowerCase();
+            if (!err4 && (hOutput.includes('ok') || hOutput.includes('healthy') || hOutput.includes('reachable'))) {
+              return resolve({ available: true, models: ['openclaw'], port: openClawConfig.port });
+            }
+            return resolve({ available: false, models: [], port: null });
+          });
         });
-      }
-    );
-    req.on('timeout', () => {
-      req.destroy();
-      resolve({ available: false, models: [], port });
-    });
-    req.on('error', () => {
-      resolve({ available: false, models: [], port });
+      });
     });
-    req.end();
   });
 }
 
-async function detectOpenClaw() {
-  // Try all common ports in parallel
-  const results = await Promise.all(OPENCLAW_PORTS.map(tryOpenClawPort));
-  const found = results.find((r) => r.available);
-  if (found) {
-    return { available: true, models: found.models, port: found.port };
-  }
-  return { available: false, models: [], port: null };
-}
-
 // Run detection on startup
 detectOpenClaw().then((oc) => {
   if (oc.available) {
-    console.log(`  [OpenClaw] Detected on port ${oc.port}! Models: ${oc.models.join(', ')}`);
+    console.log(`  [OpenClaw] Detected (gateway on port ${oc.port})`);
   } else {
-    console.log(`  [OpenClaw] Not detected on ports ${OPENCLAW_PORTS.join(', ')}`);
+    console.log('  [OpenClaw] Not detected');
   }
 });
 
@@ -963,9 +978,11 @@ function handleTerminalStop(ws, { id }) {
 }
 
 // --- Chat (OpenClaw Proxy) ---
-function handleChatSend(ws, { id, messages, openclawToken, openclawPort, openclawHost }) {
-  const port = openclawPort || 18789;
-  const host = openclawHost || '127.0.0.1';
+function handleChatSend(ws, { id, messages }) {
+  // Use locally-detected OpenClaw config — no need for app to send credentials
+  const port = openClawConfig.port || 18789;
+  const host = openClawConfig.host || '127.0.0.1';
+  const token = openClawConfig.token;
 
   const body = JSON.stringify({
     model: 'openclaw:main',
@@ -973,17 +990,21 @@ function handleChatSend(ws, { id, messages, openclawToken, openclawPort, opencla
     stream: true,
   });
 
+  const headers = {
+    'Content-Type': 'application/json',
+    'x-openclaw-agent-id': 'main',
+  };
+  if (token) {
+    headers['Authorization'] = `Bearer ${token}`;
+  }
+
   const req = http.request(
     {
       hostname: host,
       port,
       path: '/v1/chat/completions',
       method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${openclawToken}`,
-        'x-openclaw-agent-id': 'main',
-      },
+      headers,
     },
     (res) => {
       if (res.statusCode !== 200) {

package/install.sh

@@ -110,11 +110,21 @@ echo -e "  ${GREEN}✓${NC} IP: ${MACHINE_IP}"
 # Step 5: Check OpenClaw
 echo -e "${YELLOW}[5/5]${NC} Checking OpenClaw..."
 OPENCLAW_STATUS="not detected"
-if curl -s --max-time 2 http://127.0.0.1:18789/v1/models > /dev/null 2>&1; then
-  OPENCLAW_STATUS="detected on port 18789"
-  echo -e "  ${GREEN}✓${NC} OpenClaw detected on port 18789"
+# Check via CLI (gateway status), then via process, then via binary existence
+if command -v openclaw &> /dev/null; then
+  OC_STATUS=$(openclaw gateway status 2>&1 || true)
+  if echo "$OC_STATUS" | grep -qi "running\|active"; then
+    OPENCLAW_STATUS="running"
+    echo -e "  ${GREEN}✓${NC} OpenClaw gateway is running"
+  elif pgrep -f "openclaw.gateway\|openclaw-gateway" > /dev/null 2>&1; then
+    OPENCLAW_STATUS="running"
+    echo -e "  ${GREEN}✓${NC} OpenClaw gateway process detected"
+  else
+    OPENCLAW_STATUS="installed (gateway not running)"
+    echo -e "  ${YELLOW}—${NC} OpenClaw installed but gateway not running. Start with: openclaw gateway run"
+  fi
 else
-  echo -e "  ${YELLOW}—${NC} OpenClaw not detected on port 18789 (optional, for AI features)"
+  echo -e "  ${YELLOW}—${NC} OpenClaw not installed (optional, for AI features)"
 fi
 
 # Build deep link

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "indieclaw-agent",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "Manage your server from your phone. Agent for the IndieClaw mobile app.",
   "main": "index.js",
   "bin": {