Skip to content
This repository was archived by the owner on Jul 6, 2018. It is now read-only.

No closures #23

Closed
mcollina wants to merge 3 commits into from
Closed

No closures #23

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99a32a9
more perf updates
mcollina Dec 5, 2016
16e0c23
Removed most closures.
mcollina Dec 5, 2016
839a3f2
From Map() to basic {}.
mcollina Dec 6, 2016
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
Next Next commit
Removed most closures.
  • Loading branch information
@mcollina
mcollina committed Dec 5, 2016
commit 16e0c239bba5ee8426cbb22d7363fc74f2243f0b
104 changes: 49 additions & 55 deletions lib/internal/http2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,99 +312,79 @@ class Http2Stream extends Duplex {
if (this._handle) {
this._handle.setLocalWindowSize(size);
} else {
this.once('handle', () => {
this._handle.setLocalWindowSize(size);
});
this.once('handle', this.setLocalWindowSize.bind(this, size));
}
}

changeStreamPriority(parentId, priority, exclusive) {
if (this._handle) {
this._handle.changeStreamPriority(parentId, priority, exclusive);
} else {
this.once('handle', () => {
this._handle.changeStreamPriority(parentId, priority, exclusive);
});
this.once('handle', this.changeStreamPriority.bind(this, parentId, priority, exclusive));
}
}

respond() {
if (this._handle) {
this._handle.respond();
} else {
this.once('handle', () => {
this._handle.respond();
});
this.once('handle', onHandleRespond);
}
}

resume() {
if (this._handle) {
this._handle.resume();
} else {
this.once('handle', () => {
this._handle.resume();
});
this.once('handle', onHandleResume);
}
}

sendContinue() {
if (this._handle) {
this._handle.sendContinue();
} else {
this.once('handle', () => {
this._handle.sendContinue();
});
this.once('handle', this.sendContinue.bind(this));
}
}

sendPriority(parentId, priority, exclusive) {
if (this._handle) {
this._handle.sendPriority(parentId, priority, exclusive);
} else {
this.once('handle', () => {
this._handle.sendPriority(parentId, priority, exclusive);
});
this.once('handle', this.sendPriority.bind(this, parentId, priority, exclusive));
}
}

sendRstStream(code) {
if (this._handle) {
this._handle.sendRstStream(code);
} else {
this.once('handle', () => {
this._handle.sendRstStream(code);
});
this.once('handle', this.sendRstStream.bind(this, code));
}
}

sendPushPromise(headers) {
if (this._handle) {
return this._handle.sendPushPromise(mapToHeaders(headers));
} else {
this.once('handle', () => {
this._handle.sendPushPromise(mapToHeaders(headers));
});
this.once('handle', this.sendPushPromise.bind(this, headers));
}
}

addHeader(name, value, noindex) {
if (this._handle) {
this._handle.addHeader(name, value, noindex);
} else {
this.once('handle', () => {
this._handle.addHeader(name, value, noindex);
});
this.once('handle', this.addHeader.bind(this, name, value, noindex));
}
}

addTrailer(name, value, noindex) {
if (this._handle) {
this._handle.addTrailer(name, value, noindex);
} else {
this.once('handle', () => {
this._handle.addTrailer(name, value, noindex);
});
this.once('handle', this.addTrailer.bind(this, name, value, noindex));
}
}

Expand Down Expand Up @@ -464,29 +444,41 @@ class Http2Stream extends Duplex {
if (this._handle) {
this._handle.finishedWriting();
} else {
this.on('handle', () => {
this._handle.finishedWriting();
});
this.on('handle', onHandleFinishedWriting);
}
}

_read(n) {
if (this._handle) {
this._handle.readStart();
} else {
this.once('handle', () => {
this._handle.readStart();
});
this.once('handle', onHandleReadStart);
}
}
}

function onHandleReadStart() {
this._handle.readStart();
}

function onHandleFinishedWriting() {
this._handle.finishedWriting();
}

function onHandleWrite(data, encoding, cb) {
return function onWriteFinished() {
this._write(data, encoding, cb);
};
}

function onHandleRespond() {
this._handle.respond();
}

function onHandleResume() {
this._handle.resume();
}

class Http2Session extends EventEmitter {
constructor(type, options, socket) {
super();
Expand All @@ -495,6 +487,7 @@ class Http2Session extends EventEmitter {
this[kHandle] = sessions.alloc();
this[kHandle][kOwner] = this;
this[kHandle].reinitialize(type, options, socket._handle._externalStream);
this[kSocket] = socket;
}

reset() {
Expand Down Expand Up @@ -1103,28 +1096,29 @@ function sessionOnStreamClose(stream, code) {
response[kStream] = undefined;
stream[kRequest] = undefined;
stream[kResponse] = undefined;
setImmediate(() => maybeDestroyStream(stream));
setImmediate(maybeDestroyStream, stream);
}

function sessionOnError(server, socket) {
function fn(error) {
if (server.listenerCount('sessionError') > 0) {
server.emit('sessionError', error);
return;
}
socket.destroy(error);
function sessionOnError() {
const session = this;
const server = session[kServer];
const socket = session[kSocket];

if (server.listenerCount('sessionError') > 0) {
server.emit('sessionError', error);
return;
}
return fn;
socket.destroy(error);
}

function socketOnTimeout(server, session) {
function fn() {
if (!server.emit('timeout', this)) {
// Session timed out, attempt a graceful exit
session.gracefulTerminate(() => this.destroy());
}
function socketOnTimeout() {
const socket = this;
const server = socket[kServer];

if (!server.emit('timeout', this)) {
// Session timed out, attempt a graceful exit
session.gracefulTerminate(this.destroy.bind(this));
}
return fn;
}

function socketOnceError(error) {
Expand Down Expand Up @@ -1248,7 +1242,7 @@ function connectionListener(socket) {
session[kServer] = this;
socket[kServer] = this;

session.on('error', sessionOnError(this, socket));
session.on('error', sessionOnError);

// Disable TLS Negotiation on this socket. The HTTP/2 allows renegotiation to
// happen up until the initial HTTP/2 session bootstrap. After that, it is
Expand All @@ -1259,7 +1253,7 @@ function connectionListener(socket) {
// Set up the timeout listener
if (this.timeout)
socket.setTimeout(this.timeout);
socket.on('timeout', socketOnTimeout(this, session));
socket.on('timeout', socketOnTimeout);

// Destroy the session if the socket is destroyed
const destroySocket = socket.destroy;
Expand Down Expand Up @@ -1442,7 +1436,7 @@ function clientSessionOnStreamClose(stream, code) {
response[kStream] = undefined;
stream[kRequest] = undefined;
stream[kResponse] = undefined;
setImmediate(() => maybeDestroyStream(stream));
setImmediate(maybeDestroyStream, stream);
}

function initializeClientOptions(options) {
Expand Down