Skip to content

Commit

Permalink
stream: avoid caching prepend check
Browse files Browse the repository at this point in the history
This removes the cached check for EE.prototype.prependListener
because we can't have nice things. More specifically some
libraries will bundle their own event emitter implementation.

PR-URL: #8018
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
  • Loading branch information
calvinmetcalf authored and evanlucas committed Aug 24, 2016
1 parent c26b9af commit 1bf80a0
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 7 deletions.
13 changes: 6 additions & 7 deletions lib/_stream_readable.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ var StringDecoder;

util.inherits(Readable, Stream);

var prependListener;
if (typeof EE.prototype.prependListener === 'function') {
prependListener = function prependListener(emitter, event, fn) {
function prependListener(emitter, event, fn) {
// Sadly this is not cacheable as some libraries bundle their own
// event emitter implementation with them.
if (typeof emitter.prependListener === 'function') {
return emitter.prependListener(event, fn);
};
} else {
prependListener = function prependListener(emitter, event, fn) {
} else {
// This is a hack to make sure that our error handler is attached before any
// userland ones. NEVER DO THIS. This is here only because this code needs
// to continue to work with older versions of Node.js that do not include
Expand All @@ -30,7 +29,7 @@ if (typeof EE.prototype.prependListener === 'function') {
emitter._events[event].unshift(fn);
else
emitter._events[event] = [fn, emitter._events[event]];
};
}
}

function ReadableState(options, stream) {
Expand Down
29 changes: 29 additions & 0 deletions test/parallel/test-stream-events-prepend.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
'use strict';
const common = require('../common');
const stream = require('stream');
const util = require('util');

function Writable() {
this.writable = true;
stream.Writable.call(this);
this.prependListener = undefined;
}
util.inherits(Writable, stream.Writable);
Writable.prototype._write = function(chunk, end, cb) {
cb();
};

function Readable() {
this.readable = true;
stream.Readable.call(this);
}
util.inherits(Readable, stream.Readable);
Readable.prototype._read = function() {
this.push(null);
};

const w = new Writable();
w.on('pipe', common.mustCall(function() {}));

const r = new Readable();
r.pipe(w);

0 comments on commit 1bf80a0

Please sign in to comment.