Update server.js

server.js

@@ -2,120 +2,27 @@ import express from "express";
 import { spawn } from "child_process";
 import dotenv from "dotenv";
 
-console.log('OpenClaw: Starting server...');
-console.log('OpenClaw: Node version:', process.version);
-console.log('OpenClaw: Current directory:', process.cwd());
+console.log('OpenClaw HF Space: Starting server...');
 
 try {
   dotenv.config();
-  console.log('OpenClaw: Environment loaded');
+  console.log('Environment loaded');
 } catch (err) {
-  console.error('OpenClaw: Failed to load environment:', err.message);
+  console.error('Failed to load environment:', err.message);
 }
 
 const app = express();
 app.use(express.json());
 
-/* ===============================
-   1. BASIC AUTH
-================================ */
-
-const GATE_KEY = process.env.OPENCLAW_GATE_KEY;
-
-app.use((req, res, next) => {
-  if (!GATE_KEY) return next();
-  if (req.headers["x-openclaw-key"] !== GATE_KEY) {
-    return res.status(401).json({ error: "Unauthorized" });
-  }
-  next();
-});
-
-/* ===============================
-   2. RATE LIMITING (IP-based)
-================================ */
-
-const RATE_LIMIT = 30; // requests
-const WINDOW_MS = 60_000;
-const ipHits = new Map();
-
-app.use((req, res, next) => {
-  const ip = req.headers["x-forwarded-for"] || req.socket.remoteAddress;
-  const now = Date.now();
-
-  const record = ipHits.get(ip) || { count: 0, ts: now };
-  if (now - record.ts > WINDOW_MS) {
-    record.count = 0;
-    record.ts = now;
-  }
-
-  record.count++;
-  ipHits.set(ip, record);
-
-  if (record.count > RATE_LIMIT) {
-    return res.status(429).json({ error: "Rate limit exceeded" });
-  }
-  next();
-});
-
-/* ===============================
-   3. LOAD KEY POOLS
-================================ */
-
-function loadPool(prefix) {
-  const keys = Object.keys(process.env)
-    .filter(k => k.startsWith(prefix))
-    .map(k => process.env[k])
-    .filter(Boolean);
-  
-  console.log(`Loaded ${keys.length} keys for ${prefix}`);
-  return keys;
-}
-
-const PROVIDERS = {
-  openai: loadPool("OPENAI_API_KEY_"),
-  deepseek: loadPool("DEEPSEEK_API_KEY_"),
-  gemini: loadPool("GEMINI_API_KEY_"),
-  openrouter: loadPool("OPENROUTER_API_KEY_"),
-  dashscope: loadPool("DASHSCOPE_API_KEY_")
-};
-
-function randomKey(pool) {
-  return pool[Math.floor(Math.random() * pool.length)];
-}
-
-/* ===============================
-   4. TASK ROUTING
-================================ */
-
-const TASKS = new Set([
-  "market_research",
-  "summarize",
-  "classify"
-]);
-
-/* ===============================
-   5. RUN AGENT
-================================ */
-app.use((req, res, next) => {
-  if (req.method === "POST" && !req.is("application/json")) {
-    return res.status(400).json({ error: "JSON body required" });
-  }
-  next();
-});
-
+// Simple health check
 app.get("/", (req, res) => {
   res.json({
-    status: "OpenClaw running on HF Space",
-    service: "market_research_agent",
-    endpoints: {
-      market_research: "POST /api/market-research",
-      health: "GET /health"
-    },
+    status: "OpenClaw HF Space Running",
+    endpoint: "POST /api/market-research",
     timestamp: new Date().toISOString()
   });
 });
 
-// Simple health check endpoint
 app.get("/health", (req, res) => {
   res.json({
     status: "healthy",
@@ -124,62 +31,9 @@ app.get("/health", (req, res) => {
   });
 });
 
-app.post("/run", async (req, res) => {
-  console.log('OpenClaw: Received request:', { 
-    task: req.body.task, 
-    keyword: req.body.keyword,
-    timestamp: new Date().toISOString()
-  });
-  
-  const { task = "market_research", provider, model, ...payload } = req.body;
-  
-  if (!TASKS.has(task)) {
-    return res.status(400).json({ error: "Unknown task" });
-  }
-
-  const providersToTry = provider
-    ? [provider, ...Object.keys(PROVIDERS).filter(p => p !== provider)]
-    : Object.keys(PROVIDERS);
-
-  let lastError;
-
-  for (const p of providersToTry) {
-    const pool = PROVIDERS[p];
-    if (!pool || pool.length === 0) continue;
-
-    for (let i = 0; i < pool.length; i++) {
-      const apiKey = randomKey(pool);
-
-const env = {
-  ...process.env,
-  OPENCLAW_PROVIDER: p,
-  OPENCLAW_MODEL: model || "",
-  OPENCLAW_API_KEY: apiKey,
-  OPENCLAW_TASK: task,
-  OPENCLAW_TIMEOUT: "180000"
-};
-
-      try {
-        const result = await runOpenClaw(env, payload);
-        return res.json(result);
-      } catch (err) {
-        lastError = err;
-        if (!isRateLimit(err)) break;
-      }
-    }
-  }
-
-  res.status(500).json({
-    error: "All providers failed",
-    details: lastError?.message,
-    keyword: req.body.keyword,
-    timestamp: new Date().toISOString()
-  });
-});
-
-// Add specific market research endpoint for n8n compatibility
+// Market research endpoint
 app.post("/api/market-research", async (req, res) => {
-  console.log('OpenClaw: Market research request:', { 
+  console.log('Market research request:', { 
     keyword: req.body.keyword,
     timestamp: new Date().toISOString()
   });
@@ -190,81 +44,49 @@ app.post("/api/market-research", async (req, res) => {
     return res.status(400).json({ error: "keyword is required" });
   }
 
-  // Use API key from request or fallback to environment
-  let providersToTry;
-  let apiKeys = {};
-
-  if (api_key) {
-    // Use API key from n8n request
-    console.log('OpenClaw: Using API key from request');
-    apiKeys[provider] = [api_key];
-    providersToTry = [provider];
-  } else {
-    // Fallback to environment variables (for local testing)
-    console.log('OpenClaw: Using API keys from environment');
-    providersToTry = Object.keys(PROVIDERS);
-    apiKeys = PROVIDERS;
+  if (!api_key) {
+    return res.status(400).json({ 
+      error: "API key required",
+      message: "Send api_key in request body from n8n credentials"
+    });
   }
 
-  let lastError;
-
-  for (const p of providersToTry) {
-    const pool = apiKeys[p];
-    if (!pool || pool.length === 0) {
-      console.log(`OpenClaw: No API keys for provider ${p}`);
-      continue;
-    }
-
-    for (let i = 0; i < pool.length; i++) {
-      const apiKey = pool[i];
-
-      const env = {
-        ...process.env,
-        OPENCLAW_PROVIDER: p,
-        OPENCLAW_API_KEY: apiKey,
-        OPENCLAW_TASK: "market_research",
-        OPENCLAW_TIMEOUT: "180000"
-      };
-
-      try {
-        console.log(`OpenClaw: Trying provider ${p} with key ${apiKey.substring(0, 10)}...`);
-        const result = await runOpenClaw(env, { keyword });
-        console.log('OpenClaw: Success with provider', p);
-        return res.json(result);
-      } catch (err) {
-        lastError = err;
-        console.error('OpenClaw: Provider failed:', p, err.message);
-        if (!isRateLimit(err)) break;
-      }
-    }
+  const env = {
+    ...process.env,
+    OPENCLAW_PROVIDER: provider,
+    OPENCLAW_API_KEY: api_key,
+    OPENCLAW_TASK: "market_research",
+    OPENCLAW_TIMEOUT: "180000"
+  };
+
+  try {
+    console.log(`Calling OpenClaw agent with provider: ${provider}`);
+    const result = await runOpenClaw(env, { keyword });
+    console.log('OpenClaw agent succeeded');
+    return res.json(result);
+  } catch (err) {
+    console.error('OpenClaw agent failed:', err.message);
+    return res.status(500).json({
+      error: "OpenClaw agent failed",
+      details: err.message,
+      keyword: keyword,
+      timestamp: new Date().toISOString()
+    });
   }
-
-  res.status(500).json({
-    error: "All providers failed",
-    details: lastError?.message || "No API keys configured",
-    keyword: keyword,
-    timestamp: new Date().toISOString()
-  });
 });
 
-/* ===============================
-   6. EXECUTION + JSON PARSE
-================================ */
-
 function runOpenClaw(env, payload) {
   return new Promise((resolve, reject) => {
-    // For HF Space, use current directory instead of /app
     const proc = spawn(process.execPath, ["src/index.js"], {
-      cwd: process.cwd(), // Use current working directory
+      cwd: process.cwd(),
       env
     });
 
     let stdout = "";
     let stderr = "";
 
-    // CRITICAL: handle spawn errors
     proc.on("error", err => {
-      console.error('OpenClaw: Spawn error:', err);
+      console.error('Spawn error:', err);
       reject(err);
     });
 
@@ -278,50 +100,26 @@ function runOpenClaw(env, payload) {
 
     proc.on("close", code => {
       if (code !== 0) {
-        console.error('OpenClaw: Agent exited with code:', code);
-        console.error('OpenClaw: stderr:', stderr);
-        return reject(
-          new Error(stderr || `Agent exited with code ${code}`)
-        );
+        console.error('Agent exited with code:', code, 'stderr:', stderr);
+        return reject(new Error(`Agent failed: ${stderr || code}`));
       }
 
       try {
-        console.log('OpenClaw: Agent response length:', stdout.length);
         const json = JSON.parse(stdout);
-        console.log('OpenClaw: JSON parsed successfully');
         resolve(json);
       } catch (err) {
-        console.error('OpenClaw: JSON parse error:', err.message);
-        console.error('OpenClaw: Raw stdout (first 500 chars):', stdout.substring(0, 500));
-        reject(new Error("Invalid JSON from OpenClaw agent: " + err.message));
+        console.error('JSON parse error:', err.message);
+        console.error('Raw output (first 500 chars):', stdout.substring(0, 500));
+        reject(new Error("Invalid JSON from agent"));
       }
     });
 
-    // SEND INPUT TO AGENT
     proc.stdin.write(JSON.stringify(payload));
     proc.stdin.end();
   });
 }
 
-
-function isRateLimit(err) {
-  const msg = err.message?.toLowerCase() || "";
-  return (
-    msg.includes("429") ||
-    msg.includes("rate") ||
-    msg.includes("quota") ||
-    msg.includes("limit")
-  );
-}
-
-
-/* ===============================
-   7. START (HF Space compatible)
-=============================== */
-
-const PORT = process.env.PORT || 7860; // HF Space uses 7860
+const PORT = process.env.PORT || 7860;
 app.listen(PORT, "0.0.0.0", () => {
-  console.log(`🚀 OpenClaw Agent Gateway running on port ${PORT}`);
-  console.log(`📡 Endpoint: /api/market-research`);
-  console.log(`🔑 API keys from: ${Object.keys(PROVIDERS).filter(p => PROVIDERS[p].length > 0).join(', ') || 'requests only'}`);
-});
+  console.log(`🚀 Server running on port ${PORT}`);
+});