stream: re-use existing once() implementation

addaleax · BethGriggs · commit 3f969d61ff54 · 2019-02-12T20:42:32.000Z
PR-URL: #24991 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -6,22 +6,14 @@
 const {
 ERR_STREAM_PREMATURE_CLOSE
 } = require('internal/errors').codes;
+const { once } = require('internal/util');
 
 function noop() {}
 
 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 (typeof opts === 'function') return eos(stream, null, opts);
 if (!opts) opts = {};
diff --git a/lib/internal/util.js b/lib/internal/util.js
@@ -368,7 +368,7 @@ function once(callback) {
 return function(...args) {
 if (called) return;
 called = true;
- callback(...args);
+ callback.apply(this, args);
 };
 }
 

-Original file line number
+Diff line change
 const{
 ERR_STREAM_PREMATURE_CLOSE
 }=require('internal/errors').codes;
 +const{ once }=require('internal/util');
 functionnoop(){}
 functionisRequest(stream){
 returnstream.setHeader&&typeofstream.abort==='function';
+}
 -functiononce(callback){
 -letcalled=false;
 -returnfunction(err){
 -if(called)return;
 -called=true;
 -callback.call(this,err);
 -};
 -}
+-
 functioneos(stream,opts,callback){
 if(typeofopts==='function')returneos(stream,null,opts);
 if(!opts)opts={};
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ function once(callback) {`
`368`	`368`	`returnfunction(...args){`
`369`	`369`	`if(called)return;`
`370`	`370`	`called=true;`
`371`		`-callback(...args);`
	`371`	`+callback.apply(this,args);`
`372`	`372`	`};`
`373`	`373`	`}`
`374`	`374`