Fix bug with props not being initialized in constructor

Author: cmsparks

apps/sandbox-container/server/containerMcp.ts

@@ -13,23 +13,25 @@ import type { FileList } from '../shared/schema'
 import type { Props } from '.'
 
 export class ContainerMcpAgent extends McpAgent<Env, {}, Props> {
-	server: CloudflareMCPServer
+	_server: CloudflareMCPServer | undefined
+	set server(server: CloudflareMCPServer) {
+		this._server = server
+	}
+
+	get server(): CloudflareMCPServer {
+		if (!this._server) {
+			throw new Error('Tried to access server before it was initialized')
+		}
+
+		return this._server
+	}
 
 	constructor(
 		public ctx: DurableObjectState,
 		public env: Env
 	) {
 		console.log('creating container DO')
 		super(ctx, env)
-		this.server = new CloudflareMCPServer(
-			this.props.user.id,
-			this.env.MCP_METRICS,
-			{
-				name: this.env.MCP_SERVER_NAME,
-				version: this.env.MCP_SERVER_VERSION,
-			},
-			{ instructions: BASE_INSTRUCTIONS }
-		)
 	}
 
 	async destroyContainer(): Promise<void> {
@@ -48,6 +50,17 @@ export class ContainerMcpAgent extends McpAgent<Env, {}, Props> {
 	}
 
 	async init() {
+		this.props.user.id
+		this.server = new CloudflareMCPServer(
+			this.props.user.id,
+			this.env.MCP_METRICS,
+			{
+				name: this.env.MCP_SERVER_NAME,
+				version: this.env.MCP_SERVER_VERSION,
+			},
+			{ instructions: BASE_INSTRUCTIONS }
+		)
+
 		this.server.tool(
 			'container_initialize',
 			'Start or reset the container',

apps/sandbox-container/server/index.ts

@@ -41,7 +41,14 @@ export default {
 	fetch: (req: Request, env: Env, ctx: ExecutionContext) => {
 		// @ts-ignore
 		if (env.ENVIRONMENT === 'test') {
-			ctx.props = {}
+			ctx.props = {
+				accessToken: 'foobar',
+				user: {
+					id: '123def',
+					email: '[email protected]',
+				},
+				accounts: [],
+			} as Props
 			return ContainerMcpAgent.mount('/sse', { binding: 'CONTAINER_MCP_AGENT' }).fetch(
 				req,
 				env as Record<string, DurableObjectNamespace<McpAgent> | any>,

apps/workers-bindings/src/index.ts

@@ -32,21 +32,33 @@ export type Props = {
 }
 
 export class WorkersBindingsMCP extends McpAgent<Env, WorkersBindingsMCPState, Props> {
-	server: CloudflareMCPServer
+	_server: CloudflareMCPServer | undefined
+	set server(server: CloudflareMCPServer) {
+		this._server = server
+	}
+
+	get server(): CloudflareMCPServer {
+		if (!this._server) {
+			throw new Error('Tried to access server before it was initialized')
+		}
+
+		return this._server
+	}
 
 	initialState: WorkersBindingsMCPState = {
 		activeAccountId: null,
 	}
 
 	constructor(ctx: DurableObjectState, env: Env) {
 		super(ctx, env)
+	}
+
+	async init() {
 		this.server = new CloudflareMCPServer(this.props.user.id, this.env.MCP_METRICS, {
 			name: this.env.MCP_SERVER_NAME,
 			version: this.env.MCP_SERVER_VERSION,
 		})
-	}
 
-	async init() {
 		registerAccountTools(this)
 		registerKVTools(this)
 		registerWorkersTools(this)

apps/workers-observability/src/index.ts

@@ -31,21 +31,33 @@ export type Props = {
 export type State = { activeAccountId: string | null }
 
 export class ObservabilityMCP extends McpAgent<Env, State, Props> {
-	server: CloudflareMCPServer
+	_server: CloudflareMCPServer | undefined
+	set server(server: CloudflareMCPServer) {
+		this._server = server
+	}
+
+	get server(): CloudflareMCPServer {
+		if (!this._server) {
+			throw new Error('Tried to access server before it was initialized')
+		}
+
+		return this._server
+	}
 
 	initialState: State = {
 		activeAccountId: null,
 	}
 
 	constructor(ctx: DurableObjectState, env: Env) {
 		super(ctx, env)
+	}
+
+	async init() {
 		this.server = new CloudflareMCPServer(this.props.user.id, this.env.MCP_METRICS, {
 			name: this.env.MCP_SERVER_NAME,
 			version: this.env.MCP_SERVER_VERSION,
 		})
-	}
 
-	async init() {
 		registerAccountTools(this)
 
 		// Register Cloudflare Workers tools

packages/mcp-common/src/cloudflare-oauth-handler.ts

@@ -2,7 +2,7 @@ import { zValidator } from '@hono/zod-validator'
 import { Hono } from 'hono'
 import { z } from 'zod'
 
-import { AuthUser, type MetricsTracker } from '@repo/mcp-observability'
+import { AuthUser } from '@repo/mcp-observability'
 
 import { getAuthorizationURL, getAuthToken, refreshAuthToken } from './cloudflare-auth'
 import { McpError } from './mcp-error'
@@ -13,6 +13,7 @@ import type {
 	TokenExchangeCallbackResult,
 } from '@cloudflare/workers-oauth-provider'
 import type { Context } from 'hono'
+import type { MetricsTracker } from '@repo/mcp-observability'
 
 type AuthContext = {
 	Bindings: {

packages/mcp-common/src/server.ts

@@ -1,18 +1,19 @@
 import { isPromise } from 'node:util/types'
 import { type ServerOptions } from '@modelcontextprotocol/sdk/server/index.js'
-import { McpServer, type ToolCallback } from '@modelcontextprotocol/sdk/server/mcp.js'
-
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { type ZodRawShape } from 'zod'
 
 import { MetricsTracker, SessionStart, ToolCall } from '@repo/mcp-observability'
 
 import { McpError } from './mcp-error'
 
+import type { ToolCallback } from '@modelcontextprotocol/sdk/server/mcp.js'
+
 export class CloudflareMCPServer extends McpServer {
 	private metrics
 
 	constructor(
-		private userId: string | undefined,
+		userId: string | undefined,
 		wae: AnalyticsEngineDataset,
 		serverInfo: {
 			[x: string]: unknown
@@ -49,30 +50,30 @@ export class CloudflareMCPServer extends McpServer {
 								// promise succeeds
 								this.metrics.logEvent(
 									new ToolCall({
-										userId,
 										toolName: name,
+										userId,
 									})
 								)
 								return r
 							})
 							.catch((e: any) => {
 								// promise throws
-								this.trackToolCallError(e, name)
+								this.trackToolCallError(e, name, userId)
 								throw e
 							})
 					} else {
 						// non-promise succeeds
 						this.metrics.logEvent(
 							new ToolCall({
-								userId,
 								toolName: name,
+								userId,
 							})
 						)
 						return toolCall
 					}
 				} catch (e: any) {
 					// non-promise throws
-					this.trackToolCallError(e, name)
+					this.trackToolCallError(e, name, userId)
 					throw e
 				}
 			}
@@ -83,15 +84,15 @@ export class CloudflareMCPServer extends McpServer {
 		}
 	}
 
-	private trackToolCallError(e: any, toolName: string) {
+	private trackToolCallError(e: any, toolName: string, userId?: string) {
 		let errorCode = -1
 		if (e instanceof McpError) {
 			errorCode = e.code
 		}
 		this.metrics.logEvent(
 			new ToolCall({
 				toolName,
-				userId: this.userId,
+				userId: userId,
 				errorCode: errorCode,
 			})
 		)