From 9f8eec68f10f0dc3c77c915e21d2deba5400d888 Mon Sep 17 00:00:00 2001 From: uzlopak Date: Wed, 28 Feb 2024 02:58:19 +0100 Subject: [PATCH] fix: dont use internal _events attribute --- deps/dicer/lib/Dicer.js | 12 +++++++++--- lib/types/multipart.js | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/deps/dicer/lib/Dicer.js b/deps/dicer/lib/Dicer.js index 79da160..3c8c081 100644 --- a/deps/dicer/lib/Dicer.js +++ b/deps/dicer/lib/Dicer.js @@ -78,7 +78,7 @@ Dicer.prototype._write = function (data, encoding, cb) { if (this._headerFirst && this._isPreamble) { if (!this._part) { this._part = new PartStream(this._partOpts) - if (this._events.preamble) { this.emit('preamble', this._part) } else { this._ignore() } + if (this.listenerCount('preamble') !== 0) { this.emit('preamble', this._part) } else { this._ignore() } } const r = this._hparser.push(data) if (!this._inHeader && r !== undefined && r < data.length) { data = data.slice(r) } else { return cb() } @@ -135,7 +135,7 @@ Dicer.prototype._oninfo = function (isMatch, data, start, end) { } } if (this._dashes === 2) { - if ((start + i) < end && this._events.trailer) { this.emit('trailer', data.slice(start + i, end)) } + if ((start + i) < end && this.listenerCount('trailer') !== 0) { this.emit('trailer', data.slice(start + i, end)) } this.reset() this._finished = true // no more parts will be added @@ -153,7 +153,13 @@ Dicer.prototype._oninfo = function (isMatch, data, start, end) { this._part._read = function (n) { self._unpause() } - if (this._isPreamble && this._events.preamble) { this.emit('preamble', this._part) } else if (this._isPreamble !== true && this._events.part) { this.emit('part', this._part) } else { this._ignore() } + if (this._isPreamble && this.listenerCount('preamble') !== 0) { + this.emit('preamble', this._part) + } else if (this._isPreamble !== true && this.listenerCount('part') !== 0) { + this.emit('part', this._part) + } else { + this._ignore() + } if (!this._isPreamble) { this._inHeader = true } } if (data && start < end && !this._ignoreData) { diff --git a/lib/types/multipart.js b/lib/types/multipart.js index ad242db..d691eca 100644 --- a/lib/types/multipart.js +++ b/lib/types/multipart.js @@ -163,7 +163,7 @@ function Multipart (boy, cfg) { ++nfiles - if (!boy._events.file) { + if (boy.listenerCount('file') === 0) { self.parser._ignore() return }