@forestadmin/mcp-server 1.8.1 → 1.8.3

package/dist/server.d.ts

@@ -1,8 +1,6 @@
 import './polyfills';
 import type { ForestServerClient } from './http-client';
 import type { Express } from 'express';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import * as http from 'http';
 export declare const LOGO_URL = "https://forest-assets.s3.us-east-1.amazonaws.com/logo-green.png";
 export type LogLevel = 'Debug' | 'Info' | 'Warn' | 'Error';
@@ -32,8 +30,6 @@ export interface ForestMCPServerOptions {
  * with OAuth authentication support.
  */
 export default class ForestMCPServer {
-    mcpServer: McpServer;
-    mcpTransport?: StreamableHTTPServerTransport;
     httpServer?: http.Server;
     expressApp?: Express;
     forestServerUrl: string;
@@ -42,9 +38,11 @@ export default class ForestMCPServer {
     private envSecret?;
     private authSecret?;
     private logger;
+    private collectionNames;
     constructor(options?: ForestMCPServerOptions);
     private createDefaultForestServerClient;
-    private setupTools;
+    private fetchCollectionNames;
+    private createMcpServer;
     private ensureSecretsAreSet;
     /**
      * Filters tool arguments to only include non-sensitive fields for logging.

package/dist/server.js

@@ -111,6 +111,7 @@ const SAFE_ARGUMENTS_FOR_LOGGING = {
  */
 class ForestMCPServer {
     constructor(options) {
+        this.collectionNames = [];
         this.forestServerUrl = options?.forestServerUrl || 'https://api.forestadmin.com';
         this.forestAppUrl = options?.forestAppUrl || 'https://app.forestadmin.com';
         this.envSecret = options?.envSecret;
@@ -118,11 +119,6 @@ class ForestMCPServer {
         this.logger = options?.logger || defaultLogger;
         // Use injected forestServerClient or create default
         this.forestServerClient = options?.forestServerClient ?? this.createDefaultForestServerClient();
-        this.mcpServer = new mcp_js_1.McpServer({
-            name: version_1.NAME,
-            version: version_1.VERSION,
-            icons: [{ src: exports.LOGO_URL, mimeType: 'image/png' }],
-        });
     }
     createDefaultForestServerClient() {
         return (0, http_client_1.createForestServerClient)({
@@ -130,28 +126,35 @@ class ForestMCPServer {
             envSecret: this.envSecret,
         });
     }
-    async setupTools() {
-        let collectionNames = [];
+    async fetchCollectionNames() {
         try {
             const schema = await (0, schema_fetcher_1.fetchForestSchema)(this.forestServerClient);
-            collectionNames = (0, schema_fetcher_1.getCollectionNames)(schema);
+            this.collectionNames = (0, schema_fetcher_1.getCollectionNames)(schema);
         }
         catch (error) {
             this.logger('Warn', `Failed to fetch forest schema: ${error}. MCP server will operate in degraded mode without collection name validation.`);
         }
+    }
+    createMcpServer() {
+        const mcpServer = new mcp_js_1.McpServer({
+            name: version_1.NAME,
+            version: version_1.VERSION,
+            icons: [{ src: exports.LOGO_URL, mimeType: 'image/png' }],
+        });
         const toolNames = [
-            (0, describe_collection_1.default)(this.mcpServer, this.forestServerClient, this.logger, collectionNames),
-            (0, list_1.default)(this.mcpServer, this.forestServerClient, this.logger, collectionNames),
-            (0, list_related_1.default)(this.mcpServer, this.forestServerClient, this.logger, collectionNames),
-            (0, create_1.default)(this.mcpServer, this.forestServerClient, this.logger, collectionNames),
-            (0, update_1.default)(this.mcpServer, this.forestServerClient, this.logger, collectionNames),
-            (0, delete_1.default)(this.mcpServer, this.forestServerClient, this.logger, collectionNames),
-            (0, associate_1.default)(this.mcpServer, this.forestServerClient, this.logger, collectionNames),
-            (0, dissociate_1.default)(this.mcpServer, this.forestServerClient, this.logger, collectionNames),
-            (0, get_action_form_1.default)(this.mcpServer, this.forestServerClient, this.logger, collectionNames),
-            (0, execute_action_1.default)(this.mcpServer, this.forestServerClient, this.logger, collectionNames),
+            (0, describe_collection_1.default)(mcpServer, this.forestServerClient, this.logger, this.collectionNames),
+            (0, list_1.default)(mcpServer, this.forestServerClient, this.logger, this.collectionNames),
+            (0, list_related_1.default)(mcpServer, this.forestServerClient, this.logger, this.collectionNames),
+            (0, create_1.default)(mcpServer, this.forestServerClient, this.logger, this.collectionNames),
+            (0, update_1.default)(mcpServer, this.forestServerClient, this.logger, this.collectionNames),
+            (0, delete_1.default)(mcpServer, this.forestServerClient, this.logger, this.collectionNames),
+            (0, associate_1.default)(mcpServer, this.forestServerClient, this.logger, this.collectionNames),
+            (0, dissociate_1.default)(mcpServer, this.forestServerClient, this.logger, this.collectionNames),
+            (0, get_action_form_1.default)(mcpServer, this.forestServerClient, this.logger, this.collectionNames),
+            (0, execute_action_1.default)(mcpServer, this.forestServerClient, this.logger, this.collectionNames),
         ];
-        this.logger('Info', `Registered ${toolNames.length} tools: ${toolNames.join(', ')}`);
+        this.logger('Debug', `Registered ${toolNames.length} tools: ${toolNames.join(', ')}`);
+        return mcpServer;
     }
     ensureSecretsAreSet() {
         if (!this.envSecret) {
@@ -190,16 +193,35 @@ class ForestMCPServer {
     async handleMcpRequest(req, res) {
         const rpcMethod = req.body?.method || 'unknown';
         this.logger('Info', `Incoming ${req.method} ${req.path} [${rpcMethod}]`);
-        if (!this.mcpTransport) {
-            throw new Error('MCP transport not initialized');
-        }
         this.logToolCallIfPresent(req);
         (0, sse_error_logger_1.default)(res, this.logger);
-        await this.mcpTransport.handleRequest(req, res, req.body);
-        // The Hono adapter inside @modelcontextprotocol/sdk catches errors internally
-        // and writes 500 directly to the response without logging. Detect and log these.
-        if (res.statusCode >= 500) {
-            this.logger('Error', `Transport returned HTTP ${res.statusCode} for [${rpcMethod}]`);
+        const server = this.createMcpServer();
+        const transport = new streamableHttp_js_1.StreamableHTTPServerTransport({ sessionIdGenerator: undefined });
+        const cleanup = async () => {
+            await transport.close();
+        };
+        try {
+            await server.connect(transport);
+            await transport.handleRequest(req, res, req.body);
+            // The Hono adapter inside @modelcontextprotocol/sdk catches errors internally
+            // and writes 500 directly to the response without logging. Detect and log these.
+            if (res.statusCode >= 500) {
+                this.logger('Error', `Transport returned HTTP ${res.statusCode} for [${rpcMethod}]`);
+            }
+        }
+        finally {
+            if (res.writableEnded) {
+                await cleanup().catch(err => {
+                    this.logger('Warn', `Error during MCP cleanup: ${err}`);
+                });
+            }
+            else {
+                res.on('close', () => {
+                    cleanup().catch(err => {
+                        this.logger('Warn', `Error during MCP cleanup: ${err}`);
+                    });
+                });
+            }
         }
     }
     /**
@@ -212,12 +234,7 @@ class ForestMCPServer {
      */
     async buildExpressApp(baseUrl) {
         const { envSecret, authSecret } = this.ensureSecretsAreSet();
-        // Fetch schema and setup tools before building the app
-        await this.setupTools();
-        this.mcpTransport = new streamableHttp_js_1.StreamableHTTPServerTransport({
-            sessionIdGenerator: undefined,
-        });
-        await this.mcpServer.connect(this.mcpTransport);
+        await this.fetchCollectionNames();
         const app = (0, express_1.default)();
         // Trust proxy headers when behind a reverse proxy (e.g., load balancer, nginx)
         // This is required for express-rate-limit to correctly identify clients
@@ -391,4 +408,4 @@ class ForestMCPServer {
     }
 }
 exports.default = ForestMCPServer;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}

package/dist/utils/tool-with-logging.d.ts

@@ -1,5 +1,7 @@
 import type { Logger } from '../server';
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
+import type { CallToolResult, ServerNotification, ServerRequest } from '@modelcontextprotocol/sdk/types.js';
 import { z } from 'zod';
 type ZodRawShape = Record<string, z.ZodTypeAny>;
 interface ToolConfig<TSchema extends ZodRawShape> {
@@ -7,13 +9,7 @@ interface ToolConfig<TSchema extends ZodRawShape> {
     description: string;
     inputSchema: TSchema;
 }
-type ToolResult = {
-    content: {
-        type: string;
-        text: string;
-    }[];
-    isError?: boolean;
-};
+type ToolHandlerExtra = RequestHandlerExtra<ServerRequest, ServerNotification>;
 /**
  * Registers an MCP tool with automatic validation error logging.
  *
@@ -39,6 +35,6 @@ type ToolResult = {
  *   logger,
  * );
  */
-export default function registerToolWithLogging<TSchema extends ZodRawShape, TArgs = z.infer<z.ZodObject<TSchema>>>(mcpServer: McpServer, toolName: string, config: ToolConfig<TSchema>, handler: (args: TArgs, extra: any) => Promise<ToolResult>, logger: Logger): string;
+export default function registerToolWithLogging<TSchema extends ZodRawShape, TArgs = z.infer<z.ZodObject<TSchema>>>(mcpServer: McpServer, toolName: string, config: ToolConfig<TSchema>, handler: (args: TArgs, extra: ToolHandlerExtra) => Promise<CallToolResult>, logger: Logger): string;
 export {};
 //# sourceMappingURL=tool-with-logging.d.ts.map

package/dist/utils/tool-with-logging.js

@@ -51,13 +51,9 @@ function logValidationErrorsIfAny(args, schema, toolName, logger) {
  *   logger,
  * );
  */
-function registerToolWithLogging(mcpServer, toolName, config, 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-handler, logger) {
+function registerToolWithLogging(mcpServer, toolName, config, handler, logger) {
     const schema = zod_1.z.object(config.inputSchema);
-    mcpServer.registerTool(toolName, config, 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (async (args, extra) => {
+    mcpServer.registerTool(toolName, config, async (args, extra) => {
         logValidationErrorsIfAny(args, schema, toolName, logger);
         // Return errors as tool results (isError: true) instead of throwing.
         // Per MCP spec, tool errors should be reported within the result object,
@@ -79,8 +75,7 @@ handler, logger) {
                 isError: true,
             };
         }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    }));
+    });
     return toolName;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9vbC13aXRoLWxvZ2dpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvdG9vbC13aXRoLWxvZ2dpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFpRkEsMENBNkNDO0FBM0hELDZCQUF3QjtBQW1CeEIsZ0ZBQWdGO0FBQ2hGLHFCQUFxQjtBQUNyQixnRkFBZ0Y7QUFFaEY7OztHQUdHO0FBQ0gsU0FBUyxjQUFjLENBQUMsS0FBaUI7SUFDdkMsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQzNGLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxTQUFTLHdCQUF3QixDQUMvQixJQUFhLEVBQ2IsTUFBbUIsRUFDbkIsUUFBZ0IsRUFDaEIsTUFBYztJQUVkLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNwQixNQUFNLFlBQVksR0FBRyxjQUFjLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ2xELE1BQU0sQ0FBQyxPQUFPLEVBQUUsU0FBUyxRQUFRLHVCQUF1QixZQUFZLEVBQUUsQ0FBQyxDQUFDO0lBQzFFLENBQUM7QUFDSCxDQUFDO0FBRUQsZ0ZBQWdGO0FBQ2hGLG9CQUFvQjtBQUNwQixnRkFBZ0Y7QUFFaEY7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQXdCRztBQUNILFNBQXdCLHVCQUF1QixDQUk3QyxTQUFvQixFQUNwQixRQUFnQixFQUNoQixNQUEyQjtBQUMzQiw4REFBOEQ7QUFDOUQsT0FBeUQsRUFDekQsTUFBYztJQUVkLE1BQU0sTUFBTSxHQUFHLE9BQUMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBRTVDLFNBQVMsQ0FBQyxZQUFZLENBQ3BCLFFBQVEsRUFDUixNQUFNO0lBQ04sOERBQThEO0lBQzlELENBQUMsS0FBSyxFQUFFLElBQVMsRUFBRSxLQUFVLEVBQUUsRUFBRTtRQUMvQix3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUV6RCxxRUFBcUU7UUFDckUseUVBQXlFO1FBQ3pFLG9FQUFvRTtRQUNwRSwyREFBMkQ7UUFDM0QsSUFBSSxDQUFDO1lBQ0gsT0FBTyxNQUFNLE9BQU8sQ0FBQyxJQUFhLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDN0MsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDZixJQUFJLE9BQWUsQ0FBQztZQUVwQixJQUFJLENBQUM7Z0JBQ0gsT0FBTyxHQUFHLEtBQUssWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLElBQUksTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzVGLENBQUM7WUFBQyxNQUFNLENBQUM7Z0JBQ1AsT0FBTyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUMxQixDQUFDO1lBRUQsT0FBTztnQkFDTCxPQUFPLEVBQUUsQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDO2dCQUMxQyxPQUFPLEVBQUUsSUFBSTthQUNkLENBQUM7UUFDSixDQUFDO1FBQ0QsOERBQThEO0lBQ2hFLENBQUMsQ0FBUSxDQUNWLENBQUM7SUFFRixPQUFPLFFBQVEsQ0FBQztBQUNsQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9vbC13aXRoLWxvZ2dpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvdG9vbC13aXRoLWxvZ2dpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFzRkEsMENBMENDO0FBdkhELDZCQUF3QjtBQWtCeEIsZ0ZBQWdGO0FBQ2hGLHFCQUFxQjtBQUNyQixnRkFBZ0Y7QUFFaEY7OztHQUdHO0FBQ0gsU0FBUyxjQUFjLENBQUMsS0FBaUI7SUFDdkMsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQzNGLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxTQUFTLHdCQUF3QixDQUMvQixJQUFhLEVBQ2IsTUFBbUIsRUFDbkIsUUFBZ0IsRUFDaEIsTUFBYztJQUVkLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNwQixNQUFNLFlBQVksR0FBRyxjQUFjLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ2xELE1BQU0sQ0FBQyxPQUFPLEVBQUUsU0FBUyxRQUFRLHVCQUF1QixZQUFZLEVBQUUsQ0FBQyxDQUFDO0lBQzFFLENBQUM7QUFDSCxDQUFDO0FBRUQsZ0ZBQWdGO0FBQ2hGLG9CQUFvQjtBQUNwQixnRkFBZ0Y7QUFFaEY7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQXdCRztBQUNILFNBQXdCLHVCQUF1QixDQUk3QyxTQUFvQixFQUNwQixRQUFnQixFQUNoQixNQUEyQixFQUMzQixPQUEwRSxFQUMxRSxNQUFjO0lBRWQsTUFBTSxNQUFNLEdBQUcsT0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7SUFFNUMsU0FBUyxDQUFDLFlBQVksQ0FDcEIsUUFBUSxFQUNSLE1BQTRCLEVBQzVCLEtBQUssRUFBRSxJQUE2QixFQUFFLEtBQXVCLEVBQUUsRUFBRTtRQUMvRCx3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUV6RCxxRUFBcUU7UUFDckUseUVBQXlFO1FBQ3pFLG9FQUFvRTtRQUNwRSwyREFBMkQ7UUFDM0QsSUFBSSxDQUFDO1lBQ0gsT0FBTyxNQUFNLE9BQU8sQ0FBQyxJQUFhLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDN0MsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDZixJQUFJLE9BQWUsQ0FBQztZQUVwQixJQUFJLENBQUM7Z0JBQ0gsT0FBTyxHQUFHLEtBQUssWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLElBQUksTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzVGLENBQUM7WUFBQyxNQUFNLENBQUM7Z0JBQ1AsT0FBTyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUMxQixDQUFDO1lBRUQsT0FBTztnQkFDTCxPQUFPLEVBQUUsQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFlLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDO2dCQUNuRCxPQUFPLEVBQUUsSUFBSTthQUNkLENBQUM7UUFDSixDQUFDO0lBQ0gsQ0FBQyxDQUNGLENBQUM7SUFFRixPQUFPLFFBQVEsQ0FBQztBQUNsQixDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/mcp-server",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "Model Context Protocol server for Forest Admin with OAuth authentication",
   "main": "dist/index.js",
   "bin": {
@@ -16,14 +16,14 @@
     "directory": "packages/mcp-server"
   },
   "dependencies": {
-    "@forestadmin/agent-client": "1.4.6",
-    "@forestadmin/forestadmin-client": "1.37.10",
-    "@modelcontextprotocol/sdk": "^1.25.1",
+    "@forestadmin/agent-client": "1.4.8",
+    "@forestadmin/forestadmin-client": "1.37.12",
+    "@modelcontextprotocol/sdk": "^1.26.0",
     "cors": "^2.8.5",
     "express": "^5.2.1",
     "jsonapi-serializer": "^3.6.9",
     "jsonwebtoken": "^9.0.3",
-    "zod": "^4.2.1"
+    "zod": "^4.3.5"
   },
   "files": [
     "dist/**/*.js",
@@ -43,7 +43,7 @@
     "@types/express": "^5.0.0",
     "@types/node": "^18.11.18",
     "@types/supertest": "^6.0.2",
-    "superagent": "^10.2.3",
+    "superagent": "^10.3.0",
     "supertest": "^7.1.3",
     "typescript": "^5.0.0"
   }