-
Notifications
You must be signed in to change notification settings - Fork 564
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Batching support * Fix graphql-ws support * Fix graphql-http compat * Flag for batched queries * More * Changeset * Go * Go * Expose MaybeArray utility and use it * Go
- Loading branch information
Showing
20 changed files
with
657 additions
and
224 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
--- | ||
'graphql-yoga': minor | ||
--- | ||
|
||
- Batching RFC support with `batchingLimit` option to enable batching with an exact limit of requests per batch. | ||
- New `onParams` hook that takes a single `GraphQLParams` object | ||
- Changes in `onRequestParse` and `onRequestParseDone` hook | ||
- - Now `onRequestParseDone` receives the exact object that is passed by the request parser so it can be `GraphQLParams` or an array of `GraphQLParams` so use `onParams` if you need to manipulate batched execution params individually. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,299 @@ | ||
import { createSchema } from '../src/schema' | ||
import { createYoga } from '../src/server' | ||
|
||
describe('Batching', () => { | ||
const schema = createSchema({ | ||
typeDefs: /* GraphQL */ ` | ||
type Query { | ||
hello: String | ||
bye: String | ||
} | ||
`, | ||
resolvers: { | ||
Query: { | ||
hello: () => 'hello', | ||
bye: () => 'bye', | ||
}, | ||
}, | ||
}) | ||
const yoga = createYoga({ | ||
schema, | ||
batching: true, | ||
}) | ||
it('should support batching for JSON requests', async () => { | ||
const query1 = /* GraphQL */ ` | ||
query { | ||
hello | ||
} | ||
` | ||
const query2 = /* GraphQL */ ` | ||
query { | ||
bye | ||
} | ||
` | ||
const response = await yoga.fetch('http://yoga/graphql', { | ||
method: 'POST', | ||
headers: { | ||
'Content-Type': 'application/json', | ||
}, | ||
body: JSON.stringify([{ query: query1 }, { query: query2 }]), | ||
}) | ||
const result = await response.json() | ||
expect(result).toEqual([ | ||
{ data: { hello: 'hello' } }, | ||
{ data: { bye: 'bye' } }, | ||
]) | ||
}) | ||
it('should support batching for multipart requests', async () => { | ||
const query1 = /* GraphQL */ ` | ||
query { | ||
hello | ||
} | ||
` | ||
const query2 = /* GraphQL */ ` | ||
query { | ||
bye | ||
} | ||
` | ||
const formData = new yoga.fetchAPI.FormData() | ||
formData.append( | ||
'operations', | ||
JSON.stringify([{ query: query1 }, { query: query2 }]), | ||
) | ||
const response = await yoga.fetch('http://yoga/graphql', { | ||
method: 'POST', | ||
headers: { | ||
'Content-Type': 'multipart/mixed; boundary=boundary', | ||
}, | ||
body: formData, | ||
}) | ||
const result = await response.json() | ||
expect(result).toEqual([ | ||
{ data: { hello: 'hello' } }, | ||
{ data: { bye: 'bye' } }, | ||
]) | ||
}) | ||
it('should throw if the default limit is exceeded', async () => { | ||
const query1 = /* GraphQL */ ` | ||
query { | ||
hello | ||
} | ||
` | ||
const query2 = /* GraphQL */ ` | ||
query { | ||
bye | ||
} | ||
` | ||
const response = await yoga.fetch('http://yoga/graphql', { | ||
method: 'POST', | ||
headers: { | ||
'Content-Type': 'application/json', | ||
}, | ||
body: JSON.stringify([ | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
]), | ||
}) | ||
expect(response.status).toBe(413) | ||
const result = await response.json() | ||
expect(result).toEqual({ | ||
errors: [ | ||
{ | ||
message: 'Batching is limited to 10 operations per request.', | ||
}, | ||
], | ||
}) | ||
}) | ||
it('should not support batching by default', async () => { | ||
const noBatchingYoga = createYoga({ | ||
schema, | ||
}) | ||
const query1 = /* GraphQL */ ` | ||
query { | ||
hello | ||
} | ||
` | ||
const query2 = /* GraphQL */ ` | ||
query { | ||
bye | ||
} | ||
` | ||
const response = await noBatchingYoga.fetch('http://yoga/graphql', { | ||
method: 'POST', | ||
headers: { | ||
'Content-Type': 'application/json', | ||
}, | ||
body: JSON.stringify([{ query: query1 }, { query: query2 }]), | ||
}) | ||
expect(response.status).toBe(400) | ||
const result = await response.json() | ||
expect(result).toEqual({ | ||
errors: [ | ||
{ | ||
message: 'Batching is not supported.', | ||
}, | ||
], | ||
}) | ||
}) | ||
it('should respect `batching.limit` option', async () => { | ||
const yoga = createYoga({ | ||
schema, | ||
batching: { | ||
limit: 2, | ||
}, | ||
}) | ||
const query1 = /* GraphQL */ ` | ||
query { | ||
hello | ||
} | ||
` | ||
const query2 = /* GraphQL */ ` | ||
query { | ||
bye | ||
} | ||
` | ||
|
||
const response = await yoga.fetch('http://yoga/graphql', { | ||
method: 'POST', | ||
headers: { | ||
'Content-Type': 'application/json', | ||
}, | ||
body: JSON.stringify([ | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
{ query: query1 }, | ||
]), | ||
}) | ||
|
||
expect(response.status).toBe(413) | ||
const result = await response.json() | ||
expect(result).toEqual({ | ||
errors: [ | ||
{ | ||
message: 'Batching is limited to 2 operations per request.', | ||
}, | ||
], | ||
}) | ||
}) | ||
it('should not allow batching if `batching: false`', async () => { | ||
const yoga = createYoga({ | ||
schema, | ||
batching: false, | ||
}) | ||
const query1 = /* GraphQL */ ` | ||
query { | ||
hello | ||
} | ||
` | ||
const query2 = /* GraphQL */ ` | ||
query { | ||
bye | ||
} | ||
` | ||
const response = await yoga.fetch('http://yoga/graphql', { | ||
method: 'POST', | ||
headers: { | ||
'Content-Type': 'application/json', | ||
}, | ||
body: JSON.stringify([{ query: query1 }, { query: query2 }]), | ||
}) | ||
expect(response.status).toBe(400) | ||
const result = await response.json() | ||
expect(result).toEqual({ | ||
errors: [ | ||
{ | ||
message: 'Batching is not supported.', | ||
}, | ||
], | ||
}) | ||
}) | ||
it('should not allow batching if `batching.limit` is 0', async () => { | ||
const yoga = createYoga({ | ||
schema, | ||
batching: { | ||
limit: 0, | ||
}, | ||
}) | ||
const query1 = /* GraphQL */ ` | ||
query { | ||
hello | ||
} | ||
` | ||
const query2 = /* GraphQL */ ` | ||
query { | ||
bye | ||
} | ||
` | ||
const response = await yoga.fetch('http://yoga/graphql', { | ||
method: 'POST', | ||
headers: { | ||
'Content-Type': 'application/json', | ||
}, | ||
body: JSON.stringify([{ query: query1 }, { query: query2 }]), | ||
}) | ||
expect(response.status).toBe(400) | ||
const result = await response.json() | ||
expect(result).toEqual({ | ||
errors: [ | ||
{ | ||
message: 'Batching is not supported.', | ||
}, | ||
], | ||
}) | ||
}) | ||
it('should set `batching.limit` to 10 by default', async () => { | ||
const yoga = createYoga({ | ||
schema, | ||
batching: {}, | ||
}) | ||
const query1 = /* GraphQL */ ` | ||
query { | ||
hello | ||
} | ||
` | ||
const query2 = /* GraphQL */ ` | ||
query { | ||
bye | ||
} | ||
` | ||
const response = await yoga.fetch('http://yoga/graphql', { | ||
method: 'POST', | ||
headers: { | ||
'Content-Type': 'application/json', | ||
}, | ||
body: JSON.stringify([ | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
{ query: query1 }, | ||
{ query: query2 }, | ||
]), | ||
}) | ||
expect(response.status).toBe(413) | ||
const result = await response.json() | ||
expect(result).toEqual({ | ||
errors: [ | ||
{ | ||
message: 'Batching is limited to 10 operations per request.', | ||
}, | ||
], | ||
}) | ||
}) | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
packages/graphql-yoga/src/plugins/requestValidation/useLimitBatching.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import { GraphQLError } from 'graphql' | ||
import { Plugin } from '../types' | ||
|
||
export function useLimitBatching(limit?: number): Plugin { | ||
return { | ||
onRequestParse() { | ||
return { | ||
onRequestParseDone({ requestParserResult }) { | ||
if (Array.isArray(requestParserResult)) { | ||
if (!limit) { | ||
throw new GraphQLError(`Batching is not supported.`, { | ||
extensions: { | ||
http: { | ||
status: 400, | ||
}, | ||
}, | ||
}) | ||
} | ||
if (requestParserResult.length > limit) { | ||
throw new GraphQLError( | ||
`Batching is limited to ${limit} operations per request.`, | ||
{ | ||
extensions: { | ||
http: { | ||
status: 413, | ||
}, | ||
}, | ||
}, | ||
) | ||
} | ||
} | ||
}, | ||
} | ||
}, | ||
} | ||
} |
Oops, something went wrong.