@egdesk/next-api-plugin 1.3.0 → 1.3.1

package/dist/generate-helpers.js

@@ -58,6 +58,45 @@ function generateHelpers(projectPath) {
 
 import { EGDESK_CONFIG } from './egdesk.config';
 
+/**
+ * Parse EGDesk MCP \`/tools/call\` JSON so \`error\` is shown even when HTTP status is 500.
+ */
+async function parseEgdeskMcpToolResponse(response: Response): Promise<any> {
+  const result = await response.json().catch(() => null);
+
+  if (result && typeof result === 'object' && result.success === false) {
+    const errMsg =
+      typeof result.error === 'string'
+        ? result.error
+        : result.error != null
+          ? String(result.error)
+          : 'Tool call failed';
+    throw new Error(errMsg);
+  }
+
+  if (!response.ok) {
+    let fromBody = '';
+    if (result && typeof result === 'object') {
+      if (typeof result.error === 'string') fromBody = result.error;
+      else if (typeof (result as { message?: string }).message === 'string') {
+        fromBody = (result as { message: string }).message;
+      }
+    }
+    throw new Error(fromBody || \`HTTP \${response.status}: \${response.statusText}\`);
+  }
+
+  if (!result || result.success !== true) {
+    throw new Error(
+      result && typeof result === 'object' && typeof result.error === 'string'
+        ? result.error
+        : 'Tool call failed'
+    );
+  }
+
+  const content = result.result?.content?.[0]?.text;
+  return content ? JSON.parse(content) : null;
+}
+
 /**
  * Call EGDesk user-data MCP tool
  *
@@ -103,19 +142,7 @@ export async function callUserDataTool(
     });
   }
 
-  if (!response.ok) {
-    throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
-  }
-
-  const result = await response.json();
-
-  if (!result.success) {
-    throw new Error(result.error || 'Tool call failed');
-  }
-
-  // Parse MCP response format
-  const content = result.result?.content?.[0]?.text;
-  return content ? JSON.parse(content) : null;
+  return parseEgdeskMcpToolResponse(response);
 }
 
 /**
@@ -329,18 +356,7 @@ export async function callFinanceHubTool(
     });
   }
 
-  if (!response.ok) {
-    throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
-  }
-
-  const result = await response.json();
-
-  if (!result.success) {
-    throw new Error(result.error || 'Tool call failed');
-  }
-
-  const content = result.result?.content?.[0]?.text;
-  return content ? JSON.parse(content) : null;
+  return parseEgdeskMcpToolResponse(response);
 }
 
 /**
@@ -485,18 +501,7 @@ export async function callBrowserRecordingTool(
     });
   }
 
-  if (!response.ok) {
-    throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
-  }
-
-  const result = await response.json();
-
-  if (!result.success) {
-    throw new Error(result.error || 'Tool call failed');
-  }
-
-  const content = result.result?.content?.[0]?.text;
-  return content ? JSON.parse(content) : null;
+  return parseEgdeskMcpToolResponse(response);
 }
 
 /** List saved *.spec.js files in the EGDesk browser-recorder-tests output folder */

package/dist/setup-userdata.js

@@ -66,12 +66,20 @@ async function discoverTables(egdeskUrl = 'http://localhost:8080', apiKey) {
                 arguments: {}
             })
         });
+        const listResult = await listResponse.json().catch(() => null);
+        if (listResult && typeof listResult === 'object' && listResult.success === false) {
+            throw new Error(listResult.error || 'Failed to list tables');
+        }
         if (!listResponse.ok) {
-            throw new Error(`Failed to list tables: ${listResponse.statusText}`);
+            const fromBody = listResult && typeof listResult === 'object' && typeof listResult.error === 'string'
+                ? listResult.error
+                : '';
+            throw new Error(fromBody || `Failed to list tables: ${listResponse.status} ${listResponse.statusText}`);
         }
-        const listResult = await listResponse.json();
-        if (!listResult.success) {
-            throw new Error(listResult.error || 'Failed to list tables');
+        if (!listResult || !listResult.success) {
+            throw new Error(listResult && typeof listResult === 'object' && listResult.error
+                ? String(listResult.error)
+                : 'Failed to list tables');
         }
         // Parse MCP response
         const content = listResult.result?.content?.[0]?.text;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@egdesk/next-api-plugin",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Next.js plugin for EGDesk database proxy integration",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/generate-helpers.ts

@@ -25,6 +25,45 @@ export function generateHelpers(projectPath: string): void {
 
 import { EGDESK_CONFIG } from './egdesk.config';
 
+/**
+ * Parse EGDesk MCP \`/tools/call\` JSON so \`error\` is shown even when HTTP status is 500.
+ */
+async function parseEgdeskMcpToolResponse(response: Response): Promise<any> {
+  const result = await response.json().catch(() => null);
+
+  if (result && typeof result === 'object' && result.success === false) {
+    const errMsg =
+      typeof result.error === 'string'
+        ? result.error
+        : result.error != null
+          ? String(result.error)
+          : 'Tool call failed';
+    throw new Error(errMsg);
+  }
+
+  if (!response.ok) {
+    let fromBody = '';
+    if (result && typeof result === 'object') {
+      if (typeof result.error === 'string') fromBody = result.error;
+      else if (typeof (result as { message?: string }).message === 'string') {
+        fromBody = (result as { message: string }).message;
+      }
+    }
+    throw new Error(fromBody || \`HTTP \${response.status}: \${response.statusText}\`);
+  }
+
+  if (!result || result.success !== true) {
+    throw new Error(
+      result && typeof result === 'object' && typeof result.error === 'string'
+        ? result.error
+        : 'Tool call failed'
+    );
+  }
+
+  const content = result.result?.content?.[0]?.text;
+  return content ? JSON.parse(content) : null;
+}
+
 /**
  * Call EGDesk user-data MCP tool
  *
@@ -70,19 +109,7 @@ export async function callUserDataTool(
     });
   }
 
-  if (!response.ok) {
-    throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
-  }
-
-  const result = await response.json();
-
-  if (!result.success) {
-    throw new Error(result.error || 'Tool call failed');
-  }
-
-  // Parse MCP response format
-  const content = result.result?.content?.[0]?.text;
-  return content ? JSON.parse(content) : null;
+  return parseEgdeskMcpToolResponse(response);
 }
 
 /**
@@ -296,18 +323,7 @@ export async function callFinanceHubTool(
     });
   }
 
-  if (!response.ok) {
-    throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
-  }
-
-  const result = await response.json();
-
-  if (!result.success) {
-    throw new Error(result.error || 'Tool call failed');
-  }
-
-  const content = result.result?.content?.[0]?.text;
-  return content ? JSON.parse(content) : null;
+  return parseEgdeskMcpToolResponse(response);
 }
 
 /**
@@ -452,18 +468,7 @@ export async function callBrowserRecordingTool(
     });
   }
 
-  if (!response.ok) {
-    throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
-  }
-
-  const result = await response.json();
-
-  if (!result.success) {
-    throw new Error(result.error || 'Tool call failed');
-  }
-
-  const content = result.result?.content?.[0]?.text;
-  return content ? JSON.parse(content) : null;
+  return parseEgdeskMcpToolResponse(response);
 }
 
 /** List saved *.spec.js files in the EGDesk browser-recorder-tests output folder */

package/src/setup-userdata.ts

@@ -53,14 +53,26 @@ export async function discoverTables(
       })
     });
 
-    if (!listResponse.ok) {
-      throw new Error(`Failed to list tables: ${listResponse.statusText}`);
+    const listResult = await listResponse.json().catch(() => null);
+
+    if (listResult && typeof listResult === 'object' && listResult.success === false) {
+      throw new Error(listResult.error || 'Failed to list tables');
     }
 
-    const listResult = await listResponse.json();
+    if (!listResponse.ok) {
+      const fromBody =
+        listResult && typeof listResult === 'object' && typeof listResult.error === 'string'
+          ? listResult.error
+          : '';
+      throw new Error(fromBody || `Failed to list tables: ${listResponse.status} ${listResponse.statusText}`);
+    }
 
-    if (!listResult.success) {
-      throw new Error(listResult.error || 'Failed to list tables');
+    if (!listResult || !listResult.success) {
+      throw new Error(
+        listResult && typeof listResult === 'object' && listResult.error
+          ? String(listResult.error)
+          : 'Failed to list tables'
+      );
     }
 
     // Parse MCP response