Skip to content

stream: make stream.destroy with callback API public #32021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ronag wants to merge 7 commits into from
Closed

stream: make stream.destroy with callback API public #32021

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d51ce2
stream: make stream.destroy with callback API public
ronag Feb 29, 2020
54f62fc
fixup: docs
ronag Feb 29, 2020
c020324
fixup: docs
ronag Feb 29, 2020
80cf7f6
fixup: tls test + writable write complete err
ronag Feb 29, 2020
43472c4
fixup: test
ronag Feb 29, 2020
b40a103
fixup: reduce changes
ronag Feb 29, 2020
81de706
fixup: always register eos
ronag Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup: always register eos
  • Loading branch information
@ronag
ronag committed Feb 29, 2020
commit 81de706be6d4a9c0aa1d8804668e4107417b0aee
17 changes: 11 additions & 6 deletions lib/internal/streams/destroy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';

const { once } = require('internal/util');
let eos;

function destroy(err, cb) {
Expand All @@ -11,13 +12,17 @@ function destroy(err, cb) {
err = null;
}

if (typeof cb === 'function') {
// TODO(ronag): Remove once cb is invoked only through eos.
cb = once(cb);

if (!eos) eos = require('internal/streams/end-of-stream');
eos(this, (err) => {
cb(err && err.code !== 'ERR_STREAM_PREMATURE_CLOSE' ? err : undefined);
});
}

if ((w && w.destroyed) || (r && r.destroyed)) {
if (typeof cb === 'function') {
if (!eos) eos = require('internal/streams/end-of-stream');
eos(this, (err) => {
cb(err && err.code !== 'ERR_STREAM_PREMATURE_CLOSE' ? err : undefined);
});
}
return this;
}

Expand Down