Update to Fastify v4 (#808)

* Update to Fastify v4 Signed-off-by: Matteo Collina <[email protected]> * Update CI Signed-off-by: Matteo Collina <[email protected]> * 100% codecov Signed-off-by: Matteo Collina <[email protected]>
mercurius-js · Jun 9, 2022 · ef154c5 · ef154c5
1 parent edc602d
commit ef154c5
Show file tree

Hide file tree

Showing 43 changed files with 159 additions and 140 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - uses: actions/checkout@v3

diff --git a/lib/routes.js b/lib/routes.js
@@ -88,9 +88,9 @@ const getSchema = {
   }
 }
 
-const postSchema = (allowBatchedQueries) => ({
-  body: {
-    type: allowBatchedQueries ? ['object', 'array'] : 'object',
+const postSchema = (allowBatchedQueries) => {
+  let body = {
+    type: 'object',
     properties: {
       ...requestProperties,
       variables: {
@@ -100,17 +100,33 @@ const postSchema = (allowBatchedQueries) => ({
         type: 'object'
       }
     }
-  },
-  // JSON schema isn't allowing ['object', 'array'] on response.
-  response: allowBatchedQueries
-    ? {}
-    : {
-        '2xx': {
-          type: 'object',
-          properties: responseProperties
+  }
+
+  if (allowBatchedQueries) {
+    body = {
+      anyOf: [{
+        ...body
+      }, {
+        type: 'array',
+        items: {
+          ...body
         }
-      }
-})
+      }]
+    }
+  }
+  return {
+    body,
+    // JSON schema isn't allowing ['object', 'array'] on response.
+    response: allowBatchedQueries
+      ? {}
+      : {
+          '2xx': {
+            type: 'object',
+            properties: responseProperties
+          }
+        }
+  }
+}
 
 function validationHandler (validationError) {
   if (validationError) {

diff --git a/lib/subscription.js b/lib/subscription.js
@@ -59,13 +59,13 @@ function createConnectionHandler ({ subscriber, fastify, onConnect, onDisconnect
   }
 }
 
-module.exports = function (fastify, opts, next) {
+module.exports = async function (fastify, opts) {
   const { getOptions, subscriber, verifyClient, onConnect, onDisconnect, lruGatewayResolvers, entityResolversFactory, subscriptionContextFn, keepAlive, fullWsTransport } = opts
 
   // If `fastify.websocketServer` exists, it means `@fastify/websocket` already registered.
   // Without this check, @fastify/websocket will be registered multiple times and raises FST_ERR_DEC_ALREADY_PRESENT.
   if (fastify.websocketServer === undefined) {
-    fastify.register(fastifyWebsocket, {
+    await fastify.register(fastifyWebsocket, {
       options: {
         maxPayload: 1048576,
         verifyClient
@@ -87,6 +87,4 @@ module.exports = function (fastify, opts, next) {
       fullWsTransport
     })
   })
-
-  next()
 }
diff --git a/package.json b/package.json
@@ -35,12 +35,13 @@
     "@sinonjs/fake-timers": "^9.0.0",
     "@types/node": "^17.0.0",
     "@types/ws": "^8.2.0",
+    "@types/isomorphic-form-data": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "^5.21.0",
     "@typescript-eslint/parser": "^5.21.0",
     "autocannon": "^7.3.0",
     "concurrently": "^7.0.0",
     "docsify-cli": "^4.4.3",
-    "fastify": "^3.28.0",
+    "fastify": "^4.0.0",
     "pre-commit": "^1.2.2",
     "proxyquire": "^2.1.3",
     "sinon": "^14.0.0",
@@ -54,9 +55,8 @@
   },
   "dependencies": {
     "@fastify/error": "^3.0.0",
-    "@fastify/static": "^5.0.0",
-    "@fastify/websocket": "^5.0.0",
-    "@types/isomorphic-form-data": "^2.0.0",
+    "@fastify/static": "^6.0.0",
+    "@fastify/websocket": "^6.0.0",
     "events.on": "^1.0.1",
     "fastify-plugin": "^3.0.1",
     "graphql": "^16.0.0",

diff --git a/test/custom-root-types.js b/test/custom-root-types.js
@@ -213,7 +213,7 @@ test('redefined subscription type', t => {
     }
   })
 
-  app.listen(0, err => {
+  app.listen({ port: 0 }, err => {
     t.error(err)
 
     const ws = new WebSocket('ws://localhost:' + (app.server.address()).port + '/graphql', 'graphql-ws')

diff --git a/test/federation.js b/test/federation.js
@@ -809,7 +809,7 @@ test('subscription server sends update to subscriptions', t => {
     federationMetadata: true
   })
 
-  app.listen(0, err => {
+  app.listen({ port: 0 }, err => {
     t.error(err)
 
     const ws = new WebSocket('ws://localhost:' + (app.server.address()).port + '/graphql', 'graphql-ws')

diff --git a/test/gateway/aliases-with-batching.js b/test/gateway/aliases-with-batching.js
@@ -12,7 +12,7 @@ async function createTestService (t, schema, resolvers = {}) {
     federationMetadata: true,
     allowBatchedQueries: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/aliases.js b/test/gateway/aliases.js
@@ -11,7 +11,7 @@ async function createTestService (t, schema, resolvers = {}) {
     resolvers,
     federationMetadata: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/application-hooks.js b/test/gateway/application-hooks.js
@@ -59,7 +59,7 @@ test('onGatewayReplaceSchema - polling interval with a new schema should trigger
     federationMetadata: true
   })
 
-  await userService.listen(0)
+  await userService.listen({ port: 0 })
 
   const userServicePort = userService.server.address().port
 
@@ -149,7 +149,7 @@ test('onGatewayReplaceSchema - should log an error should any errors occur in th
     federationMetadata: true
   })
 
-  await userService.listen(0)
+  await userService.listen({ port: 0 })
 
   const userServicePort = userService.server.address().port
 

diff --git a/test/gateway/batching-on-both-gateway-and-services.js b/test/gateway/batching-on-both-gateway-and-services.js
@@ -12,7 +12,7 @@ async function createTestService (t, schema, resolvers = {}) {
     federationMetadata: true,
     allowBatchedQueries: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/connectionInit-extension.js b/test/gateway/connectionInit-extension.js
@@ -152,8 +152,8 @@ test('connectionInit extension e2e testing', t => {
   Promise.all([
     userService.ready(),
     notificationService.ready(),
-    userService.listen(0),
-    notificationService.listen(0)
+    userService.listen({ port: 0 }),
+    notificationService.listen({ port: 0 })
   ]).then(() => {
     gateway.register(GQL, {
       subscription: true,
@@ -193,7 +193,7 @@ test('connectionInit extension e2e testing', t => {
       }
     })
 
-    gateway.listen(0, err => {
+    gateway.listen({ port: 0 }, err => {
       t.error(err)
       async function addUser () {
         await gateway.inject({

diff --git a/test/gateway/custom-directives-with-batching.js b/test/gateway/custom-directives-with-batching.js
@@ -13,7 +13,7 @@ async function createTestService (t, schema, resolvers = {}) {
     federationMetadata: true,
     allowBatchedQueries: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/custom-directives.js b/test/gateway/custom-directives.js
@@ -12,7 +12,7 @@ async function createTestService (t, schema, resolvers = {}) {
     resolvers,
     federationMetadata: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/errors-with-batching.js b/test/gateway/errors-with-batching.js
@@ -13,7 +13,7 @@ async function createTestService (t, schema, resolvers = {}, allowBatchedQueries
     federationMetadata: true,
     allowBatchedQueries
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/extends-directive.js b/test/gateway/extends-directive.js
@@ -11,7 +11,7 @@ async function createService (t, schema, resolvers = {}) {
     resolvers,
     federationMetadata: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
 
   return [service, service.server.address().port]
 }
@@ -407,7 +407,7 @@ test('gateway distributes query correctly to services when querying with inline
     }
   })
 
-  await gateway.listen(0)
+  await gateway.listen({ port: 0 })
 
   const query = `
     query {

diff --git a/test/gateway/fix-726.js b/test/gateway/fix-726.js
@@ -147,12 +147,12 @@ async function buildProxy (port1, port2) {
 test('federated node should be able to return external Type directly', async (t) => {
   const port1 = 3027
   const serviceOne = await buildService()
-  await serviceOne.listen(port1)
+  await serviceOne.listen({ port: port1 })
   t.teardown(() => { serviceOne.close() })
 
   const port2 = 3028
   const serviceTwo = await buildServiceExternal()
-  await serviceTwo.listen(port2)
+  await serviceTwo.listen({ port: port2 })
   t.teardown(() => { serviceTwo.close() })
 
   const serviceProxy = await buildProxy(port1, port2)

diff --git a/test/gateway/hooks-with-batching.js b/test/gateway/hooks-with-batching.js
@@ -16,7 +16,7 @@ async function createTestService (t, schema, resolvers = {}) {
     federationMetadata: true,
     allowBatchedQueries: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/hooks.js b/test/gateway/hooks.js
@@ -15,7 +15,7 @@ async function createTestService (t, schema, resolvers = {}) {
     resolvers,
     federationMetadata: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/include-directive-with-batching.js b/test/gateway/include-directive-with-batching.js
@@ -12,7 +12,7 @@ async function createTestService (t, schema, resolvers = {}) {
     federationMetadata: true,
     allowBatchedQueries: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/include-directive.js b/test/gateway/include-directive.js
@@ -11,7 +11,7 @@ async function createTestService (t, schema, resolvers = {}) {
     resolvers,
     federationMetadata: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/load-balancing-with-batching.js b/test/gateway/load-balancing-with-batching.js
@@ -13,7 +13,7 @@ async function createTestService (t, schema, resolvers = {}, fn = async () => {}
     federationMetadata: true,
     allowBatchedQueries: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/load-balancing.js b/test/gateway/load-balancing.js
@@ -12,7 +12,7 @@ async function createTestService (t, schema, resolvers = {}, fn = async () => {}
     resolvers,
     federationMetadata: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
   return [service, service.server.address().port]
 }
 

diff --git a/test/gateway/methods.js b/test/gateway/methods.js
@@ -11,7 +11,7 @@ async function createService (t, schema, resolvers = {}) {
     resolvers,
     federationMetadata: true
   })
-  await service.listen(0)
+  await service.listen({ port: 0 })
 
   return [service, service.server.address().port]
 }