remove unnecessary state from radar mcp server

Author: andre-j3sus

apps/radar/src/index.ts

@@ -3,66 +3,38 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { McpAgent } from 'agents/mcp'
 import { env } from 'cloudflare:workers'
 
-import {
-	createAuthHandlers,
-	handleTokenExchangeCallback,
-} from '@repo/mcp-common/src/cloudflare-oauth-handler'
-import { registerAccountTools } from '@repo/mcp-common/src/tools/account'
+import { createAuthHandlers, handleTokenExchangeCallback, } from '@repo/mcp-common/src/cloudflare-oauth-handler'
 
 import { registerRadarTools } from './tools/radar'
 
-import type { AccountSchema, UserSchema } from '@repo/mcp-common/src/cloudflare-oauth-handler'
-
 // Context from the auth process, encrypted & stored in the auth token
 // and provided to the DurableMCP as this.props
 export type Props = {
 	accessToken: string
-	user: UserSchema['result']
-	accounts: AccountSchema['result']
 }
 
-export type State = { activeAccountId: string | null }
+export type State = never
 
 export class RadarMCP extends McpAgent<Env, State, Props> {
 	server = new McpServer({
 		name: 'Remote MCP Server with Cloudflare Radar Data',
 		version: '1.0.0',
 	})
 
-	initialState: State = {
-		activeAccountId: null,
+	constructor(
+		public ctx: DurableObjectState,
+		public env: Env
+	) {
+		super(ctx, env)
 	}
 
 	async init() {
-		registerAccountTools(this)
-
 		registerRadarTools(this)
 	}
-
-	getActiveAccountId() {
-		// TODO: Figure out why this fail sometimes, and why we need to wrap this in a try catch
-		try {
-			return this.state.activeAccountId ?? null
-		} catch (e) {
-			return null
-		}
-	}
-
-	setActiveAccountId(accountId: string) {
-		// TODO: Figure out why this fail sometimes, and why we need to wrap this in a try catch
-		try {
-			this.setState({
-				...this.state,
-				activeAccountId: accountId,
-			})
-		} catch (e) {
-			return null
-		}
-	}
 }
 
+// TODO review these scopes
 const RadarScopes = {
-	'account:read': 'See your account info such as account details, analytics, and memberships.',
 	'user:read': 'See your user info such as name, email address, and account memberships.',
 	offline_access: 'Grants refresh tokens for long-lived access.',
 } as const

apps/radar/src/tools/radar.ts

@@ -1,16 +1,17 @@
 import { getCloudflareClient } from '@repo/mcp-common/src/cloudflare-api'
-import { type CloudflareMcpAgent } from '@repo/mcp-common/src/types/cloudflare-mcp-agent'
 import { PaginationLimitParam, PaginationOffsetParam } from '@repo/mcp-common/src/types/shared'
 
 import {
 	AsnParam,
 	AsOrderByParam,
-	DateRangeParam,
+	DateEndParam,
+	DateStartParam,
 	IpParam,
 	SingleLocationParam,
 } from '../types/radar'
+import type { RadarMCP } from "../index";
 
-export function registerRadarTools(agent: CloudflareMcpAgent) {
+export function registerRadarTools(agent: RadarMCP) {
 	agent.server.tool(
 		'radar_ases_list',
 		'List Autonomous Systems',
@@ -129,17 +130,20 @@ export function registerRadarTools(agent: CloudflareMcpAgent) {
 			offset: PaginationOffsetParam,
 			asn: AsnParam.optional(),
 			location: SingleLocationParam,
-			dateRange: DateRangeParam,
+			// TODO maybe we don't need this param since we have the other two dateRange: DateRangeParam.optional(),
+			dateStart: DateStartParam,
+			dateEnd: DateEndParam,
 		},
-		async ({ limit, offset, asn, location, dateRange }) => {
+		async ({ limit, offset, asn, location, dateStart, dateEnd }) => {
 			try {
 				const client = getCloudflareClient(agent.props.accessToken)
 				const r = await client.radar.trafficAnomalies.get({
 					limit: limit ?? undefined,
 					offset: offset ?? undefined,
 					asn: asn ?? undefined,
 					location: location ?? undefined,
-					dateRange: dateRange ?? undefined,
+					dateStart: dateStart,
+					dateEnd: dateEnd,
 					status: 'VERIFIED',
 				})
 

apps/radar/src/types/radar.ts

@@ -18,6 +18,9 @@ export const DateRangeParam: z.ZodType<TrafficAnomalyGetParams['dateRange']> = z
 		'Invalid Date Range'
 	)
 
+export const DateStartParam: z.ZodType<TrafficAnomalyGetParams['dateStart']> = z.string().datetime()
+export const DateEndParam: z.ZodType<TrafficAnomalyGetParams['dateEnd']> = z.string().datetime()
+
 export const SingleLocationParam: z.ZodType<ASNListParams['location']> = z
 	.string()
 	.regex(/^[a-zA-Z]{2}$/, {