stream: preserve AsyncLocalStorage context in finished()

gurgunday · marco-ippolito · commit 89f972991a2c · 2025-06-05T11:14:28.000+02:00
PR-URL: #57865 Reviewed-By: Raz Luvaton <rluvaton@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -44,6 +44,9 @@ const {
   willEmitClose: _willEmitClose,
   kIsClosedPromise,
 } = require('internal/streams/utils');
+
+// Lazy load
+let AsyncLocalStorage;
 let addAbortListener;
 
 function isRequest(stream) {
@@ -64,7 +67,8 @@ function eos(stream, options, callback) {
   validateFunction(callback, 'callback');
   validateAbortSignal(options.signal, 'options.signal');
 
-  callback = once(callback);
+  AsyncLocalStorage ??= require('async_hooks').AsyncLocalStorage;
+  callback = once(AsyncLocalStorage.bind(callback));
 
   if (isReadableStream(stream) || isWritableStream(stream)) {
     return eosWeb(stream, options, callback);
diff --git a/test/async-hooks/test-async-local-storage-stream-finished.js b/test/async-hooks/test-async-local-storage-stream-finished.js
@@ -0,0 +1,20 @@
+'use strict';
+
+const common = require('../common');
+const { Readable, finished } = require('stream');
+const { AsyncLocalStorage } = require('async_hooks');
+const { strictEqual } = require('assert');
+
+// This test verifies that AsyncLocalStorage context is maintained
+// when using stream.finished()
+
+const readable = new Readable();
+const als = new AsyncLocalStorage();
+
+als.run(321, () => {
+  finished(readable, common.mustCall(() => {
+    strictEqual(als.getStore(), 321);
+  }));
+});
+
+readable.destroy();
