Skip to content
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

Jump to bottom

http2: use _final instead of on('finish') #18609

Closed
wants to merge 1 commit into from
Closed

http2: use _final instead of on('finish') #18609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 24 additions & 13 deletions lib/internal/http2/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,18 +1415,6 @@ function afterDoStreamWrite(status, handle, req) {
req.handle = undefined;
}

function onHandleFinish() {
const handle = this[kHandle];
if (this[kID] === undefined) {
this.once('ready', onHandleFinish);
} else if (handle !== undefined) {
const req = new ShutdownWrap();
req.oncomplete = () => {};
req.handle = handle;
handle.shutdown(req);
}
}

function streamOnResume() {
if (!this.destroyed && !this.pending)
this[kHandle].readStart();
Expand All @@ -1447,6 +1435,13 @@ function abort(stream) {
}
}

function afterShutdown() {
this.callback();
const stream = this.handle[kOwner];
if (stream)
stream[kMaybeDestroy]();
}

// An Http2Stream is a Duplex stream that is backed by a
// node::http2::Http2Stream handle implementing StreamBase.
class Http2Stream extends Duplex {
Expand All @@ -1471,7 +1466,6 @@ class Http2Stream extends Duplex {
writeQueueSize: 0
};

this.once('finish', onHandleFinish);
this.on('resume', streamOnResume);
this.on('pause', streamOnPause);
}
Expand Down Expand Up @@ -1678,6 +1672,23 @@ class Http2Stream extends Duplex {
trackWriteState(this, req.bytes);
}

_final(cb) {
const handle = this[kHandle];
if (this[kID] === undefined) {
this.once('ready', () => this._final(cb));
} else if (handle !== undefined) {
debug(`Http2Stream ${this[kID]} [Http2Session ` +
`${sessionName(this[kSession][kType])}]: _final shutting down`);
const req = new ShutdownWrap();
req.oncomplete = afterShutdown;
req.callback = cb;
req.handle = handle;
handle.shutdown(req);
} else {
cb();
}
}

_read(nread) {
if (this.destroyed) {
this.push(null);
Expand Down