Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions packages/plugin-mcp/src/mcp/createRequest.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import { describe, expect, it } from 'vitest'

import { createRequestFromPayloadRequest } from './createRequest.js'

describe('createRequestFromPayloadRequest', () => {
it('does not pass a body for GET requests', () => {
const request = createRequestFromPayloadRequest({
body: 'should-not-be-sent',
headers: new Headers(),
method: 'GET',
url: 'http://localhost:3000/api/mcp',
} as Parameters<typeof createRequestFromPayloadRequest>[0])

expect(request.method).toBe('GET')
expect(request.body).toBeNull()
})

it('does not pass a body for HEAD requests', () => {
const request = createRequestFromPayloadRequest({
body: 'should-not-be-sent',
headers: new Headers(),
method: 'HEAD',
url: 'http://localhost:3000/api/mcp',
} as Parameters<typeof createRequestFromPayloadRequest>[0])

expect(request.method).toBe('HEAD')
expect(request.body).toBeNull()
})

it('passes body and duplex for POST requests', () => {
const body = JSON.stringify({ jsonrpc: '2.0', method: 'initialize', id: 1 })

const request = createRequestFromPayloadRequest({
body,
headers: new Headers({ 'content-type': 'application/json' }),
method: 'POST',
url: 'http://localhost:3000/api/mcp',
} as Parameters<typeof createRequestFromPayloadRequest>[0])

expect(request.method).toBe('POST')
expect(request.body).not.toBeNull()
})
})
6 changes: 4 additions & 2 deletions packages/plugin-mcp/src/mcp/createRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ export const createRequestFromPayloadRequest = (req: PayloadRequest) => {
if (!req.url) {
throw new AuthenticationError()
}

const noBody = req.method === 'GET' || req.method === 'HEAD'

return new Request(req.url, {
body: req.body,
duplex: 'half',
...(noBody ? {} : { body: req.body, duplex: 'half' }),
headers: req.headers,
method: req.method,
} as { duplex: 'half' } & RequestInit)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { describe, expect, it, vi } from 'vitest'
import { z } from 'zod'

vi.mock('json-schema-to-zod', () => ({
jsonSchemaToZod: () => {
throw new Error('schema too complex')
},
}))

describe('convertCollectionSchemaToZod', () => {
it('returns a schema that supports partial() when conversion fails', async () => {
const { convertCollectionSchemaToZod } = await import('./convertCollectionSchemaToZod.js')

const converted = convertCollectionSchemaToZod({
type: 'object',
properties: {
title: { type: 'string' },
},
required: ['title'],
})

expect(() => converted.partial().shape).not.toThrow()
expect(converted.partial()).toBeInstanceOf(z.ZodObject)
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ export const convertCollectionSchemaToZod = (schema: JSONSchema4) => {
`[plugin-mcp] Schema conversion failed, using permissive fallback:`,
error instanceof Error ? error.message : error,
)
return z.record(z.any())
return z.object({})
}
}
Loading