fastify 3.25.1 → 3.25.2

package/docs/Guides/Testing.md

@@ -49,7 +49,7 @@ const server = require('./app')({
 
 server.listen(3000, (err, address) => {
   if (err) {
-    console.log(err)
+    server.log.error(err)
     process.exit(1)
   }
 })

package/docs/Reference/TypeScript.md

@@ -51,9 +51,6 @@ in a blank http Fastify server.
   }
   ```
 
-*Note: Set `target` property in `tsconfig.json` to `es2017` or greater to avoid
-[FastifyDeprecation](https://github.com/fastify/fastify/issues/3284) warning.*
-
 3. Initialize a TypeScript configuration file:
   ```bash
   npx tsc --init
@@ -61,6 +58,9 @@ in a blank http Fastify server.
   or use one of the [recommended
   ones](https://github.com/tsconfig/bases#node-10-tsconfigjson).
 
+*Note: Set `target` property in `tsconfig.json` to `es2017` or greater to avoid
+[FastifyDeprecation](https://github.com/fastify/fastify/issues/3284) warning.*
+
 4. Create an `index.ts` file - this will contain the server code
 5. Add the following code block to your file:
    ```typescript
@@ -228,8 +228,8 @@ can do it as follows:
           },
         },
       },
-      (req, rep) => {
-        const { body: user } = req;
+      (request, reply) => {
+        const { body: user } = request;
         /* user has type
         * const user: StaticProperties<{
         *  name: TString;
@@ -237,7 +237,7 @@ can do it as follows:
         * }>
         */
         //...
-        rep.status(200).send(user);
+        reply.status(200).send(user);
       }
     );
     ```

package/fastify.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const VERSION = '3.25.1'
+const VERSION = '3.25.2'
 
 const Avvio = require('avvio')
 const http = require('http')

package/lib/contentTypeParser.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { AsyncResource } = require('async_hooks')
 let lru = require('tiny-lru')
 // Needed to handle Webpack and faux modules
 // See https://github.com/fastify/fastify/issues/2356
@@ -137,6 +138,7 @@ ContentTypeParser.prototype.remove = function (contentType) {
 
 ContentTypeParser.prototype.run = function (contentType, handler, request, reply) {
   const parser = this.cache.get(contentType) || this.getParser(contentType)
+  const resource = new AsyncResource('content-type-parser:run', request)
 
   if (parser === undefined) {
     reply.send(new FST_ERR_CTP_INVALID_MEDIA_TYPE(contentType))
@@ -163,12 +165,15 @@ ContentTypeParser.prototype.run = function (contentType, handler, request, reply
   }
 
   function done (error, body) {
-    if (error) {
-      reply.send(error)
-    } else {
-      request.body = body
-      handler(request, reply)
-    }
+    // We cannot use resource.bind() because it is broken in node v12.
+    resource.runInAsyncScope(() => {
+      if (error) {
+        reply.send(error)
+      } else {
+        request.body = body
+        handler(request, reply)
+      }
+    })
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "3.25.1",
+  "version": "3.25.2",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",

package/test/als.test.js

@@ -0,0 +1,74 @@
+'use strict'
+
+const { AsyncLocalStorage } = require('async_hooks')
+const t = require('tap')
+const Fastify = require('..')
+const sget = require('simple-get').concat
+
+if (!AsyncLocalStorage) {
+  t.skip('AsyncLocalStorage not available, skipping test')
+  process.exit(0)
+}
+
+const storage = new AsyncLocalStorage()
+const app = Fastify({ logger: false })
+
+let counter = 0
+app.addHook('onRequest', (req, reply, next) => {
+  const id = counter++
+  storage.run({ id }, next)
+})
+
+app.get('/', function (request, reply) {
+  t.ok(storage.getStore())
+  const id = storage.getStore().id
+  reply.send({ id })
+})
+
+app.post('/', function (request, reply) {
+  t.ok(storage.getStore())
+  const id = storage.getStore().id
+  reply.send({ id })
+})
+
+app.listen(3000, function (err, address) {
+  t.error(err)
+
+  sget({
+    method: 'POST',
+    url: 'http://localhost:' + app.server.address().port,
+    body: {
+      hello: 'world'
+    },
+    json: true
+  }, (err, response, body) => {
+    t.error(err)
+    t.equal(response.statusCode, 200)
+    t.same(body, { id: 0 })
+
+    sget({
+      method: 'POST',
+      url: 'http://localhost:' + app.server.address().port,
+      body: {
+        hello: 'world'
+      },
+      json: true
+    }, (err, response, body) => {
+      t.error(err)
+      t.equal(response.statusCode, 200)
+      t.same(body, { id: 1 })
+
+      sget({
+        method: 'GET',
+        url: 'http://localhost:' + app.server.address().port,
+        json: true
+      }, (err, response, body) => {
+        t.error(err)
+        t.equal(response.statusCode, 200)
+        t.same(body, { id: 2 })
+        app.close()
+        t.end()
+      })
+    })
+  })
+})