Merge pull request #37 from cloudflare/use-typescript-sdk-for-account-list-and-workers-endpoints

Use typescript SDK for account list + workers endpoints

Author: Maximo-Guk

.prettierrc.cjs

@@ -30,12 +30,7 @@ const config = {
 	semi: false,
 	singleQuote: true,
 	printWidth: 100,
-	plugins: [
-		'@ianvs/prettier-plugin-sort-imports',
-		'prettier-plugin-packagejson',
-		'prettier-plugin-astro',
-		'prettier-plugin-tailwindcss',
-	],
+	plugins: ['@ianvs/prettier-plugin-sort-imports'],
 	importOrder: [...codeImports, ...typeImports],
 	importOrderTypeScriptVersion: '5.5.4',
 	overrides: [

apps/workers-observability/src/tools/account.ts

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import type { MyMCP } from "../index";
 import { handleAccountsList } from "@repo/mcp-common/src/api/account"
+import { getCloudflareClient } from "@repo/mcp-common/src/cloudflare-api";
 
 export function registerAccountTools(agent: MyMCP) {
 	// Tool to list all accounts
@@ -10,7 +11,7 @@ export function registerAccountTools(agent: MyMCP) {
 		{},
 		async () => {
 			try {
-				const results = await handleAccountsList({ apiToken: agent.props.accessToken });
+				const results = await handleAccountsList({client: getCloudflareClient(agent.props.accessToken)});
 				// Sort accounts by created_on date (newest first)
 				const accounts = results
 					// order by created_on desc ( newest first )

apps/workers-observability/src/tools/workers.ts

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import type { MyMCP } from "../index";
 import { handleWorkersList, handleWorkerScriptDownload } from "@repo/mcp-common/src/api/workers"
+import { getCloudflareClient } from "@repo/mcp-common/src/cloudflare-api";
 
 /**
  * Registers the workers tools with the MCP server
@@ -31,8 +32,8 @@ export function registerWorkersTools(agent: MyMCP) {
 			}
 			try {
 				const results = await handleWorkersList({
+					client: getCloudflareClient(agent.props.accessToken),
 					accountId,
-					apiToken: agent.props.accessToken,
 				});
 				// Extract worker details and sort by created_on date (newest first)
 				const workers = results
@@ -92,9 +93,9 @@ export function registerWorkersTools(agent: MyMCP) {
 			try {
 				const { scriptName } = params;
 				const scriptContent = await handleWorkerScriptDownload({
+					client: getCloudflareClient(agent.props.accessToken),
 					scriptName,
 					accountId,
-					apiToken: agent.props.accessToken,
 				});
 				return {
 					content: [

apps/workers-observability/wrangler.jsonc

@@ -19,6 +19,20 @@
 	"dev": {
 		"port": 8976
 	},
+	"durable_objects": {
+		"bindings": [
+			{
+				"class_name": "MyMCP",
+				"name": "MCP_OBJECT"
+			}
+		]
+	},
+	"kv_namespaces": [
+		{
+			"binding": "OAUTH_KV",
+			"id": "DEV_KV"
+		}
+	],
 	"workers_dev": false,
 	"preview_urls": false,
 	"env": {

packages/mcp-common/src/api/account.ts

@@ -1,32 +1,12 @@
-import { z } from "zod";
-import { V4Schema } from "../v4-api";
-
-type AccountSchema = z.infer<typeof AccountSchema>
-const AccountSchema = z.object({
-	id: z.string(),
-	name: z.string(),
-	created_on: z.string(),
-});
-const AccountsListResponseSchema = V4Schema(z.array(AccountSchema));
+import type { Cloudflare } from 'cloudflare';
+import type { Account } from "cloudflare/resources/accounts/accounts.mjs";
 
 export async function handleAccountsList({
-	apiToken,
+	client,
 }: {
-	apiToken: string;
-}): Promise<AccountSchema[]> {
+    client: Cloudflare
+}): Promise<Account[]> {
 	// Currently limited to 50 accounts
-	const response = await fetch("https://api.cloudflare.com/client/v4/accounts?per_page=50", {
-		method: "GET",
-		headers: {
-			Authorization: `Bearer ${apiToken}`,
-			Accept: "application/javascript",
-		},
-	});
-
-	if (!response.ok) {
-		const error = await response.text();
-		throw new Error(`Cloudflare API request failed: ${error}`);
-	}
-
-	return AccountsListResponseSchema.parse(await response.json()).result ?? [];
+	const response = await client.accounts.list({query: {per_page: 50}})
+	return response.result
 }

packages/mcp-common/src/api/workers.ts

@@ -1,73 +1,36 @@
-import { z } from "zod";
-import { fetchCloudflareApi } from "../cloudflare-api";
-import { V4Schema } from "../v4-api";
-
-const WorkerSchema = z.object({
-	// id is usually the worker name
-	id: z.string(),
-	created_on: z.string().optional(),
-	modified_on: z.string().optional(),
-});
-
-const CloudflareWorkerListResponseSchema = V4Schema(z.array(WorkerSchema));
+import type { Cloudflare } from 'cloudflare';
 
 /**
  * Fetches list of workers from Cloudflare API
+ * @param client Cloudflare API Client
  * @param accountId Cloudflare account ID
- * @param apiToken Cloudflare API token
  * @returns List of workers
  */
 export async function handleWorkersList({
+	client,
 	accountId,
-	apiToken,
 }: {
-	accountId: string;
-	apiToken: string;
-}) {
-	const response = await fetchCloudflareApi({
-		endpoint: "/workers/scripts",
-		accountId,
-		apiToken,
-		responseSchema: CloudflareWorkerListResponseSchema,
-		options: {
-			method: "GET",
-		},
-	});
-
-	return response.result ?? [];
+	client: Cloudflare
+	accountId: string,
+}): Promise<Cloudflare.Workers.Scripts.Script[]> {
+	return (await client.workers.scripts.list({account_id: accountId})).result
 }
 
 /**
  * Downloads a specific worker script from Cloudflare API
+ * @param client Cloudflare API Client
  * @param scriptName Name of the worker script to download
  * @param accountId Cloudflare account ID
- * @param apiToken Cloudflare API token
  * @returns The worker script content
  */
 export async function handleWorkerScriptDownload({
+	client,
 	scriptName,
 	accountId,
-	apiToken,
 }: {
-	scriptName: string;
-	accountId: string;
-	apiToken: string;
+	client: Cloudflare
+	scriptName: string,
+	accountId: string,
 }): Promise<string> {
-	const response = await fetch(
-		`https://api.cloudflare.com/client/v4/accounts/${accountId}/workers/scripts/${scriptName}`,
-		{
-			method: "GET",
-			headers: {
-				Authorization: `Bearer ${apiToken}`,
-				Accept: "application/javascript",
-			},
-		},
-	);
-
-	if (!response.ok) {
-		const error = await response.text();
-		throw new Error(`Failed to download worker script: ${error}`);
-	}
-
-	return await response.text();
+	return await client.workers.scripts.get(scriptName, {account_id: accountId})
 }

packages/mcp-common/src/cloudflare-api.ts

@@ -1,4 +1,9 @@
 import type { z } from "zod";
+import { Cloudflare } from 'cloudflare';
+
+export function getCloudflareClient(apiToken: string) {
+	return new Cloudflare({ apiToken })
+}
 
 /**
  * Makes a request to the Cloudflare API