From 78485ff104ab9ba40079469e7c3784517aa9455f Mon Sep 17 00:00:00 2001
From: Matteo Collina <hello@matteocollina.com>
Date: Wed, 7 Jul 2021 09:33:06 +0200
Subject: [PATCH 1/3] Use on-exit-leak-free

---
 lib/transport.js | 35 +++++++++++++++++++++++++----------
 package.json     |  1 +
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/lib/transport.js b/lib/transport.js
index d27220139..6159f7da9 100644
--- a/lib/transport.js
+++ b/lib/transport.js
@@ -6,6 +6,27 @@ const { join, isAbsolute } = require('path')
 
 const ThreadStream = require('thread-stream')
 
+function setupOnExit (stream) {
+  /* istanbul ignore next */
+  if (global.WeakRef && global.WeakMap && global.FinalizationRegistry) {
+    // This is leak free, it does not leave event handlers
+    const onExit = require('on-exit-leak-free')
+
+    onExit.register(stream, autoEnd)
+
+    stream.on('close', function () {
+      onExit.unregister(stream)
+    })
+  } else {
+    const fn = autoEnd.bind(null, stream)
+    process.on('exit', fn)
+
+    stream.on('close', function () {
+      process.removeListener('exit', fn)
+    })
+  }
+}
+
 function buildStream (filename, workerData, workerOpts) {
   const stream = new ThreadStream({
     filename,
@@ -18,21 +39,15 @@ function buildStream (filename, workerData, workerOpts) {
     stream.unref()
 
     if (workerOpts.autoEnd !== false) {
-      // TODO possibly use FinalizationGroup to automatically remove
-      // this listener if the stream goes out scope.
-      process.on('exit', autoEnd)
-
-      stream.on('close', function () {
-        process.removeListener('exit', autoEnd)
-      })
+      setupOnExit(stream)
     }
   })
 
   return stream
+}
 
-  function autoEnd () {
-    stream.end()
-  }
+function autoEnd (stream) {
+  stream.end()
 }
 
 function transport (fullOptions) {
diff --git a/package.json b/package.json
index d54377a55..b4b2ef0de 100644
--- a/package.json
+++ b/package.json
@@ -101,6 +101,7 @@
     "fast-redact": "^3.0.0",
     "fast-safe-stringify": "^2.0.7",
     "get-caller-file": "^2.0.5",
+    "on-exit-leak-free": "^0.1.0",
     "pino-abstract-transport": "^0.2.0",
     "pino-std-serializers": "^4.0.0",
     "quick-format-unescaped": "^4.0.3",

From 7af5c7d385edf85555836f8134054b34aa6dc5c4 Mon Sep 17 00:00:00 2001
From: Matteo Collina <hello@matteocollina.com>
Date: Wed, 7 Jul 2021 17:27:20 +0200
Subject: [PATCH 2/3] Added docs

---
 docs/api.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/api.md b/docs/api.md
index 2d58858f8..b30e2210c 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -939,6 +939,10 @@ const transports = pino.transport({
 pino(transports)
 ```
 
+If `WeakRef`, `WeakMap` and `FinalizationRegistry` are available in the current runtime (v14.5.0+), then the thread
+will be automatically terminated in case the stream or logger goes out of scope.
+The `transport()` function adds a listener to `process.on('exit')` to ensure the worker is flushed and all data synced
+before the process exits.
 
 For more on transports, how they work, and how to create them see the [`Transports documentation`](/docs/transports.md).
 

From 28ce1ba704c98a5415712ddca6ab364316f8d5b2 Mon Sep 17 00:00:00 2001
From: Matteo Collina <hello@matteocollina.com>
Date: Wed, 7 Jul 2021 17:52:37 +0200
Subject: [PATCH 3/3] Bumped thread-stream to 0.11.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b4b2ef0de..09bb9bdb1 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "pino-std-serializers": "^4.0.0",
     "quick-format-unescaped": "^4.0.3",
     "sonic-boom": "^2.1.0",
-    "thread-stream": "^0.10.0"
+    "thread-stream": "^0.11.0"
   },
   "tsd": {
     "directory": "test/types"