Update server.js

server.js

@@ -6,30 +6,29 @@ const fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch
 const app = express();
 const PORT = process.env.PORT || 7860;
 
-// --- 1. CRITICAL: TRUST PROXY ---
-// This ensures req.protocol and req.get('host') return the REAL public values
-// (https and your-space.hf.space) instead of http://localhost
-app.set('trust proxy', 1);
+// --- 1. CONFIGURATION ---
+app.set('trust proxy', 1); // Required for Hugging Face Spaces
+app.use(express.json({ limit: '10mb' }));
 
-// --- 2. MIDDLEWARE ---
+// --- 2. CORS (Strict & Global) ---
 const corsOptions = {
   origin: '*',
   methods: ['GET', 'POST', 'OPTIONS'],
   allowedHeaders: ['Content-Type', 'Authorization', 'X-Requested-With'],
 };
 app.use(cors(corsOptions));
-app.options(/.*/, cors(corsOptions)); // Fix for Express 5 crash
-app.use(express.json({ limit: '10mb' }));
+app.options(/.*/, cors(corsOptions)); // Handle Preflight for all routes
 
-// Logging
+// --- 3. LOGGING ---
 app.use((req, res, next) => {
-  console.log(`[${new Date().toISOString()}] ${req.method} ${req.url}`);
+  // Log request to debug timing
+  console.log(`[${new Date().toISOString()}] ${req.method} ${req.originalUrl}`);
   next();
 });
 
-// --- 3. SSE ENDPOINT ---
+// --- 4. SSE ENDPOINT ---
 app.get('/sse', (req, res) => {
-  console.log("[SSE] New Connection");
+  console.log("[SSE] Connection Initiated");
   
   res.writeHead(200, {
     'Content-Type': 'text/event-stream',
@@ -39,21 +38,20 @@ app.get('/sse', (req, res) => {
     'Access-Control-Allow-Origin': '*'
   });
 
-  // Construct the absolute URL. 
-  // With 'trust proxy', req.protocol should be 'https'
+  // Calculate external endpoint
   const protocol = req.protocol === 'http' ? 'https' : req.protocol;
   const host = req.get('host');
   const messageEndpoint = `${protocol}://${host}/messages`;
   
-  console.log(`[SSE] Sending Endpoint: ${messageEndpoint}`);
+  console.log(`[SSE] Endpoint: ${messageEndpoint}`);
 
   // 1. Send Endpoint Event
   res.write(`event: endpoint\ndata: ${messageEndpoint}\n\n`);
   
-  // 2. Send Padding (4KB) to flush buffers
+  // 2. Send Padding (Keep buffer flush)
   res.write(`: ${" ".repeat(4096)}\n\n`);
 
-  // 3. Ping Loop
+  // 3. Keep-Alive Loop
   const interval = setInterval(() => {
     res.write(`: ping\n\n`);
   }, 10000);
@@ -64,38 +62,31 @@ app.get('/sse', (req, res) => {
   });
 });
 
-// --- 4. MESSAGES ENDPOINT ---
+// --- 5. MESSAGES ENDPOINT ---
 app.post('/messages', async (req, res) => {
   try {
     const body = req.body;
-    const requestId = body.id; // Keep as-is (can be 0, string, or null)
+    const requestId = body.id;
 
     console.log(`[MESSAGES] Method: ${body.method} | ID: ${requestId}`);
 
     // A. Initialize
     if (body.method === 'initialize') {
-      const response = {
+      console.log("[MESSAGES] Sending Init Response");
+      return res.json({
         jsonrpc: "2.0",
         id: requestId,
         result: {
           protocolVersion: "2024-11-05",
-          capabilities: { 
-            // Return empty objects for all capabilities to be safe
-            tools: {},
-            prompts: {},
-            resources: {},
-            logging: {}
-          },
+          capabilities: { tools: {}, prompts: {}, resources: {} },
           serverInfo: { name: "github-mcp-hf", version: "1.0.0" }
         }
-      };
-      console.log("[MESSAGES] Sending Init Response");
-      return res.json(response);
+      });
     }
 
     // B. List Tools
     if (body.method === 'tools/list') {
-      console.log("[MESSAGES] Listing Tools");
+      console.log("[MESSAGES] Sending Tool List");
       return res.json({
         jsonrpc: "2.0",
         id: requestId,
@@ -160,11 +151,9 @@ app.post('/messages', async (req, res) => {
         });
       }
     }
-    
-    // D. Notifications
+
     if (body.method === 'notifications/initialized') {
-      console.log("[MESSAGES] Notification: initialized");
-      return res.json({ result: true }); // Ack
+      return res.json({ result: true });
     }
 
     res.status(404).json({ error: "Method not found" });
@@ -175,16 +164,19 @@ app.post('/messages', async (req, res) => {
   }
 });
 
-// --- 5. CATCH-ALL / HEALTH CHECK ---
+// --- 6. JSON FALLBACK (The Fix) ---
+// We handle ALL other requests by returning JSON, never Text/HTML.
 app.use((req, res) => {
-  if (req.method === 'GET' || req.method === 'POST') {
-    console.log(`[FALLBACK] Responding 200 OK to: ${req.path}`);
-    return res.status(200).send("MCP Server Active");
-  }
-  res.status(404).send("Not Found");
+  console.log(`[FALLBACK] Handling ${req.method} ${req.path}`);
+  // Return valid JSON so ChatUI parsers don't crash
+  res.status(200).json({ 
+    status: "active", 
+    message: "MCP Server Running", 
+    path: req.path 
+  });
 });
 
-// --- 6. STARTUP ---
+// --- 7. STARTUP ---
 app.listen(PORT, '0.0.0.0', () => {
   console.log(`Server running on port ${PORT}`);
 });