From 165ed803d4366c6f63da6eb400d9a4c259f3fe3c Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 12 Dec 2018 14:32:26 +0100 Subject: [PATCH 1/2] stream: re-use existing `once()` implementation --- lib/internal/streams/end-of-stream.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js index 4ad7b93337f633..1753996a4f85de 100644 --- a/lib/internal/streams/end-of-stream.js +++ b/lib/internal/streams/end-of-stream.js @@ -7,20 +7,12 @@ const { ERR_INVALID_ARG_TYPE, ERR_STREAM_PREMATURE_CLOSE } = require('internal/errors').codes; +const { once } = require('internal/util'); function isRequest(stream) { return stream.setHeader && typeof stream.abort === 'function'; } -function once(callback) { - let called = false; - return function(err) { - if (called) return; - called = true; - callback.call(this, err); - }; -} - function eos(stream, opts, callback) { if (arguments.length === 2) { callback = opts; From ba89a5f905f97e97fe50b1c92b8fb07427844ad6 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 12 Dec 2018 14:51:13 +0100 Subject: [PATCH 2/2] fixup! stream: re-use existing `once()` implementation --- lib/internal/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/util.js b/lib/internal/util.js index ee550fad2e621c..7af06351c91406 100644 --- a/lib/internal/util.js +++ b/lib/internal/util.js @@ -375,7 +375,7 @@ function once(callback) { return function(...args) { if (called) return; called = true; - callback(...args); + callback.apply(this, args); }; }