webhookagent 1.0.0 → 1.1.0

package/lib/heartbeat.js

@@ -3,7 +3,7 @@
  * WebhookAgent Heartbeat Runtime v1.0
  * Cross-platform Node.js agent for polling + processing webhook events
  *
- * Inspired by MoltedOpus Agent Runtime v1.4
+ * WebhookAgent.com — Webhook Queue for AI Agents & Developers
  * Works on: Windows, macOS, Linux — anywhere Node.js runs
  *
  * HOW IT WORKS (Break-on-Action Pattern):
@@ -54,20 +54,40 @@
 // CONFIG
 // ============================================================
 
-const args = parseArgs(process.argv.slice(2));
-const API_KEY = args.key || process.env.WHA_API_KEY || '';
-const BASE_URL = (args.url || process.env.WHA_URL || 'https://webhookagent.com/api').replace(/\/$/, '');
+const fs = require('fs');
+const path = require('path');
+
+const CONFIG_DIR = path.join(process.env.HOME || process.env.USERPROFILE || '.', '.webhookagent');
+const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
+
+// Handle `webhookagent config` subcommand
+const rawArgs = process.argv.slice(2);
+if (rawArgs[0] === 'config') {
+  handleConfig(rawArgs.slice(1));
+  process.exit(0);
+}
+
+const args = parseArgs(rawArgs);
+
+// Load saved config (if exists)
+const savedConfig = loadConfig();
+
+const API_KEY = args.key || process.env.WHA_API_KEY || savedConfig.api_key || '';
+const BASE_URL = (args.url || process.env.WHA_URL || savedConfig.api_url || 'https://webhookagent.com/api').replace(/\/$/, '');
 const INTERVAL = parseInt(args.interval || '30') * 1000;
 const MAX_CYCLES = args.once ? 1 : parseInt(args.cycles || '120');
 const AUTO_RESTART = !!args['auto-restart'];
 const QUIET = !!args.quiet;
-const WEBHOOKS_FILTER = args.webhooks || 'all';
+const WEBHOOKS_FILTER = args.webhooks || savedConfig.webhooks || 'all';
 const AUTO_FETCH = !!args.fetch;
 const AUTO_ACK = !!args.ack;
 const JSON_MODE = !!args.json;
 
 if (!API_KEY) {
-  console.error('ERROR: API key required. Use --key=wha_... or set WHA_API_KEY env var');
+  console.error('ERROR: API key required.');
+  console.error('  Option 1: webhookagent config --key=wha_...   (saves securely, recommended)');
+  console.error('  Option 2: webhookagent --key=wha_...          (passed each time)');
+  console.error('  Option 3: set WHA_API_KEY env var');
   process.exit(1);
 }
 
@@ -86,6 +106,90 @@ function parseArgs(argv) {
   return result;
 }
 
+function loadConfig() {
+  try {
+    if (fs.existsSync(CONFIG_FILE)) {
+      return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
+    }
+  } catch (e) { /* ignore */ }
+  return {};
+}
+
+function saveConfig(data) {
+  if (!fs.existsSync(CONFIG_DIR)) {
+    fs.mkdirSync(CONFIG_DIR, { recursive: true });
+  }
+  const existing = loadConfig();
+  const merged = { ...existing, ...data };
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(merged, null, 2) + '\n');
+  return merged;
+}
+
+function handleConfig(argv) {
+  const configArgs = parseArgs(argv);
+
+  // webhookagent config --key=wha_...
+  if (configArgs.key) {
+    saveConfig({ api_key: configArgs.key });
+    console.log(`API key saved to ${CONFIG_FILE}`);
+    console.log('You can now run: webhookagent --fetch --ack');
+    return;
+  }
+
+  // webhookagent config --webhooks=wh-abc,wh-def
+  if (configArgs.webhooks) {
+    saveConfig({ webhooks: configArgs.webhooks });
+    console.log(`Webhook filter saved: ${configArgs.webhooks}`);
+    return;
+  }
+
+  // webhookagent config --url=https://...
+  if (configArgs.url) {
+    saveConfig({ api_url: configArgs.url });
+    console.log(`API URL saved: ${configArgs.url}`);
+    return;
+  }
+
+  // webhookagent config --show
+  if (configArgs.show) {
+    const cfg = loadConfig();
+    if (Object.keys(cfg).length === 0) {
+      console.log('No config saved. Use: webhookagent config --key=wha_...');
+    } else {
+      const display = { ...cfg };
+      if (display.api_key) display.api_key = display.api_key.slice(0, 8) + '...' + display.api_key.slice(-4);
+      console.log(JSON.stringify(display, null, 2));
+    }
+    return;
+  }
+
+  // webhookagent config --clear
+  if (configArgs.clear) {
+    try { fs.unlinkSync(CONFIG_FILE); } catch (e) { /* ignore */ }
+    console.log('Config cleared.');
+    return;
+  }
+
+  // No args — show help
+  console.log('WebhookAgent Config');
+  console.log('  webhookagent config --key=wha_...        Save API key');
+  console.log('  webhookagent config --webhooks=ID1,ID2   Save webhook filter');
+  console.log('  webhookagent config --show               Show saved config');
+  console.log('  webhookagent config --clear              Delete saved config');
+}
+
+function buildRestartCommand() {
+  const parts = ['webhookagent'];
+  // Only include --key if it was passed explicitly (not from config/env)
+  if (args.key) parts.push(`--key=${args.key}`);
+  if (AUTO_FETCH) parts.push('--fetch');
+  if (AUTO_ACK) parts.push('--ack');
+  if (WEBHOOKS_FILTER !== 'all' && args.webhooks) parts.push(`--webhooks=${WEBHOOKS_FILTER}`);
+  if (args.interval) parts.push(`--interval=${args.interval}`);
+  if (QUIET) parts.push('--quiet');
+  return parts.join(' ');
+}
+
 function log(msg) {
   if (QUIET) return;
   process.stderr.write(`${new Date().toLocaleTimeString()} ${msg}\n`);
@@ -183,9 +287,34 @@ async function processActions(actions, heartbeatData) {
 // ============================================================
 
 async function main() {
-  log('WebhookAgent Heartbeat Runtime v1.0');
+  log('WebhookAgent Heartbeat Runtime v1.1');
   log(`Polling ${BASE_URL} every ${INTERVAL / 1000}s, max ${MAX_CYCLES} cycles${AUTO_RESTART ? ' (continuous)' : ''}`);
-  if (WEBHOOKS_FILTER !== 'all') log(`Filtering webhooks: ${WEBHOOKS_FILTER}`);
+
+  // Resolve webhook names to IDs if needed
+  let resolvedFilter = WEBHOOKS_FILTER;
+  if (WEBHOOKS_FILTER !== 'all') {
+    const filterParts = WEBHOOKS_FILTER.split(',').map(s => s.trim());
+    const hasNames = filterParts.some(p => !p.startsWith('wh-') && !/^\d+$/.test(p));
+    if (hasNames) {
+      const webhooks = await api('/webhooks');
+      if (webhooks && webhooks.webhooks) {
+        const resolved = filterParts.map(f => {
+          // If it looks like an ID already, keep it
+          if (f.startsWith('wh-') || /^\d+$/.test(f)) return f;
+          // Otherwise match by name (case-insensitive)
+          const match = webhooks.webhooks.find(w => w.name.toLowerCase() === f.toLowerCase());
+          if (match) {
+            log(`Resolved "${f}" → ${match.webhook_id}`);
+            return match.webhook_id;
+          }
+          log(`WARN: webhook name "${f}" not found, skipping`);
+          return null;
+        }).filter(Boolean);
+        resolvedFilter = resolved.join(',');
+      }
+    }
+    log(`Filtering webhooks: ${resolvedFilter}`);
+  }
   if (AUTO_FETCH) log('Auto-fetch: ON');
   if (AUTO_ACK) log('Auto-ack: ON');
   log('---');
@@ -195,7 +324,7 @@ async function main() {
     let brokeOnAction = false;
 
     for (let cycle = 1; cycle <= MAX_CYCLES; cycle++) {
-      const path = `/heartbeat?webhooks=${encodeURIComponent(WEBHOOKS_FILTER)}`;
+      const path = `/heartbeat?webhooks=${encodeURIComponent(resolvedFilter)}`;
       const data = await api(path);
 
       if (!data) {
@@ -222,6 +351,14 @@ async function main() {
         await processActions(actions, data);
 
         brokeOnAction = true;
+
+        // Tell the agent exactly how to restart
+        if (!AUTO_RESTART) {
+          const cmd = buildRestartCommand();
+          console.log('RESTART:' + cmd);
+          log(`Process events above, then run: ${cmd}`);
+        }
+
         break; // ← THE BREAK — exit loop so parent process can handle
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webhookagent",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "WebhookAgent heartbeat runtime — poll, break, process webhook events at your agent's pace",
   "main": "lib/heartbeat.js",
   "bin": {