Skip to content

Commit a421a44

Browse files
committed
pr feedback
1 parent 6e186e0 commit a421a44

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

apps/sandbox-container/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"postinstall": "mkdir -p workdir",
1414
"test": "vitest",
1515
"types": "wrangler types",
16-
"eval:dev": "start-server-and-test --expect 404 eval:server http://localhost:8976 'vitest --config vitest.config.evals.ts'",
16+
"eval:dev": "start-server-and-test --expect 404 eval:server http://localhost:8976 'vitest --testTimeout=60000 --config vitest.config.evals.ts'",
1717
"eval:server": "concurrently \"tsx container/index.ts\" \"wrangler dev --var \"ENVIRONMENT:test\"\"",
18-
"eval:ci": "start-server-and-test --expect 404 eval:server http://localhost:8976 'vitest run --config vitest.config.evals.ts'"
18+
"eval:ci": "start-server-and-test --expect 404 eval:server http://localhost:8976 'vitest run --testTimeout=60000 --config vitest.config.evals.ts'"
1919
},
2020
"dependencies": {
2121
"@cloudflare/workers-oauth-provider": "0.0.2",

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,13 @@ export function createAuthHandlers({
179179

180180
return Response.redirect(res.authUrl, 302)
181181
} catch (e) {
182-
metrics.logEvent(
183-
new AuthUser({
184-
errorMessage: `Authorize Error: ${(e as any).toString()}`,
185-
})
186-
)
182+
if (e instanceof Error) {
183+
metrics.logEvent(
184+
new AuthUser({
185+
errorMessage: `Authorize Error: ${e.name}: ${e.message}`,
186+
})
187+
)
188+
}
187189
if (e instanceof McpError) {
188190
return c.text(e.message, { status: e.code })
189191
}
@@ -253,12 +255,14 @@ export function createAuthHandlers({
253255

254256
return Response.redirect(redirectTo, 302)
255257
} catch (e) {
256-
console.error(e)
257-
metrics.logEvent(
258-
new AuthUser({
259-
errorMessage: `Callback Error: ${(e as any).toString()}`,
260-
})
261-
)
258+
if (e instanceof Error) {
259+
console.error(e)
260+
metrics.logEvent(
261+
new AuthUser({
262+
errorMessage: `Callback Error: ${e.name}: ${e.message}`,
263+
})
264+
)
265+
}
262266
if (e instanceof McpError) {
263267
return c.text(e.message, { status: e.code })
264268
}

packages/mcp-common/src/server.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export class CloudflareMCPServer extends McpServer {
5656
)
5757
return r
5858
})
59-
.catch((e: any) => {
59+
.catch((e: unknown) => {
6060
// promise throws
6161
this.trackToolCallError(e, name, userId)
6262
throw e
@@ -71,7 +71,7 @@ export class CloudflareMCPServer extends McpServer {
7171
)
7272
return toolCall
7373
}
74-
} catch (e: any) {
74+
} catch (e: unknown) {
7575
// non-promise throws
7676
this.trackToolCallError(e, name, userId)
7777
throw e
@@ -84,7 +84,8 @@ export class CloudflareMCPServer extends McpServer {
8484
}
8585
}
8686

87-
private trackToolCallError(e: any, toolName: string, userId?: string) {
87+
private trackToolCallError(e: unknown, toolName: string, userId?: string) {
88+
// placeholder error code
8889
let errorCode = -1
8990
if (e instanceof McpError) {
9091
errorCode = e.code

packages/mcp-common/vitest.config.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,5 @@ export default defineWorkersProject({
2020
},
2121
},
2222
},
23-
// evals are slow!
24-
testTimeout: 60000,
2523
},
2624
})

packages/typescript-config/workers.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
"types": [
1717
"./worker-configuration.d.ts",
1818
"@cloudflare/vitest-pool-workers",
19-
"@cloudflare/workers-types/2023-07-01",
20-
"@types/node"
19+
"@cloudflare/workers-types/2023-07-01"
2120
],
2221
"resolveJsonModule": true,
2322
"allowJs": true,

0 commit comments

Comments
 (0)