indieclaw-agent 2.1.0 → 2.2.0

package/index.js

@@ -90,6 +90,7 @@ if (TLS_ENABLED) {
 
 const terminals = new Map(); // id -> pty process
 const activeChats = new Map(); // id -> http.ClientRequest
+const activeSearches = new Map(); // ws -> child_process (one search per connection)
 
 // --- Deep Link & QR Code ---
 function getMachineIP() {
@@ -259,7 +260,9 @@ wss.on('connection', (ws) => {
     }
 
     // Route message
-    handleMessage(ws, msg);
+    handleMessage(ws, msg).catch((err) => {
+      console.error('[handleMessage] Unhandled error:', err.message || err);
+    });
   });
 
   ws.on('close', () => {
@@ -277,6 +280,12 @@ wss.on('connection', (ws) => {
         activeChats.delete(id);
       }
     }
+    // Kill any active search process for this connection
+    const search = activeSearches.get(ws);
+    if (search) {
+      search.kill();
+      activeSearches.delete(ws);
+    }
   });
 });
 
@@ -354,9 +363,9 @@ async function handleMessage(ws, msg) {
       case 'cron.history':
         return handleCronHistory(ws, msg);
       case 'agent.list':
-        return handleAgentList(ws, msg);
+        return await handleAgentList(ws, msg);
       case 'agent.logs':
-        return handleAgentLogs(ws, msg);
+        return await handleAgentLogs(ws, msg);
       default:
         return replyError(ws, id, `Unknown message type: ${type}`);
     }
@@ -1078,7 +1087,7 @@ function handleLogsSystem(ws, { id, lines = 200 }) {
   const platform = os.platform();
 
   if (platform === 'linux') {
-    exec(`journalctl -n ${lines} --no-pager -o json`, { timeout: 10000, maxBuffer: 1024 * 1024 * 5 }, (err, stdout) => {
+    exec(`journalctl -n ${lines} --no-pager --since "1 hour ago" -o json`, { timeout: 10000, maxBuffer: 1024 * 1024 * 5 }, (err, stdout) => {
       if (err) return replyError(ws, id, err.message);
       try {
         const entries = stdout.trim().split('\n').filter(Boolean).map((line) => {
@@ -1137,32 +1146,44 @@ function handleLogsSystem(ws, { id, lines = 200 }) {
 function handleLogsSearch(ws, { id, query, lines = 100 }) {
   const platform = os.platform();
   // Sanitize query to prevent command injection
-  const safeQuery = query.replace(/["`$\\]/g, '');
+  const safeQuery = query.replace(/["`$\\!;']/g, '');
+
+  if (!safeQuery || safeQuery.length < 2) {
+    return reply(ws, id, []);
+  }
 
+  // Kill any previous search for this connection to prevent pile-up
+  const prev = activeSearches.get(ws);
+  if (prev) {
+    prev.kill();
+    activeSearches.delete(ws);
+  }
+
+  let cmd;
   if (platform === 'linux') {
-    exec(`journalctl -n ${lines} --no-pager -g "${safeQuery}"`, { timeout: 10000, maxBuffer: 1024 * 1024 * 5 }, (err, stdout) => {
-      if (err) return replyError(ws, id, err.message);
-      const entries = stdout.trim().split('\n').filter(Boolean).map((line) => ({
-        timestamp: null,
-        level: 'info',
-        message: line,
-        source: '',
-      }));
-      reply(ws, id, entries);
-    });
+    // --since "24h ago" limits search scope instead of grepping entire journal
+    cmd = `journalctl -n ${lines} --no-pager --since "24 hours ago" -g "${safeQuery}"`;
   } else {
-    // macOS
-    exec(`grep -i "${safeQuery}" /var/log/system.log | tail -${lines}`, { timeout: 10000 }, (err, stdout) => {
-      if (err) return replyError(ws, id, err.message || 'No matches found');
-      const entries = stdout.trim().split('\n').filter(Boolean).map((line) => ({
-        timestamp: null,
-        level: 'info',
-        message: line,
-        source: '',
-      }));
-      reply(ws, id, entries);
-    });
+    cmd = `grep -i "${safeQuery}" /var/log/system.log | tail -${lines}`;
   }
+
+  const child = exec(cmd, { timeout: 10000, maxBuffer: 1024 * 1024 * 2 }, (err, stdout) => {
+    activeSearches.delete(ws);
+    if (err) {
+      // journalctl returns exit code 1 when no matches found — not an error
+      if (err.killed) return; // process was killed by a newer search
+      return reply(ws, id, []);
+    }
+    const entries = stdout.trim().split('\n').filter(Boolean).map((line) => ({
+      timestamp: null,
+      level: 'info',
+      message: line,
+      source: '',
+    }));
+    reply(ws, id, entries);
+  });
+
+  activeSearches.set(ws, child);
 }
 
 // --- Cron History ---
@@ -1207,17 +1228,21 @@ function handleCronHistory(ws, { id }) {
 
 // --- Agent List (OpenClaw Models) ---
 async function handleAgentList(ws, { id }) {
-  const oc = await detectOpenClaw();
-  if (oc.available) {
-    const models = oc.models.map((modelId) => ({
-      id: modelId,
-      name: modelId,
-      status: 'running',
-      port: oc.port,
-    }));
-    return reply(ws, id, models);
+  try {
+    const oc = await detectOpenClaw();
+    if (oc.available) {
+      const models = oc.models.map((modelId) => ({
+        id: modelId,
+        name: modelId,
+        status: 'running',
+        port: oc.port,
+      }));
+      return reply(ws, id, models);
+    }
+    reply(ws, id, []);
+  } catch (err) {
+    replyError(ws, id, 'OpenClaw detection failed: ' + (err.message || String(err)));
   }
-  reply(ws, id, []);
 }
 
 // --- Agent Logs ---

package/install.sh

@@ -135,12 +135,18 @@ if [ -n "$TOKEN" ]; then
   echo -e "  ${BOLD}Auth Token:${NC}"
   echo -e "  ${CYAN}${TOKEN}${NC}"
   echo ""
-  echo -e "  ${BOLD}Deep Link (paste in phone browser):${NC}"
+  echo -e "  ${BOLD}Deep Link (paste in IndieClaw app → Add Machine → Paste Link):${NC}"
   echo -e "  ${CYAN}${DEEP_LINK}${NC}"
   echo ""
-  echo -e "  ${BOLD}Or scan QR code:${NC}"
-  echo -e "  Run: ${BOLD}indieclaw-agent${NC} interactively to see QR code"
-  echo -e "  Or:  ${BOLD}sudo journalctl -u indieclaw-agent --no-pager | head -50${NC}"
+
+  # Generate QR code using the installed qrcode-terminal package
+  AGENT_MODULES=$(npm root -g 2>/dev/null)/indieclaw-agent/node_modules
+  if [ -d "$AGENT_MODULES/qrcode-terminal" ]; then
+    echo -e "  ${BOLD}Scan with IndieClaw app:${NC}"
+    echo ""
+    node -e "require('${AGENT_MODULES}/qrcode-terminal').generate('${DEEP_LINK}', {small: true}, function(qr) { qr.split('\n').forEach(function(l) { console.log('  ' + l) }) })" 2>/dev/null || true
+    echo ""
+  fi
 fi
 
 echo ""

package/package.json

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