reportdash-datastore-mcp-claude-desktop 1.0.9 → 1.0.10

package/index.js

@@ -12,9 +12,8 @@ const API_URL = process.env.REPORTDASH_API_URL || 'https://datastore.reportdash.
 
 // Validate configuration
 if (!API_KEY) {
-  // NOTE: In MCP stdio mode, prefer stdout only.
-  // But keeping your original behavior as-is.
-  console.error(
+  // In Claude MCP mode, stdout should be JSON only. This is fatal anyway, so ok.
+  process.stdout.write(
     JSON.stringify({
       jsonrpc: '2.0',
       error: {
@@ -22,14 +21,14 @@ if (!API_KEY) {
         message:
           'REPORTDASH_API_KEY environment variable is required. Get your API key from ReportDash DataStore app settings.',
       },
-    })
+      id: null,
+    }) + '\n'
   );
   process.exit(1);
 }
 
 /**
  * Ensure every outbound request includes platform="claude"
- * without breaking existing requests.
  */
 function withClaudePlatform(mcpRequest) {
   if (mcpRequest && typeof mcpRequest === 'object') {
@@ -39,14 +38,29 @@ function withClaudePlatform(mcpRequest) {
 }
 
 /**
- * JSON-RPC id helper:
- * Keep 0 as a valid id; only default when null/undefined.
+ * Preserve id=0. Only default when null/undefined.
  */
-function rpcId(mcpRequest) {
-  return mcpRequest?.id ?? null;
+function rpcId(req) {
+  return req?.id ?? null;
 }
 
-// Test mode
+/**
+ * Write exactly one JSON object per line to stdout (MCP framing).
+ */
+function writeJson(obj) {
+  process.stdout.write(JSON.stringify(obj) + '\n');
+}
+
+/**
+ * Build a JSON-RPC error response
+ */
+function rpcError({ id = null, code = -32603, message = 'Internal error', data }) {
+  const err = { code, message };
+  if (data !== undefined) err.data = data;
+  return { jsonrpc: '2.0', id, error: err };
+}
+
+// Test mode (prints human logs to stdout; do not run in Claude MCP mode)
 if (process.argv.includes('--test')) {
   testConnection();
   return;
@@ -62,22 +76,21 @@ const rl = readline.createInterface({
 rl.on('line', (line) => {
   if (!line.trim()) return;
 
+  let mcpRequest;
   try {
-    const mcpRequest = JSON.parse(line);
-    forwardToAPI(withClaudePlatform(mcpRequest));
+    mcpRequest = JSON.parse(line);
   } catch (error) {
-    // Only output to stdout, never stderr for MCP protocol
-    console.log(
-      JSON.stringify({
-        jsonrpc: '2.0',
-        error: {
-          code: -32700,
-          message: 'Parse error: ' + error.message,
-        },
+    writeJson(
+      rpcError({
         id: null,
+        code: -32700,
+        message: 'Parse error: ' + error.message,
       })
     );
+    return;
   }
+
+  forwardToAPI(withClaudePlatform(mcpRequest));
 });
 
 function forwardToAPI(mcpRequest) {
@@ -85,53 +98,77 @@ function forwardToAPI(mcpRequest) {
   const isHttps = url.protocol === 'https:';
   const client = isHttps ? https : http;
 
+  const body = JSON.stringify(mcpRequest);
+
   const options = {
     hostname: url.hostname,
     port: url.port || (isHttps ? 443 : 80),
-    path: url.pathname,
+    path: url.pathname + url.search,
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
+      'Content-Length': Buffer.byteLength(body),
       'X-Api-Key': API_KEY,
       'User-Agent': 'ReportDash-DataStore-MCP/1.0',
     },
-    timeout: 30000, // 30 second timeout
+    timeout: 30000,
   };
 
   const req = client.request(options, (res) => {
     let data = '';
-
-    res.on('data', (chunk) => {
-      data += chunk;
-    });
-
+    res.on('data', (chunk) => (data += chunk));
     res.on('end', () => {
-      // Treat 200-299 as success (including 204 No Content)
-      if (res.statusCode >= 200 && res.statusCode < 300) {
-        // For 204 No Content or empty response, return empty success
-        if (res.statusCode === 204 || !data.trim()) {
-          console.log(
-            JSON.stringify({
-              jsonrpc: '2.0',
-              result: {},
-              id: rpcId(mcpRequest), // FIX: preserves id=0
+      const id = rpcId(mcpRequest);
+
+      // 204 or empty body => empty result
+      if (res.statusCode === 204 || !data.trim()) {
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+          writeJson({ jsonrpc: '2.0', id, result: {} });
+        } else {
+          writeJson(
+            rpcError({
+              id,
+              code: res.statusCode,
+              message: `API error: ${res.statusCode} (empty body)`,
             })
           );
+        }
+        return;
+      }
+
+      // Always re-serialize to 1-line JSON for MCP framing
+      let parsed;
+      try {
+        parsed = JSON.parse(data);
+      } catch (e) {
+        writeJson(
+          rpcError({
+            id,
+            code: res.statusCode >= 400 ? res.statusCode : -32603,
+            message: 'API returned non-JSON response',
+            data: { statusCode: res.statusCode, body: data },
+          })
+        );
+        return;
+      }
+
+      if (res.statusCode >= 200 && res.statusCode < 300) {
+        // Ensure JSON-RPC envelope exists; if your API returns raw jsonrpc objects, this is fine.
+        // If it returns something else, wrap it.
+        if (parsed && typeof parsed === 'object' && parsed.jsonrpc === '2.0') {
+          // Some backends might omit id; ensure it's present
+          if (parsed.id === undefined) parsed.id = id;
+          writeJson(parsed);
         } else {
-          // Forward the response as-is
-          console.log(data);
+          writeJson({ jsonrpc: '2.0', id, result: parsed });
         }
       } else {
-        // Send errors to stdout (not stderr!) so Claude can properly handle them
-        console.log(
-          JSON.stringify({
-            jsonrpc: '2.0',
-            error: {
-              code: res.statusCode,
-              message: `API error: ${res.statusCode}${data ? ' - ' + data : ''}`,
-              data: { statusCode: res.statusCode, body: data },
-            },
-            id: rpcId(mcpRequest), // FIX: preserves id=0
+        writeJson(
+          rpcError({
+            id,
+            code: res.statusCode,
+            message: `API error: ${res.statusCode}`,
+            data: parsed,
           })
         );
       }
@@ -139,42 +176,32 @@ function forwardToAPI(mcpRequest) {
   });
 
   req.on('error', (error) => {
-    // Send errors to stdout (not stderr!)
-    console.log(
-      JSON.stringify({
-        jsonrpc: '2.0',
-        error: {
-          code: -32603,
-          message: 'Network error: ' + error.message,
-          data: { error: error.message },
-        },
-        id: rpcId(mcpRequest), // FIX: preserves id=0
+    writeJson(
+      rpcError({
+        id: rpcId(mcpRequest),
+        code: -32603,
+        message: 'Network error: ' + error.message,
+        data: { error: error.message },
       })
     );
   });
 
   req.on('timeout', () => {
     req.destroy();
-    // Send errors to stdout (not stderr!)
-    console.log(
-      JSON.stringify({
-        jsonrpc: '2.0',
-        error: {
-          code: -32603,
-          message: 'Request timeout after 30 seconds',
-        },
-        id: rpcId(mcpRequest), // FIX: preserves id=0
+    writeJson(
+      rpcError({
+        id: rpcId(mcpRequest),
+        code: -32603,
+        message: 'Request timeout after 30 seconds',
       })
     );
   });
 
-  req.write(JSON.stringify(mcpRequest));
+  req.write(body);
   req.end();
 }
 
 function testConnection() {
-  // NOTE: This prints non-JSON to stdout, which is fine for --test.
-  // Do not run --test as an MCP stdio server in Claude Desktop.
   console.log('🔍 Testing ReportDash DataStore connection...\n');
   console.log(`API URL: ${API_URL}`);
   console.log(
@@ -185,7 +212,6 @@ function testConnection() {
   const isHttps = url.protocol === 'https:';
   const client = isHttps ? https : http;
 
-  // Create MCP tools/list request
   const mcpRequest = withClaudePlatform({
     jsonrpc: '2.0',
     method: 'tools/list',
@@ -197,7 +223,7 @@ function testConnection() {
   const options = {
     hostname: url.hostname,
     port: url.port || (isHttps ? 443 : 80),
-    path: url.pathname,
+    path: url.pathname + url.search,
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -212,9 +238,7 @@ function testConnection() {
 
   const req = client.request(options, (res) => {
     let data = '';
-    res.on('data', (chunk) => {
-      data += chunk;
-    });
+    res.on('data', (chunk) => (data += chunk));
     res.on('end', () => {
       console.log(`Response Status: ${res.statusCode}\n`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reportdash-datastore-mcp-claude-desktop",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "ReportDash DataStore MCP server for Claude Desktop",
   "main": "index.js",
   "bin": {