feat: uniquely identify batched queries

index.d.ts

@@ -25,6 +25,9 @@ export interface PubSub {
 export interface MercuriusContext {
   app: FastifyInstance;
   reply: FastifyReply;
+  operationsCount?: Number;
+  operationId?: Number;
+  __currentQuery: String;
   /**
    * __Caution__: Only available if `subscriptions` are enabled
    */

lib/routes.js

@@ -220,11 +220,16 @@ module.exports = async function (app, opts) {
       return new MER_ERR_GQL_PERSISTED_QUERY_NOT_FOUND('Unknown query')
     }
 
+    // Create individual contexts for multiple operations, otherwise reference the original context
+    const context = request[kRequestContext].operationsCount > 1
+      ? Object.create(request[kRequestContext])
+      : request[kRequestContext]
+
     // Handle the query, throwing an error if required
     return reply.graphql(
       query,
       Object.assign(
-        request[kRequestContext],
+        context,
         { pubsub: subscriber, __currentQuery: query }
       ),
       variables,
@@ -352,13 +357,18 @@ module.exports = async function (app, opts) {
 
     if (allowBatchedQueries && Array.isArray(request.body)) {
       // Batched query
-      return Promise.all(request.body.map(r =>
-        execute(r, request, reply)
-          .catch(e => {
-            const { response } = errorFormatter(e, request[kRequestContext])
-            return response
-          })
-      ))
+      Object.assign(request[kRequestContext], { operationsCount: request.body.length })
+
+      return Promise.all(request.body.map(async (r, operationId) => {
+        Object.assign(request[kRequestContext], { operationId })
+
+        try {
+          return await execute(r, request, reply)
+        } catch (e) {
+          const { response } = errorFormatter(e, request[kRequestContext])
+          return response
+        }
+      }))
     } else {
       // Regular query
       return execute(request.body, request, reply)

test/batched.js

@@ -2,6 +2,7 @@
 
 const { test } = require('tap')
 const Fastify = require('fastify')
+const sinon = require('sinon')
 const GQL = require('..')
 
 test('POST regular query', async (t) => {
@@ -346,3 +347,44 @@ test('POST batched query with a resolver which succeeds and a resolver which thr
 
   t.same(JSON.parse(res.body), [{ data: { add: 3 } }, { data: null, errors: [{ message: 'Internal Server Error' }] }])
 })
+
+test('POST batched query has an individual context for each operation', async (t) => {
+  const app = Fastify()
+
+  const contextSpy = sinon.spy()
+
+  const schema = `
+      type Query {
+        test: String
+      }
+    `
+
+  const resolvers = {
+    test: (_, ctx) => contextSpy(ctx.operationId, ctx.operationsCount, ctx.__currentQuery)
+  }
+
+  app.register(GQL, {
+    schema,
+    resolvers,
+    allowBatchedQueries: true
+  })
+
+  await app.inject({
+    method: 'POST',
+    url: '/graphql',
+    body: [
+      {
+        operationName: 'TestQuery',
+        query: 'query TestQuery { test }'
+      },
+      {
+        operationName: 'DoubleQuery',
+        query: 'query DoubleQuery { test }'
+      }
+    ]
+  })
+
+  t.ok(contextSpy.calledTwice)
+  t.ok(contextSpy.calledWith(0, 2, sinon.match(/TestQuery/)))
+  t.ok(contextSpy.calledWith(1, 2, sinon.match(/DoubleQuery/)))
+})